Merge pull request #2197 from skosukhin/ext_bugfix

Updated python package reflecting the changes in 9347f86
This commit is contained in:
Gregory Lee 2016-11-07 16:05:57 -08:00 committed by GitHub
commit 1f5ca24197

View File

@ -346,7 +346,7 @@ def activate(self, ext_pkg, **args):
super(Python, self).activate(ext_pkg, **args) super(Python, self).activate(ext_pkg, **args)
exts = spack.install_layout.extension_map(self.spec) exts = spack.store.layout.extension_map(self.spec)
exts[ext_pkg.name] = ext_pkg.spec exts[ext_pkg.name] = ext_pkg.spec
self.write_easy_install_pth(exts) self.write_easy_install_pth(exts)
@ -354,7 +354,7 @@ def deactivate(self, ext_pkg, **args):
args.update(ignore=self.python_ignore(ext_pkg, args)) args.update(ignore=self.python_ignore(ext_pkg, args))
super(Python, self).deactivate(ext_pkg, **args) super(Python, self).deactivate(ext_pkg, **args)
exts = spack.install_layout.extension_map(self.spec) exts = spack.store.layout.extension_map(self.spec)
# Make deactivate idempotent # Make deactivate idempotent
if ext_pkg.name in exts: if ext_pkg.name in exts:
del exts[ext_pkg.name] del exts[ext_pkg.name]