From 0cc329634d2a8ec0a01cc7214184d547cbd89cb0 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 14 Aug 2011 12:14:13 +0100
Subject: [PATCH] Bugfix: Python backtrace (no method "bomb") on bad
 tests/control syntax.

---
 debian/changelog | 7 +++++++
 runner/adt-run   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index bd8b199..a499af6 100644
--- 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 f935f3f..e4f7e9e 100755
--- 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
-- 
2.30.2