* adt-testreport-onepackage: Handling of source packages'

  Architecture: field corrected so package selection works properly.
* adt-testreport-onepackage: use ln -f when installing summary.

diff --git a/debian/changelog b/debian/changelog
index 70964503a7b6df3943fc454815b658b5bdc51b6a..863797e76ee60cad8a88e3d316b058733db83e88 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+autopkgtest (1.0.4) unstable; urgency=low
+
+  * adt-testreport-onepackage: Handling of source packages'
+    Architecture: field corrected so package selection works properly.
+  * adt-testreport-onepackage: use ln -f when installing summary.
+
+ --
+
 autopkgtest (1.0.3) unstable; urgency=low
 
   * Set LANG to C by default for commands (eg builds and tests) run on

diff --git a/runner/adt-testreport-onepackage b/runner/adt-testreport-onepackage
index 122abfb552a6e26d7670784894b9a63ed931c53c..3908e7ce9013bb343be1917125456e57567a48b4 100755 (executable)
--- a/runner/adt-testreport-onepackage
+++ b/runner/adt-testreport-onepackage
@@ -99,6 +99,7 @@ if [ "x$pkg" = x ]; then
                return if $score < $best_score
                     or ($score==$best_score and \
                         $package gt $best_package);
+#printf STDERR " <----- best score=%s best_score=%s\n", $score, $best_score;
                $best_score= $score;
                $best_package= $package;
        }
@@ -124,8 +125,10 @@ if [ "x$pkg" = x ]; then
                        $score= 1e7 if $score>1e7;
                        $score *= 5 if $lastver{$package} ne $version;
                        $score *= 10 unless $extras{$package} =~ m/ nt /;
+#print STDERR "$package score $score\n";
                } elsif (m/^Architecture:.*/ &&
-                        !m/\s'$arch'\s/) {
+                        !m/\s(?:'$arch'|all|any)\s/) {
+#printf STDERR " <----- skip %s %s\n", $&, "'$arch'";
                        $skip= 1;
                } elsif (m/^$/) {
                        endpackage();
@@ -256,7 +259,7 @@ progress "RESULTS $summary"
 if $upload; then
        progress "bundling"
        printf "\n%s\n" "$summary" >>"$tmp"/_summary
-       ln "$tmp"/_summary "$tp"/summary
+       ln -f "$tmp"/_summary "$tp"/summary
 
        for odir in tmp out; do
                if test -d "$tp"/$odir; then