Attachment 609624 Details for Bug 835633 – [PATCH] fix state start/finish mismatch when 'rpmbuild -bs' fails

[patch] [PATCH] fix state start/finish mismatch when 'rpmbuild -bs' fails

0001-fix-state-start-finish-mismatch-when-rpmbuild-bs-fai.patch (text/plain), 2.02 KB, created by Mathieu Bridon on 2012-09-04 10:40:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Bridon

Created: 2012-09-04 10:40:48 UTC

Size: 2.02 KB

patch

obsolete

>From 24a9b0d29d9f170f69a10bd1ecce32d5ffb87f57 Mon Sep 17 00:00:00 2001
>From: Mathieu Bridon <bochecha@fedoraproject.org>
>Date: Tue, 4 Sep 2012 18:21:21 +0800
>Subject: [PATCH] fix state start/finish mismatch when 'rpmbuild -bs' fails
>
>---
> py/mockbuild/backend.py |   23 +++++++++++++----------
> 1 files changed, 13 insertions(+), 10 deletions(-)
>
>diff --git a/py/mockbuild/backend.py b/py/mockbuild/backend.py
>index e00d3de..f885060 100644
>--- a/py/mockbuild/backend.py
>+++ b/py/mockbuild/backend.py
>@@ -793,16 +793,19 @@ class Root(object):
>             spec =  self.makeChrootPath(self.builddir, "SPECS", os.path.basename(spec))
>             chrootspec = spec.replace(self.makeChrootPath(), '') # get rid of rootdir prefix
> 
>-            # Completely/Permanently drop privs while running the following:
>-            self.start("rpmbuild -bs")
>-            self.doChroot(
>-                ["bash", "--login", "-c", 'rpmbuild -bs --target %s --nodeps %s' % (self.rpmbuild_arch, chrootspec)],
>-                shell=False,
>-                logger=self.build_log, timeout=timeout,
>-                uid=self.chrootuid,
>-                gid=self.chrootgid,
>-                )
>-            self.finish("rpmbuild -bs")
>+            try:
>+                # Completely/Permanently drop privs while running the following:
>+                self.start("rpmbuild -bs")
>+                self.doChroot(
>+                    ["bash", "--login", "-c", 'rpmbuild -bs --target %s --nodeps %s' % (self.rpmbuild_arch, chrootspec)],
>+                    shell=False,
>+                    logger=self.build_log, timeout=timeout,
>+                    uid=self.chrootuid,
>+                    gid=self.chrootgid,
>+                   )
>+            finally:
>+                self.finish("rpmbuild -bs")
>+
>             rebuiltSrpmFile = glob.glob("%s/%s/SRPMS/*.src.rpm" % (self.makeChrootPath(), self.builddir))
>             if len(rebuiltSrpmFile) != 1:
>                 raise mockbuild.exception.PkgError, "Expected to find single rebuilt srpm, found %d." % len(rebuiltSrpmFile)
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 835633: 606100 | 609603 | 609604 | 609624