From: Guillem Jover Date: Fri, 31 Aug 2007 01:35:41 +0000 (+0300) Subject: Properly warn on unknown fields in dpkg-genchanges X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf730717d937d8f2a43220768d6b390c4e0155ec;p=dpkg Properly warn on unknown fields in dpkg-genchanges Explicitely ignore all known fields from the control file source package stanza in dpkg-genchanges, instead of leaving unknown fields unwarned. --- diff --git a/ChangeLog b/ChangeLog index 553b8636..5e3bf9fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-08-31 Guillem Jover + + * scripts/dpkg-genchanges.pl: Do not leave unknown fields unwarned + and explicitely ignore all known ones from control file source + package stanza. + 2007-08-30 Guillem Jover * scripts/dpkg-genchanges.pl: Ignore XB- fields instead of XC- fields diff --git a/debian/changelog b/debian/changelog index 3b85dcb4..956dcb76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,8 @@ dpkg (1.14.6) UNRELEASED; urgency=low * Implement support for Homepage field. Closes: #142324 * Ignore XB- fields instead of XC- fields from control file binary package stanzas in dpkg-genchanges. + * Explicitely ignore all known fields from the control file source package + stanza in dpkg-genchanges, instead of leaving unknown fields unwarned. [ Updated scripts translations ] * French (Frédéric Bothamy, Christian Perrier). diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl index a1435e14..616ee8d1 100755 --- a/scripts/dpkg-genchanges.pl +++ b/scripts/dpkg-genchanges.pl @@ -208,7 +208,10 @@ for $_ (keys %fi) { elsif (m/^Section$|^Priority$/i) { $sourcedefault{$_}= $v; } elsif (m/^Maintainer$/i) { $f{$_}= $v; } elsif (s/^X[BS]*C[BS]*-//i) { $f{$_}= $v; } - elsif (m/|^X[BS]+-|^Standards-Version$|^Homepage$/i) { } + elsif (m/^X[BS]+-/i || + m/^Build-(Depends|Conflicts)(-Indep)?$/i || + m/^(Standards-Version|Uploaders|Homepage|Origin|Bugs)$/i) { + } else { &unknown(_g('general section of control info file')); } } elsif (s/^C(\d+) //) { my $i = $1;