Author: glen Date: Thu Oct 13 01:10:52 2011 GMT Module: pld-builder.new Tag: HEAD ---- Log message: avoid removing whole rpm/packages if b.spec empty
---- Files affected: pld-builder.new/PLD_Builder: srpm_builder.py (1.79 -> 1.80) ---- Diffs: ================================================================ Index: pld-builder.new/PLD_Builder/srpm_builder.py diff -u pld-builder.new/PLD_Builder/srpm_builder.py:1.79 pld-builder.new/PLD_Builder/srpm_builder.py:1.80 --- pld-builder.new/PLD_Builder/srpm_builder.py:1.79 Sat Oct 1 20:54:51 2011 +++ pld-builder.new/PLD_Builder/srpm_builder.py Thu Oct 13 03:10:47 2011 @@ -124,13 +124,20 @@ (b.branch, pref, b.spec), logfile = b.logfile) if res == 0: transfer_file(r, b) - packagedir = "rpm/packages/%s" % b.spec[:-5] + packagename = b.spec[:-5] - chroot.run("rpmbuild --nodeps --nobuild --define '_topdir %%(echo $HOME/rpm)' --define '_specdir %%{_topdir}/%%{name}' --define '_sourcedir %%{_specdir}' " \ - "--clean --rmspec --rmsource %s/%s" % \ - (packagedir, b.spec), logfile = b.logfile) - chroot.run("rm -rf %s" % packagedir, logfile = b.logfile) - status.pop() + if len(packagename) == 0: + util.append_to(b.logfile, "error: No package name specified") + res = "FAIL_MISSING_PACKAGE" + + if res == 0: + packagedir = "rpm/packages/%s" % packagename + chroot.run("rpmbuild --nodeps --nobuild --define '_topdir %%(echo $HOME/rpm)' --define '_specdir %%{_topdir}/%%{name}' --define '_sourcedir %%{_specdir}' " \ + "--clean --rmspec --rmsource %s/%s" % \ + (packagedir, b.spec), logfile = b.logfile) + chroot.run("rm -rf %s" % packagedir, logfile = b.logfile) + status.pop() + if res: res = "FAIL" return res ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/srpm_builder.py?r1=1.79&r2=1.80&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit