From: Ian Jackson <ian@davenant.greenend.org.uk>
Date: Tue, 21 Aug 2007 16:54:42 +0000 (+0100)
Subject: * adt-testreport-onepackage: Handling of source packages'
X-Git-Tag: converted-from-bzr~43
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1c35cbcdf416c6e7a00f6bce5a21524b8ecc66d2;p=autopkgtest.git

* 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 7096450..863797e 100644
--- 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 122abfb..3908e7c 100755
--- 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