extras-buildsys/utils ExtrasMultiLib.py, 1.2, 1.3 extras-push-new, 1.57, 1.58

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	ExtrasMultiLib.py extras-push-new 
Log Message:
more adjustments



Index: ExtrasMultiLib.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/ExtrasMultiLib.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExtrasMultiLib.py	17 Sep 2006 17:32:44 -0000	1.2
+++ ExtrasMultiLib.py	17 Sep 2006 18:16:42 -0000	1.3
@@ -78,11 +78,6 @@
     return False # reject by default
 
 
-def reset():
-    global missingdict
-    missingdict = {}
-
-
 def evalPackage(ts,fname,dist, srpmlocdict):
     # Examine the package, see whether we want it for any of the
     # enabled multilib repositories. Then store the package names
@@ -185,6 +180,16 @@
         pass
 
 
+def reset(dist):
+    loadPendingPkgs(dist)
+
+
+def done(dist):
+    global missingdict
+    missingdict = {}
+    savePendingPkgs(dist)
+
+
 def evalFromTree(dist):
     ts = rpmUtils.transaction.initReadOnlyTransaction()
     for srcarch in archdict[dist]:  # list of repo archs


Index: extras-push-new
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- extras-push-new	16 Sep 2006 20:35:48 -0000	1.57
+++ extras-push-new	17 Sep 2006 18:16:42 -0000	1.58
@@ -137,7 +137,7 @@
     d = os.listdir(repodir)
     try:
         d.remove('repodata')
-    except:
+    except KeyError:
         pass
     return d
 
@@ -407,7 +407,7 @@
         print 'ERROR: %s: %s' % (strerr,runfilename)
         sys.exit(err)
 
-    ExtrasMultiLib.reset()
+    ExtrasMultiLib.reset(dist)
     
     distdir = '%s-%s-%s' % (distro, dist, project)
     needsign = os.path.join(stagesdir, distdir)
@@ -451,9 +451,6 @@
     if len(rpms) == 0:
         return 0, changed
     rpms.sort()
-    for item in rpms:
-        print ' %s' % os.path.basename(item)
-
     print 'Copying packages to temporary working directory:'
     if not DEBUG:
         try:
@@ -473,6 +470,7 @@
             if not DEBUG:
                 if not os.path.exists(destpath):
                     os.makedirs(destpath)
+            print '  %s' % os.path.basename(src)
             install_copy(src,dst)
         except:
             print 'ERROR: Creating temporary working copy failed.'
@@ -497,7 +495,7 @@
                 shutil.rmtree(signtmpdir)
             return result, changed
 
-    print "Copying packages into place:"
+    print "Copying packages into repositories:"
     infolist = []  # list of src.rpm NEVR for build report
     
     global srpmlocdict
@@ -703,10 +701,11 @@
             run_and_check('extras-repobuild.py %s' % dist)
 
         # TODO: multilib resolver hook
-        for dist in changed:
+        for dist in diststopush:
             changedagain = False
             for arch in archdict[dist]:  # list of repo archs
                 changedagain |= ExtrasMultiLib.resolveMissing(dist,arch)
+            ExtrasMultiLib.done(dist)
             if changedagain:
                 run_and_check('extras-repobuild.py %s' % dist)