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

[entropy.client.trigger] call environment_update() whenever ENV_DIRS have been touched

Browse Source
This commit is contained in:
Fabio Erculiani
2012-08-01 18:48:12 +02:00
parent 9c563f4bd6
commit cf86ca664d
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/entropy/client/interfaces/trigger.py
View File

@@ -40,7 +40,7 @@ class Trigger:
action_metadata):
"""
Trigger manager interface constructor.
@param entropy_client: Entropy Client interface object
@type entropy_client: entropy.client.interfaces.client.Client
@param action: package handling action, can be "install", "remove",
@@ -135,6 +135,12 @@ class Trigger:
ldpaths = entropy.tools.collect_linker_paths()
if len(cont_dirs) != len(cont_dirs - set(ldpaths)):
functions.insert(0, self._trigger_env_update)
elif self._spm is not None:
# check if environment dirs have been touched
spm_class = self._entropy.Spm_class()
env_dirs = spm_class.ENV_DIRS
if len(env_dirs) != len(env_dirs - cont_dirs):
functions.insert(0, self._trigger_env_update)
if self._pkgdata['trigger']:
functions.append(self._trigger_call_ext_postinstall)
@@ -204,6 +210,12 @@ class Trigger:
ldpaths = entropy.tools.collect_linker_paths()
if len(cont_dirs) != len(cont_dirs - set(ldpaths)):
functions.insert(0, self._trigger_env_update)
elif self._spm is not None:
# check if environment dirs have been touched
spm_class = self._entropy.Spm_class()
env_dirs = spm_class.ENV_DIRS
if len(env_dirs) != len(env_dirs - cont_dirs):
functions.insert(0, self._trigger_env_update)
if self._pkgdata['trigger']:
functions.append(self._trigger_call_ext_postremove)