dot/gpg.conf.m4, dot/gpg-agent.conf, Makefile: Adopt GnuPG configuration.

[profile] / bin / mdw-sbuild-server

diff --git a/bin/mdw-sbuild-server b/bin/mdw-sbuild-server
index ca76705..e4c919f 100755 (executable)
--- a/bin/mdw-sbuild-server
+++ b/bin/mdw-sbuild-server
@@ -41,7 +41,7 @@ done
 prog=${0##*/}
 
 fail () { echo >&2 "$prog: $*"; exit 1; }
-usage () { echo "usage: $prog [-aikn] [-t TARGET] [-A DBPARGS] COMMAND [ARGUMENTS ...]"; }
+usage () { echo "usage: $prog [-aiknT] [-t TARGET] [-A DBPARGS] COMMAND [ARGUMENTS ...]"; }
 fail_usage () { usage >&2; exit 1; }
 
 want_1 () {
@@ -76,7 +76,7 @@ decor () {
 bogusp=nil archp=nil indepp=nil keepon=nil notreally=nil
 unset targets dbpargs
 
-while getopts "haint:A:" opt; do
+while getopts "haint:A:T" opt; do
   case $opt in
     h)
       usage
@@ -90,6 +90,7 @@ Options:
        -n              Don't actually do the build.
        -t TARGET       Build in TARGET build environment.
        -A ARGS         Pass ARGS to \`dpkg-buildpackage'.
+       -T              Don't run the tests.
 
 Commands available:
 
@@ -110,6 +111,12 @@ EOF
     n) notreally=t ;;
     t) targets="${targets+$targets }$OPTARG" ;;
     A) dbpargs="${dbpargs+$dbpargs }$OPTARG" ;;
+    T)
+      case " $DEB_BUILD_OPTIONS " in
+       *" nocheck "*) ;;
+       *) DEB_BUILD_OPTIONS=${DEB_BUILD_OPTIONS+"$DEB_BUILD_OPTIONS "} nocheck ;;
+      esac
+      ;;
     *) bogusp=nil ;;
   esac
 done
@@ -289,7 +296,7 @@ case "$#,$1" in
       exec 3>&1
       thisrc=$(
        { { { { set +e
-               run sbuild --extra-package=$pkgs.$target \
+               run sbuild --extra-package=pkgs.$target \
                    --dist=$suite --build=$host --host=$target \
                    --chroot=$suite-$host --verbose $buildopt $dsc \
                    ${dbpargs+--debbuildopts="$dbpargs"} \