Attachment 620488 Details for Bug 860368 – patch to allow scrub of non-existent chroot

[patch] patch to allow scrub of non-existent chroot

scrub-non-existent-chroot.patch (text/plain), 1.11 KB, created by Clark Williams on 2012-10-02 19:47:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Clark Williams

Created: 2012-10-02 19:47:10 UTC

Size: 1.11 KB

patch

obsolete

>diff --git a/py/mockbuild/backend.py b/py/mockbuild/backend.py
>index a7a866d..6bbb0e3 100644
>--- a/py/mockbuild/backend.py
>+++ b/py/mockbuild/backend.py
>@@ -203,7 +203,8 @@ class Root(object):
>     decorate(traceLog())
>     def scrub(self, scrub_opts):
>         """clean out chroot and/or cache dirs with extreme prejudice :)"""
>-        self.tryLockBuildRoot()
>+        if self.tryLockBuildRoot() == 0:
>+            return
>         statestr = "scrub %s" % scrub_opts
>         self.start(statestr)
>         self._resetLogging()
>@@ -235,7 +236,6 @@ class Root(object):
> 
>     decorate(traceLog())
>     def tryLockBuildRoot(self):
>-        self.start("lock buildroot")
>         try:
>             self.buildrootLock = open(os.path.join(self.basedir, "buildroot.lock"), "a+")
>         except IOError, e:
>@@ -245,7 +245,7 @@ class Root(object):
>             fcntl.lockf(self.buildrootLock.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
>         except IOError, e:
>             raise mockbuild.exception.BuildRootLocked, "Build root is locked by another process."
>-
>+        self.start("lock buildroot")
>         return 1
> 
>     decorate(traceLog())

Actions: View | Diff

Attachments on bug 860368: 620488 | 636369