extras-buildsys/utils/pushscript Comps.py, 1.1, 1.2 Push.py, 1.13, 1.14

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	Comps.py Push.py 
Log Message:
enable Comps.py module in push process




Index: Comps.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Comps.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Comps.py	8 Nov 2006 20:23:57 -0000	1.1
+++ Comps.py	9 Nov 2006 00:57:08 -0000	1.2
@@ -66,7 +66,7 @@
     
 
     def Update(self):
-        self.workdir = os.path.join(cfg.rundir,'comps')
+        self.workdir = os.path.join(self.cfg.rundir,'comps')
         if not os.path.exists(self.workdir):
             print 'WARNING: %s missing! Manual setup needed.' % self.workdir
             return
@@ -80,16 +80,14 @@
                 if self._update(self.cfg.comps_up_pass2):
                     for dist in self.cfg.alldists:
                         self._install(dist)
+        # TODO: Error-handling and reporting. We don't want these to
+        # be fatal.
         except IOError:
-            os.chdir(self.olddir)
-            self._cleanup()
+            pass
         except OSError:
-            os.chdir(self.olddir)
-            self._cleanup()
+            pass
         except KeyboardInterrupt:
-            os.chdir(self.olddir)
-            self._cleanup()
-            raise
+            pass
         os.chdir(self.olddir)
         self._cleanup()
 


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Push.py	1 Nov 2006 11:37:09 -0000	1.13
+++ Push.py	9 Nov 2006 00:57:08 -0000	1.14
@@ -24,7 +24,7 @@
 import tempfile
 import time
 
-import Utils, MultiLib
+import Utils, MultiLib, Comps
 import RepoBuild, RepoPrune, RepoView
 
 DEBUG = False
@@ -638,6 +638,10 @@
     if opts.force:
         changed = diststopush
 
+    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)