no longer necessary to merge changes

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

diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh
index 6b908454287a3737baf4e1b69226ec2fc78c6ec0..ead8053c19e413d41b39fab7b512725d20dc83fc 100755 (executable)
--- a/sbuild-wrapper.sh
+++ b/sbuild-wrapper.sh
@@ -107,6 +107,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,7 +124,11 @@ dcmd "$dscfile_basename" | while read f; do
   test -f "$f" && continue
 
   case "$f" in
-    *.tar.gz) 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
       exit 1
@@ -137,9 +143,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"