pass -D through to sbuild

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

diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh
index b2ced3796c60d15b8c6220c7d5a6f7e2b3f766fd..12e178cc6badc752317e7f6b0989ecf4991923de 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";;
@@ -107,6 +108,8 @@ 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
@@ -122,9 +125,10 @@ dcmd "$dscfile_basename" | while read f; do
   test -f "$f" && continue
 
   case "$f" in
-    *.tar.gz) 
-      echo "I: fetching missing tarball: $f" >&2
-      apt-get --tar-only --only-source source "$packagename"
+    *.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}"
       ;;
     *)
       echo "E: I do not know how to obtain the file: $f" >&2
@@ -140,9 +144,9 @@ sbuild $sbuild_args --arch="$arch" --dist="$dist" --keyid=$KEYID \
 
 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"