pld-builder.new: PLD_Builder/srpm_builder.py Just rm whole directory when c...
arekm
arekm at pld-linux.org
Tue Apr 28 15:19:33 CEST 2009
Author: arekm Date: Tue Apr 28 13:19:32 2009 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
Just rm whole directory when cleaning.
---- Files affected:
pld-builder.new/PLD_Builder:
srpm_builder.py (1.56 -> 1.57)
---- Diffs:
================================================================
Index: pld-builder.new/PLD_Builder/srpm_builder.py
diff -u pld-builder.new/PLD_Builder/srpm_builder.py:1.56 pld-builder.new/PLD_Builder/srpm_builder.py:1.57
--- pld-builder.new/PLD_Builder/srpm_builder.py:1.56 Tue Apr 28 15:11:41 2009
+++ pld-builder.new/PLD_Builder/srpm_builder.py Tue Apr 28 15:19:27 2009
@@ -7,6 +7,7 @@
import StringIO
import sys
import re
+import shutil
import atexit
import gpg
@@ -114,14 +115,12 @@
if res == 0 and not "test-build" in r.flags:
for pref in config.tag_prefixes:
util.append_to(b.logfile, "Tagging with prefix: %s" % pref)
- res = chroot.run("cd rpm/SPECS; ./builder -r %s -Tp %s -Tv %s" % \
+ res = chroot.run("cd rpm/packages; ./builder -r %s -Tp %s -Tv %s" % \
(b.branch, pref, b.spec), logfile = b.logfile)
if res == 0:
transfer_file(r, b)
- packagedir = "rpm/packages/%s" % b.spec[:-5]
- 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)
+ packagedir = "/home/users/builder/rpm/packages/%s" % b.spec[:-5]
+ shutil.rmtree(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.56&r2=1.57&f=u
More information about the pld-cvs-commit
mailing list