extras-buildsys/utils/pushscript Push.py, 1.31, 1.32 Comps.py, 1.3, 1.4

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	Push.py Comps.py 
Log Message:
Update comps.xml at beginning of push and not automatically for frozen dists.


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Push.py	21 Feb 2007 20:47:53 -0000	1.31
+++ Push.py	23 Feb 2007 18:47:05 -0000	1.32
@@ -619,6 +619,11 @@
         print 'Script locked via %s\nIt seems to be in use already.' % lockfile
         sys.exit(errno.EPERM)
 
+    if cfg.comps_up_pass1:
+        print 'Processing comps.xml updates (Ctrl+C to skip)'
+        sys.stdout.flush()
+        Comps.main(cfg)
+
     changed = []      # dists with changes in them
     mustfinish = []   # dists with pending build report
     totalchanges = 0
@@ -644,11 +649,6 @@
     if opts.force:
         changed = diststopush
 
-    if cfg.comps_up_pass1:
-        print 'Processing comps.xml updates (Ctrl+C to skip)'
-        sys.stdout.flush()
-        Comps.main(cfg)
-
     for dist in changed:
         if cfg.opts.repoprune:
             RepoPrune.main(cfg,dist)


Index: Comps.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Comps.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Comps.py	25 Jan 2007 23:38:28 -0000	1.3
+++ Comps.py	23 Feb 2007 18:47:05 -0000	1.4
@@ -110,6 +110,8 @@
                 self._restoreBackup()
                 if self._update(self.cfg.comps_up_pass2):
                     for dist in self.cfg.alldists:
+                        if dist in self.cfg.frozendists:
+                            continue
                         self._install(dist)
         # TODO: Error-handling and reporting. We don't want these to
         # be fatal.