The following commit has been merged in the master branch:
commit b6f7a3beaaecfeb0e3ba0b6b63148ec27c824335
Author: Benjamin Drung <[email protected]>
Date: Tue May 24 12:22:16 2011 +0200
debsign: Implement DEBSIGN_ALWAYS_RESIGN variable to skip the "Would you
like to use the current signature?" question.
Closes: #447955
diff --git a/debian/changelog b/debian/changelog
index 959a88e..7e5bb82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,11 +19,13 @@ devscripts (2.10.74) UNRELEASED; urgency=low
* debchange, uupdate: Use dpkg-vendor instead of lsb_release.
* Merge from Ubuntu:
+ debuild: Enforce Ubuntu merge policy.
+ + debsign: Implement DEBSIGN_ALWAYS_RESIGN variable to skip the
+ "Would you like to use the current signature?" question. (Closes:
#447955)
[ David Prévot ]
* Partial manual pages convention review (Closes: #626015).
- -- Benjamin Drung <[email protected]> Tue, 24 May 2011 12:09:19 +0200
+ -- Benjamin Drung <[email protected]> Tue, 24 May 2011 12:21:48 +0200
devscripts (2.10.73) unstable; urgency=low
diff --git a/scripts/debsign.1 b/scripts/debsign.1
index d0c58f9..b66632a 100644
--- a/scripts/debsign.1
+++ b/scripts/debsign.1
@@ -128,6 +128,9 @@ This is the \fB\-m\fR option.
.B DEBSIGN_KEYID
And this is the \fB\-k\fR option.
.TP
+.B DEBSIGN_ALWAYS_RESIGN
+Always re-sign files even if they are already signed, without prompting.
+.TP
.B DEBRELEASE_DEBS_DIR
This specifies the directory in which to look for the \fI.changes\fR
and \fI.dsc\fR files, and is either an absolute path or relative to
diff --git a/scripts/debsign.sh b/scripts/debsign.sh
index 52bf7e5..0969bce 100755
--- a/scripts/debsign.sh
+++ b/scripts/debsign.sh
@@ -234,8 +234,11 @@ check_already_signed () {
elif [ "$opt_re_sign" = "false" ]; then
resign="false"
else
- printf "The .$2 file is already signed.\nWould you like to use the
current signature? [Yn]"
- read response
+ response=n
+ if [ -z "$DEBSIGN_ALWAYS_RESIGN" ]; then
+ printf "The .$2 file is already signed.\nWould you like to use the
current signature? [Yn]"
+ read response
+ fi
case $response in
[Nn]*) resign="true" ;;
*) resign="false" ;;
@@ -258,13 +261,14 @@ check_already_signed () {
unset GREP_OPTIONS
# Boilerplate: set config variables
+DEFAULT_DEBSIGN_ALWAYS_RESIGN=
DEFAULT_DEBSIGN_PROGRAM=
DEFAULT_DEBSIGN_SIGNLIKE=
DEFAULT_DEBSIGN_MAINT=
DEFAULT_DEBSIGN_KEYID=
DEFAULT_DEBRELEASE_DEBS_DIR=..
-VARS="DEBSIGN_PROGRAM DEBSIGN_SIGNLIKE DEBSIGN_MAINT DEBSIGN_KEYID"
-VARS="$VARS DEBRELEASE_DEBS_DIR"
+VARS="DEBSIGN_ALWAYS_RESIGN DEBSIGN_PROGRAM DEBSIGN_SIGNLIKE DEBSIGN_MAINT"
+VARS="$VARS DEBSIGN_KEYID DEBRELEASE_DEBS_DIR"
if [ "$1" = "--no-conf" -o "$1" = "--noconf" ]; then
shift
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
