diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2015-10-26 16:29:46 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2015-10-28 09:24:06 -0700 |
| commit | 9e282e5ef9918264647d114290f59323d21e29a6 (patch) | |
| tree | db130e3d6b8f2a1dd59713b317a7f07f89a4682f | |
| parent | RepoConfigLoader: allow subsitution of variables like ROOT in repos.conf (diff) | |
| download | portage-9e282e5ef9918264647d114290f59323d21e29a6.tar.gz portage-9e282e5ef9918264647d114290f59323d21e29a6.tar.bz2 portage-9e282e5ef9918264647d114290f59323d21e29a6.zip | |
vardbapi.aux_get: treat cache as valid if mtime is truncated (bug 564222)
X-Gentoo-Bug: 564222
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=564222
Acked-by: Alexander Berntsen <bernalex@gentoo.org>
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 5ba8d9d34..e7effca32 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -728,7 +728,13 @@ class vardbapi(dbapi): if pkg_data: cache_mtime, metadata = pkg_data if isinstance(cache_mtime, float): - cache_valid = cache_mtime == mydir_stat.st_mtime + if cache_mtime == mydir_stat.st_mtime: + cache_valid = True + + # Handle truncated mtime in order to avoid cache + # invalidation for livecd squashfs (bug 564222). + elif long(cache_mtime) == mydir_stat.st_mtime: + cache_valid = True else: # Cache may contain integer mtime. cache_valid = cache_mtime == mydir_stat[stat.ST_MTIME] |