bin/mdw-sbuild-server: Unbreak local package support.

[profile] / bin / mdw-sbuild-server

diff --git a/bin/mdw-sbuild-server b/bin/mdw-sbuild-server
index 2bba42a..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 [-ain] [-t TARGET] COMMAND [ARGUMENTS ...]"; }
+usage () { echo "usage: $prog [-aiknT] [-t TARGET] [-A DBPARGS] COMMAND [ARGUMENTS ...]"; }
 fail_usage () { usage >&2; exit 1; }
 
 want_1 () {
@@ -59,7 +59,7 @@ want_1 () {
 run () {
   case $notreally in
     t) echo "+ $*" ;;
-    nil) "$@" ;;
+    nil) nice "$@" ;;
   esac
 }
 
@@ -74,9 +74,9 @@ decor () {
 ### Parse options.
 
 bogusp=nil archp=nil indepp=nil keepon=nil notreally=nil
-unset targets
+unset targets dbpargs
 
-while getopts "haint:" opt; do
+while getopts "haint:A:T" opt; do
   case $opt in
     h)
       usage
@@ -89,6 +89,8 @@ Options:
        -k              Keep going even if one fails.
        -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:
 
@@ -108,6 +110,13 @@ EOF
     k) keepon=t ;;
     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
@@ -287,9 +296,10 @@ 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"} \
                    3>&- 4>&- 5>&-
                echo $? >&5
              } |