From 5a74ee403b5287898c98aa8058c3e6256b193ff6 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Mon, 5 Sep 2011 17:57:14 +0200 Subject: [PATCH] [entropy.client.misc] when collecting CONFIG_PROTECT* elements, also ask the Source Package Manager about it, closes bug 2480 --- libraries/entropy/client/misc.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libraries/entropy/client/misc.py b/libraries/entropy/client/misc.py index 18e797ab1..86c475157 100644 --- a/libraries/entropy/client/misc.py +++ b/libraries/entropy/client/misc.py @@ -83,12 +83,19 @@ class FileUpdates: cl_id = etpConst['system_settings_plugins_ids']['client_plugin'] misc_data = self._settings[cl_id]['misc'] config_protect = set() + # also ask to Source Package Manager + spm = self._entropy.Spm() if mask: config_protect |= set(misc_data['configprotectmask']) + # also read info from environment and merge here + config_protect |= set(spm.get_merge_protected_paths_mask()) else: config_protect |= set(misc_data['configprotect']) + # also read info from environment and merge here + config_protect |= set(spm.get_merge_protected_paths()) + # get from our repositories for repository_id in self._repository_ids: repo = self._entropy.open_repository(repository_id) if mask: