[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#222251: /usr/sbin/dpkg-divert: refuses diverting of symlinks pointing on a directory



Package: dpkg
Version: 1.10.18
Severity: normal
File: /usr/sbin/dpkg-divert
Tags: Patch

$ ls -l /usr/share/doc/python2.3/python-policy.html
lrwxrwxrwx    1 root     root           28 2003-11-17 23:18 /usr/share/doc/python2.3/python-policy.html -> ../python/python-policy.html
# dpkg-divert --package python --rename /usr/share/doc/python2.3/python-policy.html
dpkg-divert: Cannot divert directories

As you can see dpkg-divert refuses diverting of a symlink that points on
a directory.

--- /usr/sbin/dpkg-divert       2003-10-27 20:45:09.000000000 +0100
+++ /tmp/dpkg-divert    2003-11-26 21:22:33.000000000 +0100
@@ -119,7 +119,7 @@
     $file= $ARGV[0];
     $file =~ m#^/# || &badusage("filename \"$file\" is not absolute");
     $file =~ m/\n/ && &badusage("file may not contain newlines");
-       -d $file && &badusage("Cannot divert directories");
+    -d $file && ! -s $file && &badusage("Cannot divert directories");
     $divertto= "$file.distrib" unless defined($divertto);
     $divertto =~ m#^/# || &badusage("filename \"$divertto\" is not absolute");
     $package= ':' unless defined($package);

-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux joerg 2.6.0-test9 #2 Sun Nov 2 00:36:03 MET 2003 i586
Locale: LANG=de_DE, LC_CTYPE=de_DE

Versions of packages dpkg depends on:
ii  dselect                     1.10.18      a user tool to manage Debian packa
ii  libc6                       2.3.2.ds1-10 GNU C Library: Shared libraries an

-- no debconf information

Attachment: signature.asc
Description: Digital signature


Reply to: