Attachment 314406 Details for Bug 458234 – mock workaround for rpmdb/root_cache interaction weirdness

[patch] mock workaround for rpmdb/root_cache interaction weirdness

mock-rpmdb-workaround.patch (text/plain), 1.19 KB, created by Clark Williams on 2008-08-15 20:13:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Clark Williams

Created: 2008-08-15 20:13:58 UTC

Size: 1.19 KB

patch

obsolete

>diff --git a/py/mock/plugins/root_cache.py b/py/mock/plugins/root_cache.py
>index 5382912..b9fe677 100644
>--- a/py/mock/plugins/root_cache.py
>+++ b/py/mock/plugins/root_cache.py
>@@ -93,13 +93,19 @@ class RootCache(object):
> 
>     decorate(traceLog())
>     def _rootCachePostInitHook(self):
>-        # never rebuild cache unless it was a clean build.
>-        if self.rootObj.chrootWasCleaned:
>-            self.state("creating cache")
>+        try:
>             self._rootCacheLock(shared=0)
>+            # nuke any rpmdb tmp files
>             mock.util.do(
>-                ["tar", "czf", self.rootCacheFile, "-C", self.rootObj.makeChrootPath(), "."],
>-                shell=False
>-                )
>+                ['rm', '-f', self.rootObj.makeChrootPath('var/lib/rpm/__db*')])
>+            
>+            # never rebuild cache unless it was a clean build.
>+            if self.rootObj.chrootWasCleaned:
>+                self.state("creating cache")
>+                mock.util.do(
>+                    ["tar", "czf", self.rootCacheFile,
>+                     "-C", self.rootObj.makeChrootPath(), "."],
>+                    shell=False
>+                    )
>+        finally:
>             self._rootCacheUnlock()
>-

Actions: View | Diff

Attachments on bug 458234: 314295 | 314406 | 320397 | 325743