saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #31085 from jacksontj/2015.8

Browse source 
Correctly remove path we added after loader is completed
This commit is contained in:
Mike Place 2016-02-10 10:47:21 -07:00
commit 5dcaa8d387
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/loader.py
View file

@ -1095,8 +1095,9 @@ class LazyLoader(salt.utils.lazy.LazyDict):
mod = None
fpath, suffix = self.file_mapping[name]
self.loaded_files.add(name)
fpath_dirname = os.path.dirname(fpath)
try:
sys.path.append(os.path.dirname(fpath))
sys.path.append(fpath_dirname)
if suffix == '.pyx':
mod = pyximport.load_module(name, fpath, tempfile.gettempdir())
elif suffix == '.o':
@ -1162,7 +1163,7 @@ class LazyLoader(salt.utils.lazy.LazyDict):
)
return False
finally:
sys.path.pop()
sys.path.remove(fpath_dirname)
if hasattr(mod, '__opts__'):
mod.__opts__.update(self.opts)