pld-builder.new: PLD_Builder/srpm_builder.py - clean up from src.rpms and r...

[arekm]

Author: arekm                        Date: Tue Apr 28 13:29:15 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- clean up from src.rpms and run deletion in chroot

---- Files affected:
pld-builder.new/PLD_Builder:
   srpm_builder.py (1.58 -> 1.59) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/srpm_builder.py
diff -u pld-builder.new/PLD_Builder/srpm_builder.py:1.58 pld-builder.new/PLD_Builder/srpm_builder.py:1.59
--- pld-builder.new/PLD_Builder/srpm_builder.py:1.58	Tue Apr 28 15:21:26 2009
+++ pld-builder.new/PLD_Builder/srpm_builder.py	Tue Apr 28 15:29:09 2009
@@ -120,8 +120,10 @@
     if res == 0:
         transfer_file(r, b)
     packagedir = "/home/users/builder/rpm/packages/%s" % b.spec[:-5]
-    if os.path.isdir(packagedir):
-        shutil.rmtree(packagedir)
+    chroot.run("cd %s; rpmbuild --nodeps --nobuild --define '_specdir %s' --define '_sourcedir %s' " \
+            "--clean --rmspec --rmsource %s" % \
+            (packagedir, packagedir, packagedir, b.spec), logfile = b.logfile)
+    chroot.run("rm -rf %s" % packagedir)
     status.pop()
     return res
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/srpm_builder.py?r1=1.58&r2=1.59&f=u