pld-builder.new: PLD_Builder/srpm_builder.py - use package dir inside packa...

glen glen at pld-linux.org
Thu Oct 13 09:51:15 CEST 2011


Author: glen                         Date: Thu Oct 13 07:51:15 2011 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- use package dir inside packages dir, otherwise empty package dirs leave around in rpm dir

---- Files affected:
pld-builder.new/PLD_Builder:
   srpm_builder.py (1.81 -> 1.82) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/srpm_builder.py
diff -u pld-builder.new/PLD_Builder/srpm_builder.py:1.81 pld-builder.new/PLD_Builder/srpm_builder.py:1.82
--- pld-builder.new/PLD_Builder/srpm_builder.py:1.81	Thu Oct 13 03:17:40 2011
+++ pld-builder.new/PLD_Builder/srpm_builder.py	Thu Oct 13 09:51:10 2011
@@ -133,7 +133,7 @@
 
     packagename = b.spec[:-5]
     packagedir = "rpm/packages/%s" % packagename
-    chroot.run("rpmbuild --nodeps --nobuild --define '_topdir %%(echo $HOME/rpm)' --define '_specdir %%{_topdir}/%%{name}' --define '_sourcedir %%{_specdir}' " \
+    chroot.run("rpmbuild --nodeps --nobuild --define '_topdir %%(echo $HOME/rpm)' --define '_specdir %%{_topdir}/packages/%%{name}' --define '_sourcedir %%{_specdir}' " \
             "--clean --rmspec --rmsource %s/%s" % \
             (packagedir, b.spec), logfile = b.logfile)
     chroot.run("rm -rf %s" % packagedir, logfile = b.logfile)
================================================================

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



More information about the pld-cvs-commit mailing list