adt-run: work if "rw-build-tree" but not --user

diff --git a/runner/adt-run b/runner/adt-run
index 9f1f76381bad531730acd289f0791c53a3790b6c..a1996e670bba2af82940634db95aafc0dc3429ae 100755 (executable)
--- 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"