madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

look first in PWD for orig tarball
authormartin f. krafft <madduck@madduck.net>
Thu, 28 Jan 2010 23:07:31 +0000 (00:07 +0100)
committermartin f. krafft <madduck@madduck.net>
Thu, 28 Jan 2010 23:07:31 +0000 (00:07 +0100)
Signed-off-by: martin f. krafft <madduck@madduck.net>
sbuild-wrapper.sh

index c410dcb..be866e7 100755 (executable)
@@ -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