Bugfix: Python backtrace (no method "bomb") on bad tests/control syntax.

diff --git a/debian/changelog b/debian/changelog
index bd8b1991b6c461aa81d985eedaacb881f19d3416..a499af6a137b002d036d2a1a1cd81e9c0ea3db20 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+autopkgtest (2.0.1) unstable; urgency=medium
+
+  * Bugfixes:
+    - Python backtrace (no method "bomb") on bad tests/control syntax.
+
+ --
+
 autopkgtest (2.0.0) unstable; urgency=medium
 
   * Incompatible test declaration spec changes:

diff --git a/runner/adt-run b/runner/adt-run
index f935f3fe1ed86658ae9418d6f860043259292d28..e4f7e9eec26e1321ef30def594897d75f5c37a49 100755 (executable)
--- a/runner/adt-run
+++ b/runner/adt-run
@@ -1204,7 +1204,7 @@ def read_control(act, tree, control_override):
                return []
 
        lno = 0
-       def badctrl(m): act.bomb('tests/control line %d: %s' % (lno, m))
+       def badctrl(m): testbed.bomb('tests/control line %d: %s' % (lno, m))
        stz = None      # stz[field_name][index] = (lno, value)
                        # special field names:
                        # stz[' lno'] = number