From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 14 Jun 2012 19:35:17 +0000 (+0100)
Subject: tmpdir: rename "tmp" in run() to "testtmp"
X-Git-Tag: debian/2.2.0~7
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=445e7696b8d68101827848443eb87dc4b6d96651;p=autopkgtest.git

tmpdir: rename "tmp" in run() to "testtmp"
---

diff --git a/runner/adt-run b/runner/adt-run
index e8cf85f..8df4bf4 100755
--- a/runner/adt-run
+++ b/runner/adt-run
@@ -1155,17 +1155,17 @@ class Test:
 
 	if 'needs-root' not in t.restriction_names and opts.user is not None:
 		tfl = ['su',opts.user,'-c',tf]
-		tmp = '%s%s-tmp' % (testbed.scratch.read(True), t.what)
+		testtmp = '%s%s-testtmp' % (testbed.scratch.read(True), t.what)
 		script = 'rm -rf -- "$1"; mkdir -- "$1"'
 		if opts.user:
 			script += '; chown %s "$1"' % opts.user
 			if 'rw-build-tree' in t.restriction_names:
 				script += '; chown -R %s "$2"' % opts.user
-		xenv = ['TMPDIR=%s' % tmp]
+		xenv = ['TMPDIR=%s' % testtmp]
 		rc = testbed.execute('mktmpdir-'+t.what,
 			['sh','-xec',script,'x',xenv=xenv,tree.read(True)])
 		if rc: bomb("could not create test tmp `%s', exit code %d"
-				% (tmp, rc))
+				% (testtmp, rc))
 	else:
 		tfl = [tf]