Merge ~juliank/autopkgtest/+git/development:master into ~ubuntu-release/autopkgtest/+git/development:master

[Julian Andres Klode]

This is a rebase on upstream, please reset to it (rather than merge).

diff --git a/runner/autopkgtest b/runner/autopkgtest
index c4c7601..93c6e61 100755
--- a/runner/autopkgtest
+++ b/runner/autopkgtest
@@ -439,7 +439,7 @@ pkgs=$(echo "$pkgs\n" | awk "
     archmatch=0;
     for (k=1; k<=NF; k++) {
       if (\\$k ~ /^arch=/) foundarch=1;
-      if (\\$k ~ /^arch=(.*,)?(all|any|%(arch)s)(,.*)?\\$/) archmatch=1; }
+      if (\\$k ~ /^arch=(.*[,-])?(all|any|%(arch)s)([,-].*)?\\$/) archmatch=1; }
     if (foundarch == 0 || archmatch == 1) thissrc[\\$1] = 1;
     next }
   { if (!inlist) next;