From 8e109672f61ad1075e844d6b473692e112d48b58 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 26 Jul 2011 13:33:26 +0100 Subject: [PATCH] adt-run: work if "rw-build-tree" but not --user --- runner/adt-run | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/runner/adt-run b/runner/adt-run index 9f1f763..a1996e6 100755 --- a/runner/adt-run +++ b/runner/adt-run @@ -1132,9 +1132,10 @@ class Test: tfl = ['su',opts.user,'-c',tf] tmpdir = '%s%s-tmpdir' % (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 + if opts.user: + script += '; chown %s "$1"' % opts.user + if 'rw-build-tree' in t.restriction_names: + script += '; chown -R %s "$2"' % opts.user rc = testbed.execute('mktmpdir-'+t.what, ['sh','-xec',script,'x',tmpdir,tree.read(True)]) if rc: bomb("could not create test tmpdir `%s', exit code %d" -- 2.30.2