extras-buildsys/utils/pushscript RCNeedsign.py,1.1,1.2

Michael Schwendt (mschwendt) fedora-extras-commits at redhat.com
Thu Mar 1 00:04:24 UTC 2007


Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1100

Modified Files:
	RCNeedsign.py 
Log Message:
revert to previous copy -- tmpdir is required as long as push *moves* packages


Index: RCNeedsign.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/RCNeedsign.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RCNeedsign.py	28 Feb 2007 23:18:17 -0000	1.1
+++ RCNeedsign.py	1 Mar 2007 00:04:21 -0000	1.2
@@ -42,10 +42,26 @@
     br = LocalPlague(needsignroot)
     br.PruneBuildResults()  # optional
     results = br.GetBuildResults()
-    for br in results:
-        br.origin = None  # disconnect from needsign (very important!)
+#    for br in results:
+#        br.origin = None  # disconnect from needsign (very important!)
 
     import tempfile
+    print 'Copying build results to temporary working directory:'
+    signtmpdir = tempfile.mkdtemp('','.push',cfg.treedir)
+    if signtmpdir == cfg.treedir: # paranoid, should never happen
+        sys.exit(errno.EPERM)
+    try:
+        for br in results:
+            print ' ', br
+            newhome = os.path.join(signtmpdir,br.__str__())
+            shutil.copytree(br.GetHome(),newhome)
+            br.SetHome(newhome)
+            br.origin = None  # disconnect from needsign (very important!)
+    except: # everything is fatal
+        print 'ERROR: Creating temporary working copy failed.'
+        shutil.rmtree(signtmpdir)
+        raise
+
     print 'Installing into temporary repository:'
     Push.cfg = cfg
     Push.srpmlocdict = {}
@@ -62,7 +78,9 @@
     except: # everything is fatal
         print 'ERROR: Creating temporary working copy failed.'
         shutil.rmtree(tmpdir)
+        shutil.rmtree(signtmpdir)
         raise
+    shutil.rmtree(signtmpdir)
 
     cmd = '/srv/extras-push/work/extras-repoclosure/rc-run.py --mail=owners --needsign=file://%s %s' % (tmpdir+'/%s/%s/',dist)
     print 'Running', cmd




More information about the fedora-extras-commits mailing list