extras-buildsys/server buildjob.py,1.5,1.6

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	buildjob.py 
Log Message:
2005-06-08  Dan Williams <dcbw at redhat.com>

    * Fix SRPM only mode:
      - server/buildjob.py: In 'prep' stage, make sure we know where the SRPM is, and
            don't try to delete the checkout dir when in SRPM-only mode (since there is
            no checkout dir)




Index: buildjob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/buildjob.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- buildjob.py	9 Jun 2005 01:57:41 -0000	1.5
+++ buildjob.py	9 Jun 2005 02:39:11 -0000	1.6
@@ -229,6 +229,11 @@
 
     def _prep(self):
         self.curstage = 'prep'
+
+        # In SRPM-only mode, cvs_tag is path to the SRPM to build
+        if self.no_cvs:
+            self.srpm_path = self.cvs_tag
+
         ts = rpmUtils.transaction.initReadOnlyTransaction()
         hdr = rpmUtils.miscutils.hdrFromPackage(ts, self.srpm_path)
         self.name = hdr['name']
@@ -266,7 +271,8 @@
         self.srpm_path = srpm_in_dir
 
         # Remove CVS checkout and make_srpm dirs
-        shutil.rmtree(self.checkout_tmpdir, ignore_errors=True)
+        if not self.no_cvs:
+            shutil.rmtree(self.checkout_tmpdir, ignore_errors=True)
 
     def process(self):
         # Advance to next stage based on current stage