diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2014-09-16 21:59:57 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2014-09-16 21:59:57 -0700 |
| commit | e2509717b9fc022ddbdfab532fcfc0189102c741 (patch) | |
| tree | 0dc37dc355e4266fbc907346b0090dd0a310595c /lib | |
| parent | ec44791aa3b5583036f469137412fd40caf11b24 (diff) | |
| parent | a4c8e945c730d9028f90bb941eec98352fe6504e (diff) | |
| download | spack-e2509717b9fc022ddbdfab532fcfc0189102c741.tar.gz spack-e2509717b9fc022ddbdfab532fcfc0189102c741.tar.bz2 spack-e2509717b9fc022ddbdfab532fcfc0189102c741.tar.xz spack-e2509717b9fc022ddbdfab532fcfc0189102c741.zip | |
Merge branch 'features/callpath' into develop
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/build_environment.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/package.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/util/executable.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index ec946cd2d7..182a5629fa 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -122,7 +122,7 @@ def set_build_environment_variables(pkg): # Prefixes of all of the package's dependencies go in # SPACK_DEPENDENCIES - dep_prefixes = [d.package.prefix for d in pkg.spec.dependencies.values()] + dep_prefixes = [d.prefix for d in pkg.spec.traverse(root=False)] path_set(SPACK_DEPENDENCIES, dep_prefixes) # Install prefix diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index b0a9dd76b9..3e253286e8 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -773,7 +773,7 @@ class Package(object): ' '.join(formatted_deps)) self.remove_prefix() - tty.msg("Successfully uninstalled %s." % self.spec) + tty.msg("Successfully uninstalled %s." % self.spec.short_spec) # Once everything else is done, run post install hooks spack.hooks.post_uninstall(self) diff --git a/lib/spack/spack/util/executable.py b/lib/spack/spack/util/executable.py index bc27b25889..923c7c19a5 100644 --- a/lib/spack/spack/util/executable.py +++ b/lib/spack/spack/util/executable.py @@ -121,7 +121,7 @@ def which(name, **kwargs): for dir in path: exe = os.path.join(dir, name) - if os.access(exe, os.X_OK): + if os.path.isfile(exe) and os.access(exe, os.X_OK): return Executable(exe) if required: |