This is an automated email from the git hooks/post-receive script. osamu pushed a commit to branch master in repository devscripts.
commit 9bd6af98c1c901e6be73653637ac6882c9db935c Author: Osamu Aoki <[email protected]> Date: Tue Nov 17 23:11:48 2015 +0900 Revert "uupdate: Add -o option" This reverts commit 9ab4c1b2fa6733f92b4a8fe8fbe920676b6d8a76. --- scripts/uupdate.1 | 5 +---- scripts/uupdate.sh | 16 +++------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/scripts/uupdate.1 b/scripts/uupdate.1 index ad978d1..d7cfb0d 100644 --- a/scripts/uupdate.1 +++ b/scripts/uupdate.1 @@ -61,12 +61,9 @@ first option given on the command-line. \fB\-\-upstream\-version \fIversion\fR, \fB\-v \fIversion\fR Specify the version number of the upstream package explicitly. .TP -\fB\-\-force\-bad\-version, \fB\-b +\fB\-\-force\-bad\-version, \fB\-b Force a version number to be less than the current one (e.g., when backporting). .TP -\fB\-\-force\-overwrite, \fB\-o -Force overwriting of the existing *-*.debian.tar.* . -.TP \fB\-\-rootcmd \fIgain-root-command\fR, \fB\-r \fIgain-root-command\fR Specify the command to be used to become root to build the package and is passed onto \fBdebuild\fR(1) if it is specified. diff --git a/scripts/uupdate.sh b/scripts/uupdate.sh index 319d0be..2120d67 100755 --- a/scripts/uupdate.sh +++ b/scripts/uupdate.sh @@ -62,8 +62,6 @@ Options are: --force-bad-version, -b Force a version number to be less than the current one (e.g., when backporting). - --force-overwrite, -o - Force overwriting of the existing *-*.debian.tar.* --rootcmd <gain-root-command>, -r <gain-root-command> which command to be used to become root for package-building @@ -132,7 +130,6 @@ MPATTERN='^(?:[a-zA-Z][a-zA-Z0-9]*(?:-|_|\.))+(\d+\.(?:\d+\.)*\d+)$' STATUS=0 BADVERSION="" -OVERWRITE=0 # Boilerplate: set config variables DEFAULT_UUPDATE_ROOTCMD= @@ -204,10 +201,9 @@ else fi -TEMP=$(getopt -s bash -o v:p:r:fubos \ +TEMP=$(getopt -s bash -o v:p:r:fubs \ --long upstream-version:,patch:,rootcmd: \ --long force-bad-version \ - --long force-overwrite \ --long pristine,no-pristine,nopristine \ --long symlink,no-symlink,nosymlink \ --long no-conf,noconf \ @@ -223,8 +219,6 @@ while [ "$1" ]; do case $1 in --force-bad-version|-b) BADVERSION="-b" ;; - --force-overwite|-o) - OVERWRITE=1 ;; --upstream-version|-v) shift; NEW_VERSION="$1" ;; --patch|-p) @@ -1063,12 +1057,8 @@ else COMP=${DEBIANFILE##*.} NEW_DEBIANFILE="${PACKAGE}_${NEW_VERSION}-$SUFFIX.debian.tar.$COMP" fi - if [ $OVERWRITE = 0 and -e ${NEW_DEBIANFILE} ]; then - echo "$PROGNAME: ${NEW_DEBIANFILE} already exists. Start $PROGNAME with -o to overwrite it." >&2 - exit 1 - else - cp -f $DEBIANFILE ${NEW_DEBIANFILE} - fi + cp -i $DEBIANFILE ${NEW_DEBIANFILE} 2>/dev/tty + # fake DSC FAKEDSC="${PACKAGE}_${NEW_VERSION}-$SUFFIX.dsc" echo "Format: ${FORMAT}" > "$FAKEDSC" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
