extras-buildsys/utils extras-push-new,1.60,1.61

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	extras-push-new 
Log Message:
disabling multilib pass 1 (for testing and further changes/updates)


Index: extras-push-new
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- extras-push-new	19 Sep 2006 10:03:58 -0000	1.60
+++ extras-push-new	19 Sep 2006 10:09:42 -0000	1.61
@@ -407,7 +407,8 @@
         print 'ERROR: %s: %s' % (strerr,runfilename)
         sys.exit(err)
 
-    ExtrasMultiLib.reset(dist)
+    # TODO: pass 1 disabled currently
+    #ExtrasMultiLib.reset(dist)
     
     distdir = '%s-%s-%s' % (distro, dist, project)
     needsign = os.path.join(stagesdir, distdir)
@@ -553,16 +554,16 @@
         destloc = os.path.join(destdir, basearch, pkg_destfn)
         install_move(srcloc,destloc)
 
-        # TODO:
-        if not (package in files['debuginfo']):
-            ExtrasMultiLib.evalPackage(ts,package,dist,srpmlocdict)
+        # TODO: pass 1 disabled currently
+        #if not (package in files['debuginfo']):
+        #    ExtrasMultiLib.evalPackage(ts,package,dist,srpmlocdict)
             
     debugprint('Removing tmp tree %s' % signtmpdir)
     if not DEBUG:
         shutil.rmtree(signtmpdir)
 
-    # TODO:
-    ExtrasMultiLib.savePendingPkgs(dist)
+    # TODO: pass 1 disabled currently
+    #ExtrasMultiLib.savePendingPkgs(dist)
     
     # Store list of new packages on disk, so it can be mailed later.
     for add in infolist:
@@ -701,8 +702,9 @@
             run_and_check('extras-repomanage.py %s' % dist)
             run_and_check('extras-repobuild.py %s' % dist)
 
-        # TODO: multilib resolver hook
+        # TODO: multilib resolver hook (pass 2)
         for dist in diststopush:
+            ExtrasMultiLib.evalFromTree(dist)
             for arch in archdict[dist]:  # list of repo archs
                 changedagain = ExtrasMultiLib.resolveMissing(dist,arch)
                 if changedagain: