adt-run: Fix typo to make "build-needed" work (Closes #637353)

[autopkgtest.git] / virt-subproc / adt-virt-null

diff --git a/virt-subproc/adt-virt-null b/virt-subproc/adt-virt-null
index e1a887b3881fee46bf6b4a36cae27faaf7860bae..991224fa758063d9b8ac645d050e83e3b23ec224 100755 (executable)
--- a/virt-subproc/adt-virt-null
+++ b/virt-subproc/adt-virt-null
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/python2.6
 #
 # adt-virt-null is part of autopkgtest
 # autopkgtest is a tool for testing Debian binary packages
@@ -27,9 +27,9 @@ import os
 import string
 from optparse import OptionParser
 
-try: our_base = os.environ['AUTOPKGTEST_BASE']
-except KeyError: our_base = '/usr/share/autopkgtest';
-sys.path.insert(1, our_base+'/python')
+try: our_base = os.environ['AUTOPKGTEST_BASE']+'/lib'
+except KeyError: our_base = '/usr/share/autopkgtest/python';
+sys.path.insert(1, our_base)
 
 import VirtSubproc as vsp
 capabilities = []
@@ -53,15 +53,16 @@ def parse_args():
                capabilities.append('root-on-testbed')
 
        vsp.down = []
+       vsp.downkind = 'auxverb'
 
 def hook_open():
-       global downtmp
-       vsp.execute('true', downp=True)
-       downtmp = vsp.execute('mktemp -t -d', downp=True, outp=True)
-       return downtmp
+       pass
+
+def hook_downtmp():
+       return vsp.downtmp_mktemp()
 
 def hook_cleanup():
-       vsp.execute('rm -rf --', [downtmp], downp=True)
+       vsp.downtmp_remove()
 
 def hook_forked_inchild():
        pass