[PATCH 2 of 5 STABLE] dockerdeb: pass the rest of the args to the builder script

Sean Farley sean at farley.io
Sat Apr 23 22:27:56 EDT 2016


# HG changeset patch
# User Sean Farley <sean at farley.io>
# Date 1461440877 25200
#      Sat Apr 23 12:47:57 2016 -0700
# Branch stable
# Node ID cef09634d1054a0b378e401707d87d819dff9ec7
# Parent  f0bec77f148405825a8c3289823e3981246965dc
# EXP-Topic docker-ppa
dockerdeb: pass the rest of the args to the builder script

It seems this was the original intent of the script so this patch passes the
remanining arguments to builddeb.

diff --git a/contrib/dockerdeb b/contrib/dockerdeb
--- a/contrib/dockerdeb
+++ b/contrib/dockerdeb
@@ -25,11 +25,11 @@ dn=$(basename $PWD)
 if [ $(uname) = "Darwin" ] ; then
     $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
             sh -c "cd /mnt/$dn && make clean && make local"
 fi
 $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
-  sh -c "cd /mnt/$dn && DEB_BUILD_OPTIONS='${DEB_BUILD_OPTIONS:=}' contrib/builddeb --build --distid $DISTID --codename $CODENAME"
+  sh -c "cd /mnt/$dn && DEB_BUILD_OPTIONS='${DEB_BUILD_OPTIONS:=}' contrib/builddeb --build --distid $DISTID --codename $CODENAME $@"
 contrib/builddeb --cleanup --distid $DISTID --codename $CODENAME
 if [ $(uname) = "Darwin" ] ; then
     $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
             sh -c "cd /mnt/$dn && make clean"
 fi


More information about the Mercurial-devel mailing list