summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael E Brown <mebrown@michaels-house.net>2009-01-08 14:35:58 -0600
committerMichael E Brown <mebrown@michaels-house.net>2009-01-08 14:35:58 -0600
commit4796f583735f291d1314a23223423354f51dc6a5 (patch)
treec907d5e1089f16836388dfb064381cf1cdf074fc
parente7a3dd309ae0777ae46b838912087cadd2528e57 (diff)
downloadmock-4796f583735f291d1314a23223423354f51dc6a5.tar.gz
mock-4796f583735f291d1314a23223423354f51dc6a5.tar.xz
mock-4796f583735f291d1314a23223423354f51dc6a5.zip
another srpm -> spec change in buildsrpm. add state for building srpm.
-rwxr-xr-xpy/mock.py2
-rw-r--r--py/mock/backend.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/py/mock.py b/py/mock.py
index 567e9ac..d18bb51 100755
--- a/py/mock.py
+++ b/py/mock.py
@@ -410,7 +410,7 @@ def do_buildsrpm(config_opts, chroot, options, args):
except (Exception, KeyboardInterrupt):
elapsed = time.time() - start
log.error("Exception(%s) Config(%s) %d minutes %d seconds"
- % (srpm, chroot.sharedRootName, elapsed//60, elapsed%60))
+ % (os.path.basename(options.spec), chroot.sharedRootName, elapsed//60, elapsed%60))
log.info("Results and/or logs in: %s" % chroot.resultdir)
if config_opts["cleanup_on_failure"]:
log.info("Cleaning up build root ('clean_on_failure=True')")
diff --git a/py/mock/backend.py b/py/mock/backend.py
index dccfdf9..baeb8e1 100644
--- a/py/mock/backend.py
+++ b/py/mock/backend.py
@@ -471,6 +471,7 @@ class Root(object):
chrootspec = spec.replace(self.makeChrootPath(), '') # get rid of rootdir prefix
# Completely/Permanently drop privs while running the following:
+ self.state("buildsrpm")
os.environ["HOME"] = self.homedir
self.doChroot(
["bash", "--login", "-c", 'rpmbuild -bs --target %s --nodeps %s' % (self.rpmbuild_arch, chrootspec)],