Author: adam-guest
Date: 2008-04-14 15:47:20 +0000 (Mon, 14 Apr 2008)
New Revision: 1341
Modified:
trunk/debian/changelog
trunk/scripts/debchange.pl
Log:
Skip automatic NMU detection if -a was explicitly passed on the command
line
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-04-14 13:09:40 UTC (rev 1340)
+++ trunk/debian/changelog 2008-04-14 15:47:20 UTC (rev 1341)
@@ -17,6 +17,8 @@
for NMUs (Closes: #475750)
+ Fix a side-effect of the automagic NMU detection functionality which
could lead to a spurious stanza being added to the end of the changelog
+ + Skip automatic NMU detection if -a was explicitly passed on the command
+ line
* debcommit: Modify the "strip message" functionality so that:
- Changelog lines beginning with any of *, + or - are considered to
indicate a "change" for the purposes of deciding whether to strip
Modified: trunk/scripts/debchange.pl
===================================================================
--- trunk/scripts/debchange.pl 2008-04-14 13:09:40 UTC (rev 1340)
+++ trunk/scripts/debchange.pl 2008-04-14 15:47:20 UTC (rev 1341)
@@ -322,6 +322,11 @@
)
or die "Usage: $progname [options] [changelog entry]\nRun $progname --help
for more details\n";
+# So that we can distinguish, if required, between an explicit
+# passing of -a / -i and their values being automagically deduced
+# later on
+my $opt_a_passed = $opt_a || 0;
+my $opt_i_passed = $opt_i || 0;
$opt_news = 'debian/NEWS' if defined $opt_news and $opt_news eq '';
if ($opt_t eq '' && $opt_release_heuristic eq 'changelog') {
@@ -674,7 +679,7 @@
if ($opt_auto_nmu eq 'yes' and ! $opt_v and ! $opt_l and ! $opt_s and
! $opt_qa and ! $opt_bpo and ! $opt_bn and ! $opt_n and ! $opt_c and
- ! $opt_create) {
+ ! $opt_create and ! $opt_a_passed) {
if (-f 'debian/control') {
fatal "$progname: Unable to parse control file: $lpdc_broken\n"
--
To unsubscribe, send mail to [EMAIL PROTECTED]
