From: Ian Jackson <ian@davenant.greenend.org.uk>
Date: Thu, 25 Oct 2007 17:36:25 +0000 (+0100)
Subject: * allow suppresspackages and blacklist lists to contain more
X-Git-Tag: converted-from-bzr~24
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e3768b5afdaf2c75e0e64dac343a7eb5cf2e44bf;p=autopkgtest.git

* allow suppresspackages and blacklist lists to contain more
  information after some whitespace
---

diff --git a/debian/changelog b/debian/changelog
index 5145827..08f5a49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 autopkgtest (1.1.1~) unstable; urgency=low
 
   * hosts/cadmium/update-suppression: really do not install empty file.
+  * allow suppresspackages and blacklist lists to contain more
+    information after some whitespace
 
  --
 
diff --git a/runner/adt-testreport-onepackage b/runner/adt-testreport-onepackage
index b0f138b..dc00cd7 100755
--- a/runner/adt-testreport-onepackage
+++ b/runner/adt-testreport-onepackage
@@ -107,7 +107,7 @@ if [ "x$pkg" = x ]; then
 		unshift @ARGV, $filename; f1();
 		while (<F>) {
 			next if m/^\#/ or !m/\S/;
-			die unless m/^($pre)\s*$/;
+			die unless m/^($pre)(?:\S.*)?\s*$/;
 			$arrayref->{$1}= 1;
 		}
 		f2();