Author: guillem
Date: 2007-06-12 03:22:18 +0000 (Tue, 12 Jun 2007)
New Revision: 808
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/scripts/dpkg-scanpackages.pl
Log:
Fix dpkg-scanpackages to load the override file after having filled the
packages information. Closes: #428169, #428470
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-06-09 15:23:40 UTC (rev 807)
+++ trunk/ChangeLog 2007-06-12 03:22:18 UTC (rev 808)
@@ -1,3 +1,10 @@
+2007-06-12 Guillem Jover <[EMAIL PROTECTED]>
+
+ * scripts/dpkg-scanpackages.pl: Move check for existence of $override
+ outside load_override. Move load_override after having filled the
+ %packages information.
+ (load_override): Assume $override is always defined.
+
2007-06-06 Guillem Jover <[EMAIL PROTECTED]>
* scripts/dpkg-source.pl ($diff_ignore_default_regexp): Add '.shelf'.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-06-09 15:23:40 UTC (rev 807)
+++ trunk/debian/changelog 2007-06-12 03:22:18 UTC (rev 808)
@@ -4,6 +4,8 @@
* Add lpia support to ostable and triplettable.
* Fix dpkg-source to not emit duplicated entries for the Architecture field
in the .dsc file.
+ * Fix dpkg-scanpackages to load the override file after having filled the
+ packages information. Closes: #428169, #428470
* Add '.shelf' to the default dpkg-source -i regex. Closes: #427827
Thanks to Adeodato Simó.
Modified: trunk/scripts/dpkg-scanpackages.pl
===================================================================
--- trunk/scripts/dpkg-scanpackages.pl 2007-06-09 15:23:40 UTC (rev 807)
+++ trunk/scripts/dpkg-scanpackages.pl 2007-06-12 03:22:18 UTC (rev 808)
@@ -68,14 +68,6 @@
sub load_override
{
my $override = shift;
-
- if (defined $override) {
- -e $override or
- die sprintf(_g("Override file %s not found"), $override)."\n";
- } else {
- return;
- }
-
my $override_fh = new IO::File $override, 'r' or
die sprintf(_g("Couldn't open override file %s: %s"), $override,
$!)."\n";
@@ -143,9 +135,9 @@
-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";
-load_override($override);
-
$pathprefix = '' if not defined $pathprefix;
our %vercache;
@@ -248,6 +240,8 @@
print(STDERR "\n") || die $!;
}
+load_override($override) if defined $override;
+
my @missingover=();
my $records_written = 0;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
