dpkg-scanpackages: Properly support an optional override file

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.

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

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;