From ba9e5615ee9575054a38f3c9508e534ae856c501 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sat, 24 Nov 2007 05:32:56 +0200 Subject: [PATCH] dpkg-scanpackages: Properly support an optional override file --- ChangeLog | 5 +++++ debian/changelog | 4 ++++ scripts/dpkg-scanpackages.pl | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e1f7b39..b1d440a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-11-24 Guillem Jover + + * scripts/dpkg-scanpackages.pl: Use parenthesis to force the + precedence when checking if the specified override file exists. + 2007-11-24 Guillem Jover * scripts/dpkg-scanpackages.pl: Do not require controllib.pl anymore. diff --git a/debian/changelog b/debian/changelog index 02f82aea..eb0f9081 100644 --- 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 . Closes: #452577 + [ Guillem Jover ] + * Fix dpkg-scanpackages to properly support an optional override file. + Closes: #452621 + -- Guillem Jover 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 08ae4f42..f8bab35f 100755 --- 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; -- 2.39.5