Author: adsb
Date: 2008-10-22 17:29:29 +0000 (Wed, 22 Oct 2008)
New Revision: 1671
Modified:
trunk/debian/changelog
trunk/scripts/debchange.pl
Log:
debchange: Don't attempt to automatically determine if the current
changelog is an NMU if an alternative changelog location was specified
using the CHANGELOG environment variable.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-10-17 09:07:20 UTC (rev 1670)
+++ trunk/debian/changelog 2008-10-22 17:29:29 UTC (rev 1671)
@@ -1,5 +1,8 @@
devscripts (2.10.40) UNRELEASED; urgency=low
+ * debchange: Don't attempt to automatically determine if the current
+ changelog is an NMU if an alternative changelog location was specified
+ using the CHANGELOG environment variable.
* uscan: Document the USCAN_TIMEOUT configuration file variable.
(Closes: #502517)
Modified: trunk/scripts/debchange.pl
===================================================================
--- trunk/scripts/debchange.pl 2008-10-17 09:07:20 UTC (rev 1670)
+++ trunk/scripts/debchange.pl 2008-10-22 17:29:29 UTC (rev 1671)
@@ -685,6 +685,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
+ ! length $ENV{'CHANGELOG'} and
! $opt_create and ! $opt_a_passed and ! $opt_r and ! $opt_e and
! ($opt_release_heuristic eq 'changelog' and
$changelog{'Distribution'} eq 'UNRELEASED' and ! $opt_i_passed)) {
--
To unsubscribe, send mail to [EMAIL PROTECTED]
