From: Ian Jackson <ian@anarres>
Date: Wed, 14 Feb 2007 14:41:22 +0000 (+0000)
Subject: call vsp.bomb, not just bomb (!)
X-Git-Tag: converted-from-bzr~32^3~50
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b55140a5e5eefd7a07b3be0ce8c6503f207d12ad;p=autopkgtest.git

call vsp.bomb, not just bomb (!)
---

diff --git a/virt-subproc/adt-virt-xenlvm b/virt-subproc/adt-virt-xenlvm
index a4a1ec5..7909977 100755
--- a/virt-subproc/adt-virt-xenlvm
+++ b/virt-subproc/adt-virt-xenlvm
@@ -90,9 +90,9 @@ def do_open():
 		withholder.stdin.close()
 		withholder.stdout.close()
 		withholder = None
-		bomb("with-testbed failed, code %d" % rc)
+		vsp.bomb("with-testbed failed, code %d" % rc)
 	if l != "y\n":
-		bomb("with-testbed sh gave wrong output `%s', not `l'"
+		vsp.bomb("with-testbed sh gave wrong output `%s', not `l'"
 			% l.rstrip("\n"))
 	vsp.execute('mkdir %s' % downtmp, downp=True)	
 
@@ -103,7 +103,8 @@ def do_close():
 	withholder.stdout.close()
 	rc = withholder.wait()
 	withholder = None
-	if rc: bomb("with-testbed failed when closing/resetting, code %d" % rc)
+	if rc: vsp.bomb("with-testbed failed when closing/resetting,"
+			" code %d" % rc)
 
 def hook_forked_inchild():
 	if withholder is not None: