From a7e8da86df40bf5b9f2f86dcb304adc1e8df4610 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Wed, 24 Aug 2011 19:08:35 +0100 Subject: [PATCH] Moved misleading log message "Caching new implementation ... in ..." The message was printed while 0install was deciding which cache directory to use, which made it look as though the implementation was being added to multiple directories. Also, it displayed the directory the archive was unpacked to, not the cache directory, which is different when using the helper to install to the system cache. --- zeroinstall/zerostore/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zeroinstall/zerostore/__init__.py b/zeroinstall/zerostore/__init__.py index ed2daab..3bbaac2 100644 --- a/zeroinstall/zerostore/__init__.py +++ b/zeroinstall/zerostore/__init__.py @@ -86,7 +86,6 @@ class Store: def add_archive_to_cache(self, required_digest, data, url, extract = None, type = None, start_offset = 0, try_helper = False): from . import unpack - info(_("Caching new implementation (digest %s) in %s"), required_digest, self.dir) if self.lookup(required_digest): info(_("Not adding %s as it already exists!"), required_digest) @@ -198,6 +197,8 @@ class Store: return info(_("Can't add to system store. Trying user store instead.")) + info(_("Caching new implementation (digest %s) in %s"), required_digest, self.dir) + final_name = os.path.join(self.dir, required_digest) if os.path.isdir(final_name): raise Exception(_("Item %s already stored.") % final_name) # XXX: not really an error -- 2.11.4.GIT