summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClark Williams <williams@rt2.localdomain>2008-10-15 10:16:21 -0500
committerClark Williams <williams@rt2.localdomain>2008-10-15 10:16:21 -0500
commit85a6358a68af882b9fcc094eb9b056278f69ffd8 (patch)
tree30a750e7eac9e428dc644fae33fa758f179c487a
parentd00b0fef2c083566719257d95cb6583ac44b5c0f (diff)
downloadmock-85a6358a68af882b9fcc094eb9b056278f69ffd8.tar.gz
mock-85a6358a68af882b9fcc094eb9b056278f69ffd8.tar.xz
mock-85a6358a68af882b9fcc094eb9b056278f69ffd8.zip
added panu's fix for strange rpm behavior
-rw-r--r--py/mock/plugins/root_cache.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/py/mock/plugins/root_cache.py b/py/mock/plugins/root_cache.py
index b9fe677..f69f28f 100644
--- a/py/mock/plugins/root_cache.py
+++ b/py/mock/plugins/root_cache.py
@@ -7,6 +7,7 @@
import fcntl
import os
import time
+from glob import glob
# our imports
from mock.trace_decorator import decorate, traceLog, getLog
@@ -96,8 +97,9 @@ class RootCache(object):
try:
self._rootCacheLock(shared=0)
# nuke any rpmdb tmp files
- mock.util.do(
- ['rm', '-f', self.rootObj.makeChrootPath('var/lib/rpm/__db*')])
+ for tmp in glob(self.rootObj.makeChrootPath('var/lib/rpm/__db*')):
+ os.unlink(tmp)
+
# never rebuild cache unless it was a clean build.
if self.rootObj.chrootWasCleaned: