Author: adsb
Date: 2008-11-04 20:39:39 +0000 (Tue, 04 Nov 2008)
New Revision: 1700
Modified:
trunk/debian/changelog
trunk/scripts/debcommit.pl
Log:
* debcommit:
+ Allow --release to be combined with --edit or --confirm. Based on
a patch by Eric Gerlach. (Closes: #497988)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-11-04 19:44:47 UTC (rev 1699)
+++ trunk/debian/changelog 2008-11-04 20:39:39 UTC (rev 1700)
@@ -28,6 +28,9 @@
+ Modify the message produced by --closes to make it clearer that it
is intended to be edited to add details of the bug and fix as
appropriate. (Closes: #495743)
+ * debcommit:
+ + Allow --release to be combined with --edit or --confirm. Based on
+ a patch by Eric Gerlach. (Closes: #497988)
* debdiff: Correctly handle hyphenated distribution names when generating
a diff against the previous version of the package. (Closes: #503950)
* getbuildlog:
Modified: trunk/scripts/debcommit.pl
===================================================================
--- trunk/scripts/debcommit.pl 2008-11-04 19:44:47 UTC (rev 1699)
+++ trunk/scripts/debcommit.pl 2008-11-04 20:39:39 UTC (rev 1700)
@@ -240,6 +240,7 @@
my $signtags=0;
my $changelog="debian/changelog";
my $keyid;
+my $version;
# Now start by reading configuration files and then command line
# The next stuff is boilerplate
@@ -340,22 +341,22 @@
}
close C;
- my $version=`dpkg-parsechangelog | grep '^Version:' | cut -f 2 -d ' '`;
+ $version=`dpkg-parsechangelog | grep '^Version:' | cut -f 2 -d ' '`;
chomp $version;
$message="releasing version $version" if ! defined $message;
- commit($message);
- tag($version);
}
-else {
- if ($edit) {
- my $modified = 0;
- ($message, $modified) = edit($message);
- die "$progname: Commit message not modified / saved; aborting\n" unless
$modified;
- }
- commit($message) if not $confirm or confirm($message);
+if ($edit) {
+ my $modified = 0;
+ ($message, $modified) = edit($message);
+ die "$progname: Commit message not modified / saved; aborting\n" unless
$modified;
}
+if (not $confirm or confirm($message)) {
+ commit($message);
+ tag($version) if $release;
+}
+
sub getprog {
if (-d "debian") {
if (-d "debian/.svn") {
--
To unsubscribe, send mail to [EMAIL PROTECTED]
