Browse Source

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

Guillem Jover 17 years ago
parent
commit
ed7d1f7e03
3 changed files with 9 additions and 2 deletions
  1. 5 0
      ChangeLog
  2. 2 0
      debian/changelog
  3. 2 2
      scripts/dpkg-divert.pl

+ 5 - 0
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

+ 2 - 0
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

+ 2 - 2
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;