Author: djpig
Date: 2006-02-17 14:35:13 +0000 (Fri, 17 Feb 2006)
New Revision: 152
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/scripts/dpkg-scanpackages.pl
Log:
Fix override handling in dpkg-scanpackages which was broken in
1.13.14 and .15. Closes: #353305
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-02-17 07:23:31 UTC (rev 151)
+++ trunk/ChangeLog 2006-02-17 14:35:13 UTC (rev 152)
@@ -1,3 +1,8 @@
+2006-02-17 Frank Lichtenheld <[EMAIL PROTECTED]>
+
+ * scripts/dpkg-scanpackages.pl: Fix override handling
+ which was broken by the latest changes.
+
2006-02-17 Guillem Jover <[EMAIL PROTECTED]>
* debian/dselect.install: Install only dselect domain.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-02-17 07:23:31 UTC (rev 151)
+++ trunk/debian/changelog 2006-02-17 14:35:13 UTC (rev 152)
@@ -7,6 +7,10 @@
be installed if dselect is not to be built.
* Move dselect gettext strings to its own domain provided now by the
dselect package.
+
+ [ Frank Lichtenheld ]
+ * Fix override handling in dpkg-scanpackages which was broken in
+ 1.13.14 and .15. Closes: #353305
-- Guillem Jover <[EMAIL PROTECTED]> Fri, 17 Feb 2006 03:52:59 +0200
Modified: trunk/scripts/dpkg-scanpackages.pl
===================================================================
--- trunk/scripts/dpkg-scanpackages.pl 2006-02-17 07:23:31 UTC (rev 151)
+++ trunk/scripts/dpkg-scanpackages.pl 2006-02-17 14:35:13 UTC (rev 152)
@@ -189,10 +189,11 @@
while (<$override_fh>) {
s/\#.*//;
s/\s+$//;
+ next unless $_;
my ($p,$priority,$section,$maintainer)= split(/\s+/,$_,4);
next unless defined($packages{$p});
for my $package (@{$packages{$p}}) {
- if (defined $maintainer and length($maintainer)) {
+ if ($maintainer) {
if ($maintainer =~ m/(.+?)\s*=\>\s*(.+)/) {
my $oldmaint= $1;
my $newmaint= $2;
@@ -203,15 +204,15 @@
} else {
$$package{Maintainer}= $newmaint;
}
- }
- } elsif ($$package{Maintainer} eq $maintainer) {
- push(@samemaint," $p ($maintainer)\n");
- } else {
- print(STDERR " * Unconditional maintainer override for $p *\n")
|| die $!;
- $$package{Maintainer}= $maintainer;
- }
- $packages{$p}{Priority}= $priority;
- $packages{$p}{Section}= $section;
+ } elsif ($$package{Maintainer} eq $maintainer) {
+ push(@samemaint," $p ($maintainer)\n");
+ } else {
+ print(STDERR " * Unconditional maintainer override for $p
*\n") || die $!;
+ $$package{Maintainer}= $maintainer;
+ }
+ }
+ $$package{Priority}= $priority;
+ $$package{Section}= $section;
}
$overridden{$p} = 1;
}
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
