* allow suppresspackages and blacklist lists to contain more

  information after some whitespace

diff --git a/debian/changelog b/debian/changelog
index 51458272f2084b16da997c57d194c5471098cbcf..08f5a491552afacad9568a0ea1c910f5e38955d5 100644 (file)
--- 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 b0f138bd05289160939c7878f384f4df4eb78b7c..dc00cd7dc49c344febec864808dc6960e9e31ff3 100755 (executable)
--- 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();