From: Guillem Jover <guillem@debian.org>
Date: Mon, 14 May 2007 21:09:10 +0000 (+0000)
Subject: Fix dpkg-divert to work again w/o specifying the --divert and --package
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed7d1f7e0303008f562305707f4c41ef0c2f08aa;p=dpkg

Fix dpkg-divert to work again w/o specifying the --divert and --package
options. Closes: #423864
---

diff --git a/ChangeLog b/ChangeLog
index 3dccd77e..73f9a47f 100644
--- 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 1de3efc6..f166c97f 100644
--- 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 df1cfe2b..2e22e2f5 100755
--- 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;