Bug#609156: deluser fails to remove symlinks to directories

[Matthias Klose]

Package: adduser
Version: 3.112+nmu1
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu natty ubuntu-patch

Use unlink instead of rmdir to remove symlinks to directories.


  * deluser: Remove symlinks to directories with rm, not rmdir (Jim Cheetham).

diff -Nru adduser-3.112+nmu1ubuntu2/deluser adduser-3.112+nmu1ubuntu4/deluser
--- adduser-3.112+nmu1ubuntu2/deluser   2010-11-23 12:40:23.000000000 +0100
+++ adduser-3.112+nmu1ubuntu4/deluser   2011-01-06 22:05:44.000000000 +0100
@@ -317,8 +317,8 @@
              (
                ($File::Find::name =~ /^\/proc\// && ($File::Find::prune = 1)) 
||
                (-f $File::Find::name && push(@files, $File::Find::name)) ||
+                (-l $File::Find::name && push(@files, $File::Find::name)) ||
                (-d $File::Find::name && push(@dirs, $File::Find::name)) ||
-                (-l $File::Find::name && push(@dirs, $File::Find::name)) ||
                 (-S $File::Find::name && push(@dirs, $File::Find::name)) || 
                 (-p $File::Find::name && push(@dirs, $File::Find::name))
              );