diff options
| author | Guido Günther <agx@sigxcpu.org> | 2014-09-07 09:25:30 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2014-09-07 09:25:30 +0200 |
| commit | 5d4cb9208f72e20cfd4d457b5d885a44859c40ef (patch) | |
| tree | 6d263e215bc9f1ad5074d7828e808375b1bd5f89 | |
| parent | d9dd13d37159fb6997498f665c6f7a95301d50ee (diff) | |
Update to git-pbuilder 1.33
| -rw-r--r-- | bin/git-pbuilder | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/bin/git-pbuilder b/bin/git-pbuilder index 37ffe67b..a9104d7a 100644 --- a/bin/git-pbuilder +++ b/bin/git-pbuilder @@ -1,5 +1,5 @@ #!/bin/bash -# $Id: git-pbuilder,v 1.30 2013/11/05 18:17:09 eagle Exp $ +# $Id: git-pbuilder,v 1.33 2014/08/28 21:39:15 eagle Exp $ # # git-pbuilder -- Wrapper around pbuilder for git-buildpackage # @@ -10,6 +10,7 @@ # # Written by Russ Allbery <eagle@eyrie.org> # Based on the example in the git-buildpackage documentation +# Copyright 2014 Russ Allbery <eagle@eyrie.org> # Copyright 2008, 2009, 2010, 2011, 2012, 2013 # The Board of Trustees of the Leland Stanford Junior University # @@ -227,7 +228,8 @@ update|create|login) sudo "$BUILDER" --"$action" --distribution "$DIST" \ --othermirror "$OTHERMIRROR" "${OPTIONS[@]}" "$@" else - sudo "$BUILDER" --"$action" --distribution "$DIST" "${OPTIONS[@]}" "$@" + sudo "$BUILDER" --"$action" --distribution "$DIST" \ + "${OPTIONS[@]}" "$@" fi fi exit $? @@ -264,8 +266,11 @@ fi # Add all of the additional arguments we got on the command line, but quote # them from the shell since they'll undergo another round of shell expansion # when the pbuilder runs debbuild. +source_only=false for arg in "$@" ; do - [ "$arg" != "-S" ] || source_only=true + if [ x'-S' = x"$arg" ] ; then + source_only=true + fi DEBBUILDOPTS+=" $(shell_quote "$arg")" done @@ -279,7 +284,7 @@ else --debbuildopts "$DEBBUILDOPTS" -- "${OPTIONS[@]}" fi status="$?" -if [ -n "`ls ../*_source.changes`" -a $source_only != 'true' ] ; then +if [ -n "`ls ../*_source.changes`" ] && [ true != "$source_only" ] ; then rm ../*_source.changes fi exit "$status" |