Fix perl warning when removing a non diverted file with dpkg-divert

diff --git a/ChangeLog b/ChangeLog
index 85c6880f1a60920e269b4a247231ced48e1d1df3..929cf303fd7bef5d95c8805ddb3eb60f98492d33 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-18  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-divert.pl (infol): Check if parameters are defined
+       before using them. Use defined instead of length to check for undef
+       variables.
+
 2007-08-14  Guillem Jover  <guillem@debian.org>
 
        * lib/parsehelp.c (parseerr): Switch from ternary operator to compose

diff --git a/debian/changelog b/debian/changelog
index 386c16cfa717a1abc37a43ff2b196014b9dbe2ac..2a6c25c208f8930134e0dae2a379d262711061e5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,8 @@ dpkg (1.14.6) UNRELEASED; urgency=low
     to a directory where the existing symlink on-disk points to the
     same place. Closes: #377682
     Thanks to Ian Jackson.
+  * Fix perl warnings:
+    - When removing a non diverted file with dpkg-divert. Closes: #438416
 
   [ Updated scripts translations ]
   * French (Frédéric Bothamy, Christian Perrier).

diff --git a/scripts/dpkg-divert.pl b/scripts/dpkg-divert.pl
index 253209ef980f774d5ea749415bf9ebb40132ae7b..88c3f7d537c6003c4c7fa4ab91b3af3b0e68030b 100755 (executable)
--- a/scripts/dpkg-divert.pl
+++ b/scripts/dpkg-divert.pl
@@ -217,10 +217,10 @@ if ($mode eq 'add') {
 }
 
 sub infol {
-    return (($_[2] eq ':' ? "local " : length($_[2]) ? "" : "any ").
+    return ((defined($_[2]) ? ($_[2] eq ':' ? "local " : "") : "any ").
             "diversion of $_[0]".
-            (length($_[1]) ? " to $_[1]" : "").
-            (length($_[2]) && $_[2] ne ':' ? " by $_[2]" : ""));
+            (defined($_[1]) ? " to $_[1]" : "").
+            (defined($_[2]) && $_[2] ne ':' ? " by $_[2]" : ""));
 }
 
 sub checkrename {