summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogdano Arendartchuk <bogdano@mandriva.org>2007-05-07 21:55:10 +0000
committerBogdano Arendartchuk <bogdano@mandriva.org>2007-05-07 21:55:10 +0000
commit40207f7187de7163de48321e9fa6b2022d5c2cff (patch)
tree36b1449c0610ac1273853eedaba3ea26cb6a3f7d
parent11e2e30360a24bcc22ca4231fca495e5d846abb5 (diff)
downloadbm-40207f7187de7163de48321e9fa6b2022d5c2cff.tar
bm-40207f7187de7163de48321e9fa6b2022d5c2cff.tar.gz
bm-40207f7187de7163de48321e9fa6b2022d5c2cff.tar.bz2
bm-40207f7187de7163de48321e9fa6b2022d5c2cff.tar.xz
bm-40207f7187de7163de48321e9fa6b2022d5c2cff.zip
Applied old patch that makes bm use rpmbuild instead of rpm -b.
The patch came from svn+ssh://svn.mandriva.com/svn/packages/cooker/bm/current/SOURCES/bm-2.1-rpmbuild.patch at r24959 and dates to 2004-01-17 14:58:57.843281631 -0200 and was written by acme.
-rw-r--r--BuildManager/build.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/BuildManager/build.py b/BuildManager/build.py
index 3bf93c5..94157b3 100644
--- a/BuildManager/build.py
+++ b/BuildManager/build.py
@@ -198,9 +198,9 @@ def buildpkg(pkg, stage, unpack_dir, passtrough="", show_log=0, dryrun=0):
tmppath = " --define '_tmppath %s/BUILDROOT'" % pkg.builddir
else:
tmppath = ""
- cmd = "rpm -b%s --define '_topdir %s'%s %s %s 2>&1" % \
+ cmd = "rpmbuild -b%s --define '_topdir %s'%s %s %s 2>&1" % \
(stagechar,pkg.builddir,tmppath,passtrough,pkg.spec)
- logger.debug("rpm command: "+cmd)
+ logger.debug("rpmbuild command: "+cmd)
if not dryrun:
log = open(pkg.log, "w")
pop = popen2.Popen3(cmd)