From 1e81c37f411ad8fe3ba57069540cabad468e5b9f Mon Sep 17 00:00:00 2001 From: Bastian Eicher Date: Thu, 5 May 2011 18:02:26 +0200 Subject: [PATCH] Aggregate implementation-dirs config files from multiple locations --- zeroinstall/zerostore/__init__.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/zeroinstall/zerostore/__init__.py b/zeroinstall/zerostore/__init__.py index ed2daab..b186ec5 100644 --- a/zeroinstall/zerostore/__init__.py +++ b/zeroinstall/zerostore/__init__.py @@ -225,11 +225,13 @@ class Stores(object): user_store = os.path.join(basedir.xdg_cache_home, '0install.net', 'implementations') self.stores = [Store(user_store)] - impl_dirs = basedir.load_first_config('0install.net', 'injector', + impl_dirs_files = basedir.load_config_paths('0install.net', 'injector', 'implementation-dirs') - debug(_("Location of 'implementation-dirs' config file being used: '%s'"), impl_dirs) - if impl_dirs: - dirs = file(impl_dirs) + if impl_dirs_files: + dirs = [] + for impl_dirs in impl_dirs_files: + debug(_("Location of 'implementation-dirs' config file being used: '%s'"), impl_dirs) + dirs.extend(file(impl_dirs)) else: if os.name == "nt": from win32com.shell import shell, shellcon -- 2.11.4.GIT