expand user tar files in /srv . Correct fix for dmwm#7661 (dmwm#7708)

* expand user tar files in /srv . Correct fix for dmwm#7661

* final cleanup

scripts/CMSRunAnalysis.py

@@ -383,10 +383,19 @@ def parseArgs():
     return opts
 
 def prepSandbox(opts):
-    print("==== Sandbox untarring STARTING at %s ====" % time.asctime(time.gmtime()))
+    print("==== Sandbox untarring in job's top dir STARTING at %s ====" % time.asctime(time.gmtime()))
 
     #The user sandbox.tar.gz has to be unpacked no matter what (even in DEBUG mode)
+    print(f"expanding {opts.archiveJob} in {os.getcwd()}")
     print(subprocess.getoutput('tar xfm %s' % opts.archiveJob))
+    # if the sandbox contains tar files, expand them
+    files = subprocess.getoutput(f"tar tf {opts.archiveJob}").split('\n')
+    for file in files:
+        if ('.tar.' in file) or file.endswith('.tar') or\
+                file.endswith('.tgz') or file.endswith('.tbz'):
+            print(f"expanding {file} in {os.getcwd()}")
+            print(subprocess.getoutput(f"tar xfm {file}"))
+
     print("==== Sandbox untarring FINISHED at %s ====" % time.asctime(time.gmtime()))
 
     #move the pset in the right place
@@ -413,12 +422,6 @@ def extractUserSandbox(archiveJob, cmsswVersion):
     print(subprocess.getoutput('tar xfm %s ' % os.path.join('..', archiveJob)))
     os.rename('PSet.py', '../PSet.py')
     os.rename('PSet.pkl', '../PSet.pkl')
-    # if the sandbox contains tar files, expand them
-    files = subprocess.getoutput(f"tar tf ../{archiveJob}").split('\n')
-    for file in files:
-        if ('.tar.' in file) or file.endswith('.tar') or\
-                file.endswith('.tgz') or file.endswith('.tbz'):
-            print(subprocess.getoutput(f"tar xfm {file}"))
     os.chdir('..')
 
 def getProv(filename, scram):