support all new orig compressions

[code/mbuild.git] / sbuild-wrapper.sh

diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh
index 8d007873ded11d917fd055a14dee7e925efbf0ab..c410dcb18b66f9074bd01c38a471468f4cd4fd8d 100755 (executable)
--- 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";;
@@ -89,7 +90,7 @@ for opt in "$@"; do
       fi
       ;;
     *)
-      echo "E: unknown option: $opt" >&1
+      echo "E: unknown option: $opt" >&2
       exit 1
       ;;
   esac
@@ -105,7 +106,11 @@ fi
 dist="$(sed -ne 's,Distribution: ,,p' "$schangesfile")"
 
 schangesfile_basename="${schangesfile##*/}"
+packagename="${schangesfile_basename%%_*}"
 packagenameversion="${schangesfile_basename%_*}"
+debversion="${packagenameversion#*_}"
+upstream_version="${debversion%-*}"
+dscfile_basename="$packagenameversion".dsc
 
 case "$schangesfile" in
   */*) cd "${schangesfile%/*}";;
@@ -116,16 +121,32 @@ schangesfile="$schangesfile_basename"
 
 cd "$BUILDDIR"
 
+dcmd "$dscfile_basename" | while read f; do
+  test -f "$f" && continue
+
+  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}"
+      ;;
+    *)
+      echo "E: I do not know how to obtain the file: $f" >&2
+      exit 1
+      ;;
+  esac
+done
+
 [ "$binonly" = 0 ] && sbuild_args="${sbuild_args:+$sbuild_args }--source --arch-all"
 
 sbuild $sbuild_args --arch="$arch" --dist="$dist" --keyid=$KEYID \
-  "$packagenameversion".dsc
+  "$dscfile_basename"
 
 changesfile="${packagenameversion}_${arch}.changes"
 
-mergechanges "$schangesfile" "$changesfile" > temp-combined.changes
-mv temp-combined.changes "$changesfile"
-changestool "$changesfile" updatechecksums
+#mergechanges "$schangesfile" "$changesfile" > temp-combined.changes
+#mv temp-combined.changes "$changesfile"
+#changestool "$changesfile" updatechecksums
 
 #sign_changes_file "$changesfile"