sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[entropy.client.misc] when collecting CONFIG_PROTECT* elements, also ask the Source Package Manager about it, closes bug 2480

Browse Source
This commit is contained in:
Fabio Erculiani
2011-09-05 17:57:14 +02:00
parent d70ba28188
commit 5a74ee403b
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/entropy/client/misc.py
View File

@@ -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: