more arch-handling fixes

diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh
index 5aee0ca3b51546f081f29afd72de412e005ba485..57dcaa68d5f6b933c07647544ff8fac96ffcd22f 100755 (executable)
--- a/sbuild-wrapper.sh
+++ b/sbuild-wrapper.sh
@@ -166,12 +166,13 @@ case "$binonly/$target_arch" in
   0/all) arch=all;;
   */any)
     arch="$(schroot -l | sed -rne 's,^sid-([^-]+).*,\1,p' | uniq | tr '\n' ' ')"
-    if [ "$binonly" = 0 ]; then
-      sbuild_args_sourceful="--source --arch-all"
-    fi
     ;;
 esac
 
+if [ "$binonly" = 0 ]; then
+  sbuild_args_sourceful="--source"
+fi
+
 for a in $arch; do
   echo "I: building $packagenameversion for $a/$dist…" >&2
 
@@ -180,11 +181,11 @@ for a in $arch; do
       arch_arg=--arch-all
       a="$DEB_BUILD_ARCH"
       ;;
-    *) --arch=$a;;
+    *) arch_arg="--arch=$a";;
   esac
 
-  sbuild $sbuild_args $sbuild_args_sourceful $arch_arg \
-    --dist="$dist" --keyid=$KEYID \
+  sbuild $sbuild_args $sbuild_args_sourceful \
+    $arch_arg --dist="$dist" --keyid=$KEYID \
     "$dscfile_basename" || ret=$?
 
   changesfile="${packagenameversion}_${a}.changes"
@@ -208,15 +209,17 @@ done
 
 if [ -n "${schangesfile:-}" ]; then
   sarch="${schangesfile##*_}"; sarch=${sarch%.changes}
-  combined_arch="$(echo -n "${sarch}+";
-                   for i in *.changes; do
-                     [ "$i" = "$schangesfile" ] && continue
-                     t="${i##*_}"; echo "${t%.changes}"
-                   done)"
+  other_archs="$(for i in *.changes; do
+                   [ "$i" = "$schangesfile" ] && continue
+                   t="${i##*_}"; echo "${t%.changes}"
+                 done)"
 
-  if [ -n "$combined_arch" ]; then
+  if [ -n "$other_archs" ]; then
+    combined_arch="${sarch}+${other_archs}"
     mergechanges *.changes > ${packagenameversion}_${combined_arch}.changes
     arch="$combined_arch"
+  else
+    arch="$sarch"
   fi
 fi