From: martin f. krafft <madduck@madduck.net>
Date: Thu, 28 Jan 2010 23:07:31 +0000 (+0100)
Subject: look first in PWD for orig tarball
X-Git-Url: https://git.madduck.net/code/mbuild.git/commitdiff_plain/a08b106c905fb8c5c91dc3dfbcaf1d08b9b11006?ds=sidebyside

look first in PWD for orig tarball

Signed-off-by: martin f. krafft <madduck@madduck.net>
---

diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh
index c410dcb..be866e7 100755
--- a/sbuild-wrapper.sh
+++ b/sbuild-wrapper.sh
@@ -119,6 +119,7 @@ esac
 dcmd cp "${schangesfile##*/}" "$BUILDDIR"
 schangesfile="$schangesfile_basename"
 
+OLDPWD="$PWD"
 cd "$BUILDDIR"
 
 dcmd "$dscfile_basename" | while read f; do
@@ -126,9 +127,17 @@ dcmd "$dscfile_basename" | while read f; do
 
   case "$f" in
     *.tar.gz|*.tar.bz2|*.tar.lzma|*.tar.xz)
-      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
-      apt-get --tar-only --only-source source "${packagename}=${last_version}"
+      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