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

Proposed by Julian Andres Klode
Status: Merged
Merged at revision: 7e7ed04dea76e847fd5a175d440924a41f4a6269
Proposed branch: ~juliank/autopkgtest/+git/development:master
Merge into: ~ubuntu-release/autopkgtest/+git/development:master
Diff against target: 13 lines (+1/-1)
1 file modified
runner/autopkgtest (+1/-1)
Reviewer Review Type Date Requested Status
Ubuntu Release Team Pending
Review via email: mp+373801@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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 "
439 archmatch=0;439 archmatch=0;
440 for (k=1; k<=NF; k++) {440 for (k=1; k<=NF; k++) {
441 if (\\$k ~ /^arch=/) foundarch=1;441 if (\\$k ~ /^arch=/) foundarch=1;
442 if (\\$k ~ /^arch=(.*,)?(all|any|%(arch)s)(,.*)?\\$/) archmatch=1; }442 if (\\$k ~ /^arch=(.*[,-])?(all|any|%(arch)s)([,-].*)?\\$/) archmatch=1; }
443 if (foundarch == 0 || archmatch == 1) thissrc[\\$1] = 1;443 if (foundarch == 0 || archmatch == 1) thissrc[\\$1] = 1;
444 next }444 next }
445 { if (!inlist) next;445 { if (!inlist) next;

Subscribers

People subscribed via source and target branches