Revert "Merge branch 'noctis/extra-debs-env' into 'master'"

This reverts merge request !383

diff --git a/README.rst b/README.rst
index 840cc7f1a58151f70d614c5fc3d4e147a9a9e433..5bd956f0ce3c92685136ffcc8f6b56c3eac47915 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -104,11 +104,7 @@ A, then you can run something like::
 
 The extra arguments after ``./build.sh B <args>`` is extra deb files to pass to
 sbuild to use as dependencies. In this case, ``librust-A*.deb`` should have
-been built by the previous step. Alternatively, use the environment variable
-``EXTRA_DEBS``, like so: ::
-
-  $ EXTRA_DEBS=librust-A*.deb ./build.sh B
-  $ EXTRA_DEBS=librust-A.deb,librust-B.deb ./build.sh C
+been built by the previous step.
 
 After everything is built successfully, you can ``dput`` all of them and then
 push all the ``pending-*`` branches as normal.

diff --git a/build.sh b/build.sh
index a4e817943a0f01ad263f191cc8d29f2afd2874cc..53e2ccb089030b41907fd621b76556619e838722 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -16,8 +16,6 @@
 #     Build using another schroot than debcargo-unstable-amd64-sbuild
 # SBUILD_OPTS=
 #     will pass to sbuild; for example SBUILD_OPTS=--arch=i386
-# EXTRA_DEBS
-#     Include extra dependency debs, e.g. EXTRA_DEBS=librust*.deb.
 set -e
 
 SCRIPTDIR="$(dirname $(readlink -f "$0"))"
@@ -101,12 +99,8 @@ if shouldbuild "$SRCNAME.dsc" "$PKGNAME/debian/changelog" ]; then
        fi
 fi
 
-# allow tab, comma, space as separators
-IFS='  , ' read -r -a EXTRA_DEBS <<< "$EXTRA_DEBS"
-if [ ${#EXTRA_DEBS[@] -eq 0 ]; then
-       EXTRA_DEBS=( "$@" )
-fi
-if [ ${#EXTRA_DEBS[@] -ne 0 ]; then
+EXTRA_DEBS=( "$@" )
+if [ -n "$*" -a -z "$IGNORE_MISSING_BUILD_DEPS" ]; then
        IGNORE_MISSING_BUILD_DEPS=1
        echo >&2 "Given non-empty extra debs; defaulting IGNORE_MISSING_BUILD_DEPS=1"
 fi