summon: wrap chdir_and_syspath in a try/finally

This commit is contained in:
Mr. Outis
2019-12-24 00:42:13 -06:00
parent 6fd5eb4185
commit 542f4c3c18
+10 -7
View File
@@ -111,8 +111,8 @@ def summon(name, fname=None, args=None, repo=None, rev=None):
with open(summon_path, "r") as fobj:
objects = ruamel.yaml.safe_load(fobj.read())["objects"]
obj = next(x for x in objects if x.get("name") == name)
_summon = obj.get("summon")
obj = next(x for x in objects if x["name"] == name)
_summon = obj["summon"]
outs = [
_repo.find_out_by_relpath(dep) for dep in _summon.get("deps", ())
@@ -142,11 +142,14 @@ def _chdir_and_syspath(path):
# * Import will pollute sys.modules
# * Weird errors if there is a name clash within sys.modules
old_dir = os.path.abspath(os.curdir)
os.chdir(path)
sys.path.insert(0, path)
yield
sys.path.pop(0)
os.chdir(old_dir)
try:
os.chdir(path)
sys.path.insert(0, path)
yield
finally:
sys.path.pop(0)
os.chdir(old_dir)
def _import_string(import_name, silent=False):