dpkg-scanpackages: Properly support an optional override file

diff --git a/ChangeLog b/ChangeLog
index 9e1f7b39b4697d3b96bf931a25e8f304987e3cbe..b1d440a7f5db5e5b43d6fc9cbcfd86153acdf8ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-24  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-scanpackages.pl: Use parenthesis to force the
+       precedence when checking if the specified override file exists.
+
 2007-11-24  Guillem Jover  <guillem@debian.org>
 
        * scripts/dpkg-scanpackages.pl: Do not require controllib.pl anymore.

diff --git a/debian/changelog b/debian/changelog
index 02f82aea60349d8c7c93785ec60cadf8a29fc5a6..eb0f9081bab25a0a0f892abea12d9468db9cf161 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ dpkg (1.14.11) UNRELEASED; urgency=low
   * dpkg-shlibdeps: optimize "dpkg -S" lookups by caching results, patch
     from Aaron M. Ucko <ucko@debian.org>. Closes: #452577
 
+  [ Guillem Jover ]
+  * Fix dpkg-scanpackages to properly support an optional override file.
+    Closes: #452621
+
  -- Guillem Jover <guillem@debian.org>  Fri, 23 Nov 2007 06:50:02 +0200
 
 dpkg (1.14.10) unstable; urgency=low

diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index 08ae4f42e1704d9b85ae8be2cf53c41b3f41ba28..f8bab35f2dbdf36b3ba05b69bfee72e68551d84a 100755 (executable)
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -135,8 +135,8 @@ my ($binarydir, $override, $pathprefix) = @ARGV;
 
 -d $binarydir or die sprintf(_g("Binary dir %s not found"),
                              $binarydir)."\n";
-defined $override and -e $override or
-    die sprintf(_g("Override file %s not found"), $override)."\n";
+defined($override) and (-e $override or
+    die(sprintf(_g("Override file %s not found"), $override) . "\n"));
 
 $pathprefix = '' if not defined $pathprefix;