Fix dpkg-divert to work again w/o specifying the --divert and --package

options. Closes: #423864

diff --git a/ChangeLog b/ChangeLog
index 3dccd77e8331b6d818644dee025eedaa3dd657cc..73f9a47fa60af0d2c754c2a31671b93411f33abf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-14  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-divert.pl ($divertto, $package): Initialize to undef
+       instead of an empty string.
+
 2007-05-13  Guillem Jover  <guillem@debian.org>
 
        * scripts/controllib.pl (debarch_eq): Return 0 if

diff --git a/debian/changelog b/debian/changelog
index 1de3efc63fc39044bac4b83d1486b5edf0c6ab8d..f166c97fadc82a7712d89563a557ab5f9e72d2a4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ dpkg (1.14.3) UNRELEASED; urgency=low
     deb-shlibs.5 in dpkg-dev.
   * Fix deb-substvars.5 section to match reality.
   * Refactor update-alternatives.
+  * Fix dpkg-divert to work again w/o specifying the --divert and --package
+    options. Closes: #423864
 
   [ Updated dpkg-dev translations ]
   * French (Frédéric Bothamy). Closes: #423392

diff --git a/scripts/dpkg-divert.pl b/scripts/dpkg-divert.pl
index df1cfe2ba343cc6253becba5d778fd89745a86a7..2e22e2f5452c18b168fe058ddca44dee1b882f12 100755 (executable)
--- a/scripts/dpkg-divert.pl
+++ b/scripts/dpkg-divert.pl
@@ -60,8 +60,8 @@ my $testmode = 0;
 my $dorename = 0;
 my $verbose = 1;
 my $mode = '';
-my $package = '';
-my $divertto = '';
+my $package = undef;
+my $divertto = undef;
 my @contest;
 my @altname;
 my @package;