X-Git-Url: https://git.madduck.net/code/mbuild.git/blobdiff_plain/e032002aa15553fee31692a5166d47e2537b54b6..a08b106c905fb8c5c91dc3dfbcaf1d08b9b11006:/sbuild-wrapper.sh diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh index ead8053..be866e7 100755 --- a/sbuild-wrapper.sh +++ b/sbuild-wrapper.sh @@ -72,6 +72,7 @@ for opt in "$@"; do -h|--help) usage; exit 0;; -V|--version) about; exit 0;; --arch=*) arch="${opt#--arch=}";; + -D) sbuild_args="${sbuild_args:+$sbuild_args }$opt";; -sa) sbuild_args="${sbuild_args:+$sbuild_args }--force-orig-source";; -B) binonly=1;; --*) sbuild_args="${sbuild_args:+$sbuild_args }$opt";; @@ -118,16 +119,25 @@ esac dcmd cp "${schangesfile##*/}" "$BUILDDIR" schangesfile="$schangesfile_basename" +OLDPWD="$PWD" cd "$BUILDDIR" dcmd "$dscfile_basename" | while read f; do test -f "$f" && continue case "$f" in - *.tar.gz) - last_version="$(apt-cache madison mdadm | sed -rne "s,.+(\<${upstream_version}[^[:space:]]+).*,\1,p")" - echo "I: fetching missing tarball for $upstream_version (from $last_version)…" >&2 - apt-get --tar-only --only-source source "${packagename}=${last_version}" + *.tar.gz|*.tar.bz2|*.tar.lzma|*.tar.xz) + if [ -f "$OLDPWD/$f" ]; then + echo "I: using existing tarball for $upstream_version…" >&2 + cp $OLDPWD/$f $f + else + last_version="$(apt-cache madison $packagename | sed -rne "s,.+(\<${upstream_version}[^[:space:]]+).*,\1,p")" + echo "I: fetching missing tarball for $upstream_version (from $last_version)…" >&2 + if ! apt-get --tar-only --only-source source "${packagename}=${last_version}"; then + echo "E: I do not know how to obtain the file: $f" >&2 + exit 1 + fi + fi ;; *) echo "E: I do not know how to obtain the file: $f" >&2