jenkins-bot has submitted this change and it was merged.
Change subject: (merge fixup) cache maintenance script ......................................................................
(merge fixup) cache maintenance script
Ibc7ec0a90a130fb1c834fd632af7872f1325b3e0 altered CachedRequest._cachefile_path() so it was not usable for cache.py introduced in I727af9b6fa10d2231e5d777a1bc6f8602ca03f50.
Both being committed at the same time caused cache.py to fail for directories other than the one which CachedRequest uses.
Change-Id: I36360fd041da952375bc88a4599a21451878baa7 --- M scripts/maintenance/cache.py 1 file changed, 4 insertions(+), 0 deletions(-)
Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified
diff --git a/scripts/maintenance/cache.py b/scripts/maintenance/cache.py index 702e034..2c51070 100644 --- a/scripts/maintenance/cache.py +++ b/scripts/maintenance/cache.py @@ -82,6 +82,10 @@ """ Directory of the cached entry. """ return self.directory
+ def _cachefile_path(self): + return os.path.join(self._get_cache_dir(), + self._create_file_name()) + def _load_cache(self): """ Load the cache entry. """ with open(self._cachefile_path(), 'rb') as f: