Package: devscripts
Version: 2.10.35
Severity: normal
Tags: patch
When running debcommit with the --release option, the --edit and
--confirm options do nothing, which I assume is undesired behaviour.
This patch fixes that.
If I am wrong, and the behaviour is desired, please ignore.
-- Package-specific info:
--- /etc/devscripts.conf ---
--- ~/.devscripts ---
Not present
-- System Information:
Debian Release: lenny/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.26-1-686 (SMP w/1 CPU core)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages devscripts depends on:
ii dpkg-dev 1.14.20 Debian package development tools
ii libc6 2.7-13 GNU C Library: Shared libraries
ii perl 5.10.0-13 Larry Wall's Practical Extraction
Versions of packages devscripts recommends:
ii at 3.1.10.1 Delayed job execution and batch pr
ii bsd-mailx [mailx] 8.1.2-0.20071201cvs-3 A simple mail user agent
ii conkeror [www-brow 0.9~git080629-1 keyboard focused web browser with
ii dctrl-tools 2.13.0 Command-line tools to process Debi
ii debian-keyring 2008.07.22 GnuPG (and obsolete PGP) keys of D
ii debian-maintainers 1.42 GPG keys of Debian maintainers
ii dput 0.9.2.32 Debian package upload tool
ii equivs 2.0.7-0.1 Circumvent Debian package dependen
ii fakeroot 1.9.5 Gives a fake root environment
ii git-core 1:1.5.6.5-1 fast, scalable, distributed revisi
ii gnupg 1.4.9-3 GNU privacy guard - a free PGP rep
ii libauthen-sasl-per 2.12-1 Authen::SASL - SASL Authentication
ii libcrypt-ssleay-pe 0.57-1+b1 Support for https protocol in LWP
ii libparse-debcontro 2.005-2 Easy OO parsing of Debian control-
ii libsoap-lite-perl 0.710.08-1 Client and server side SOAP implem
ii libterm-size-perl 0.2-4+b1 Perl extension for retrieving term
ii libtimedate-perl 1.1600-9 Time and date functions for Perl
ii liburi-perl 1.35.dfsg.1-1 Manipulates and accesses URI strin
ii libwww-perl 5.813-1 WWW client/server library for Perl
ii libyaml-syck-perl 1.05-1 Fast, lightweight YAML loader and
ii lintian 1.24.2.1 Debian package checker
ii lsb-release 3.2-19 Linux Standard Base version report
ii mailx 1:20071201-3 Transitional package for mailx ren
ii man-db 2.5.2-2 on-line manual pager
ii openssh-client [ss 1:5.1p1-2 secure shell client, an rlogin/rsh
ii patch 2.5.9-5 Apply a diff file to an original
ii patchutils 0.2.31-4 Utilities to work with patches
ii strace 4.5.17+cvs080723-2 A system call tracer
ii unzip 5.52-12 De-archiver for .zip files
ii wdiff 0.5-18 Compares two files word by word
ii wget 1.11.4-1 retrieves files from the web
Versions of packages devscripts suggests:
ii build-essential 11.4 Informational list of build-essent
pn cvs-buildpackage <none> (no description available)
pn devscripts-el <none> (no description available)
pn gnuplot <none> (no description available)
pn libfile-desktopentry-perl <none> (no description available)
pn libnet-smtp-ssl-perl <none> (no description available)
pn mutt <none> (no description available)
pn svn-buildpackage <none> (no description available)
-- no debconf information
--- /usr/bin/debcommit.old 2008-07-26 17:19:54.000000000 -0400
+++ /usr/bin/debcommit 2008-09-05 18:45:16.000000000 -0400
@@ -222,6 +222,7 @@
my $release=0;
my $message;
+my $version;
my $release_use_changelog=0;
my $noact=0;
my $diffmode=0;
@@ -332,20 +333,24 @@
}
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;
+
+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);
+
+ if ($release) {
+ tag($version);
}
- commit($message) if not $confirm or confirm($message);
}
sub getprog {
