[Notes] [Git][BuildStream/buildstream][master] 2 commits: element.py: fix unbounded variable in nested python exception

[Benjamin Schubert <gitlab mg gitlab com>]

Title: GitLab

Benjamin Schubert pushed to branch master at BuildStream / buildstream

Commits:

• 180fa774
  by Benjamin Schubert at 2018-12-13T12:05:15Z

  element.py: fix unbounded variable in nested python exception
  
  As per https://docs.python.org/3.7/reference/compound_stmts.html#except
  variables used in the "except" clause are erased at the end of the
  block.
  
  We had a conflict with a nested exception using the same variable as
  before.
  
  This renames the nested variable to avoid the clash
  

• 224aa4c2
  by Benjamin Schubert at 2018-12-13T12:34:41Z

  Merge branch 'bschubert/fix-unbound-variable-exception' into 'master'
  
  element.py: fix unbounded variable in nested python exception
  
  See merge request BuildStream/buildstream!1006

1 changed file:

• buildstream/element.py

Changes:

buildstream/element.py

---

...	...	@@ -1612,9 +1612,9 @@ class Element(Plugin):
1612	1612	sandbox_vpath = sandbox_vroot.descend(path_components)
1613	1613	try:
1614	1614	sandbox_vpath.import_files(workspace.get_absolute_path())
1615		- except UtilError as e:
	1615	+ except UtilError as e2:
1616	1616	self.warn("Failed to preserve workspace state for failed build sysroot: {}"
1617		- .format(e))
	1617	+ .format(e2))
1618	1618
1619	1619	self.__set_build_result(success=False, description=str(e), detail=e.detail)
1620	1620	self._cache_artifact(rootdir, sandbox, e.collect)

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.