diff options
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index c103cbd8d..049db6e40 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -52,6 +52,7 @@ import re, shutil, stat, errno, copy, subprocess import logging import os as _os import sys +import time import warnings try: @@ -849,6 +850,19 @@ class vardbapi(dbapi): rValue = _os.path.join(rValue, filename) return rValue + def _bump_mtime(self, cpv): + """ + This is called before an after any modifications, so that consumers + can use directory mtimes to validate caches. See bug #290428. + """ + base = self.root + _os.sep + VDB_PATH + cat = catsplit(cpv)[0] + catdir = base + _os.sep + cat + t = time.time() + t = (t, t) + for x in (catdir, base): + os.utime(x, t) + def cpv_exists(self, mykey): "Tells us whether an actual ebuild exists on disk (no masking)" return os.path.exists(self.getpath(mykey)) @@ -1301,6 +1315,7 @@ class vardbapi(dbapi): return results def aux_update(self, cpv, values): + self._bump_mtime(cpv) cat, pkg = catsplit(cpv) mylink = dblink(cat, pkg, self.root, self.settings, treetype="vartree", vartree=self.vartree) @@ -1314,6 +1329,7 @@ class vardbapi(dbapi): os.unlink(os.path.join(self.getpath(cpv), k)) except EnvironmentError: pass + self._bump_mtime(cpv) def counter_tick(self, myroot, mycpv=None): return self.counter_tick_core(myroot, incrementing=1, mycpv=mycpv) @@ -1435,9 +1451,11 @@ class vardbapi(dbapi): removed += 1 if removed: + self._bump_mtime(pkg.mycpv) f = atomic_ofstream(os.path.join(pkg.dbdir, "CONTENTS")) write_contents(new_contents, root, f) f.close() + self._bump_mtime(pkg.mycpv) pkg._clear_contents_cache() class _owners_cache(object): @@ -2067,6 +2085,7 @@ class dblink(object): The caller must ensure that lockdb() and unlockdb() are called before and after this method. """ + self.vartree.dbapi._bump_mtime(self.mycpv) showMessage = self._display_merge if self.vartree.dbapi._categories is not None: self.vartree.dbapi._categories = None @@ -2208,6 +2227,7 @@ class dblink(object): self.vartree.dbapi.plib_registry.pruneNonExisting() finally: + self.vartree.dbapi._bump_mtime(self.mycpv) if builddir_lock: try: if myebuildpath: @@ -4341,6 +4361,7 @@ class dblink(object): mydbapi=None, prev_mtimes=None): retval = -1 self.lockdb() + self.vartree.dbapi._bump_mtime(self.mycpv) try: self.vartree.dbapi.plib_registry.load() self.vartree.dbapi.plib_registry.pruneNonExisting() @@ -4366,6 +4387,7 @@ class dblink(object): finally: self.vartree.dbapi.linkmap._clear_cache() self.unlockdb() + self.vartree.dbapi._bump_mtime(self.mycpv) return retval def getstring(self,name): |