From: Ian Jackson <ian@davenant.greenend.org.uk>
Date: Mon, 2 Jul 2007 15:46:05 +0000 (+0100)
Subject: * Fix syntax errors introduced by print-execute-command etc.
X-Git-Tag: converted-from-bzr~46^2~10
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e09e35878445b4bf40a3229ee1edac5d232a01a0;p=autopkgtest.git

* Fix syntax errors introduced by print-execute-command etc.
---

diff --git a/debian/changelog b/debian/changelog
index e4d6087..0b414e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ autopkgtest (0.9.0~iwj) unstable; urgency=low
 
   * WIP userv service.
   * WIP print-execute-command command for virtualisation servers.
+  * Fix syntax errors introduced by print-execute-command etc.
   * Do not demand vg or distro information for initscript to work.
   * autopkgtest-xenlvm now Recommends: lvm2 and debootstrap.
   * pass count= to dd for erasure when lvm_erasebase=true.
@@ -22,7 +23,7 @@ autopkgtest (0.9.0~iwj) unstable; urgency=low
     spurious warning from the lvm tools).
   * autopkgtest Suggests curl (adt-testreport-onepackage needs it).
 
- -- Ian Jackson <ian@davenant.greenend.org.uk>  Mon,  2 Jul 2007 15:59:53 +0100
+ --
 
 autopkgtest (0.8.2feisty1~iwj) feisty-updates; urgency=low
 
diff --git a/virt-subproc/VirtSubproc.py b/virt-subproc/VirtSubproc.py
index 9b3c36f..b53c381 100644
--- a/virt-subproc/VirtSubproc.py
+++ b/virt-subproc/VirtSubproc.py
@@ -82,7 +82,7 @@ def cmd_print_execute_command(c, ce):
 	if not downtmp: bomb("`print-execute-command' when not open")
 	if hasattr(caller,'hook_callerexeccmd'):
 		(cl,kvl) = caller.hook_callerexeccmd()
-	else
+	else:
 		cl = down
 		kvl = ['auxverb']
 	return ','.join(map(urllib.quote, cl)) + kvl
diff --git a/virt-subproc/adt-virt-xenlvm b/virt-subproc/adt-virt-xenlvm
index 46ee14e..0d49876 100755
--- a/virt-subproc/adt-virt-xenlvm
+++ b/virt-subproc/adt-virt-xenlvm
@@ -85,23 +85,23 @@ def parse_args():
 	if not opts.userv:
 		if opts.gain_root is None: gain_root = []
 		else: gain_root = opts.gain_root.split()
-		with_testbed = gain_root + ['adt-xenlvm-with-testbed'] +
+		with_testbed = (gain_root + ['adt-xenlvm-with-testbed'] +
 			xargs_direct + xlargs +
-			['--','sh','-ec','echo y; exec cat']
-		vsp.down = gain_root + ['adt-xenlvm-on-testbed'] +
-			xargs_direct + xlargs + ['--']
+			['--','sh','-ec','echo y; exec cat'])
+		vsp.down = (gain_root + ['adt-xenlvm-on-testbed'] +
+			xargs_direct + xlargs + ['--'])
 	else:
 		if opts.gain_root:
 			pe('--userv and --gain-root are not compatible')
-		basis = ['userv'] + xargs_userv + xlargs +
-			['root','adt-xenlvm-testbed']
+		basis = (['userv'] + xargs_userv + xlargs +
+			['root','adt-xenlvm-testbed'])
 		get_down = subprocess.Popen(basis + ['pon0'],
 			stdin=file('/dev/null'), stdout=subprocess.PIPE,
 			stderr=None)
 		(pon0, _) = get_down.communicate()
 		if get_down.returncode:
 			vsp.bomb('failed to check userv service provision'
-				' and subcommand details (code=%d) %
+				' and subcommand details (code=%d)' %
 				get_down.returncode)
 		vsp.down = pon0.split('\0')
 	pauses = opts.pause.split(',')