diff options
| author | Patrick Gartung <gartung@fnal.gov> | 2019-06-04 14:39:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-04 14:39:04 -0500 |
| commit | 964a1d59970b27105ca61684228f5b3309e00cdd (patch) | |
| tree | d5c40127486f6ba381a632b85fe8e07da0357a95 | |
| parent | a7776972ad365367aadfbf2a826000006c66c76b (diff) | |
| download | spack-964a1d59970b27105ca61684228f5b3309e00cdd.tar.gz spack-964a1d59970b27105ca61684228f5b3309e00cdd.tar.bz2 spack-964a1d59970b27105ca61684228f5b3309e00cdd.tar.xz spack-964a1d59970b27105ca61684228f5b3309e00cdd.zip | |
Buildcache relocate.py error fix (#11616)
* Add a trailing / if file --mime does not return a mimetype with a / in it
* Flake8
| -rw-r--r-- | lib/spack/spack/relocate.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/libxpm/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/root/package.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/spack/spack/relocate.py b/lib/spack/spack/relocate.py index fc653e825d..8277cca068 100644 --- a/lib/spack/spack/relocate.py +++ b/lib/spack/spack/relocate.py @@ -594,4 +594,6 @@ def mime_type(file): file_cmd = Executable('file') output = file_cmd('-b', '-h', '--mime-type', file, output=str, error=str) tty.debug('[MIME_TYPE] {0} -> {1}'.format(file, output.strip())) + if '/' not in output: + output += '/' return tuple(output.strip().split('/')) diff --git a/var/spack/repos/builtin/packages/libxpm/package.py b/var/spack/repos/builtin/packages/libxpm/package.py index 7cc339f92c..e4ae82710a 100644 --- a/var/spack/repos/builtin/packages/libxpm/package.py +++ b/var/spack/repos/builtin/packages/libxpm/package.py @@ -26,6 +26,6 @@ class Libxpm(AutotoolsPackage): depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') - def setup_environment(self, spack_env, run_env): - spack_env.append_flags('LDFLAGS', '-L{0} -lintl'.format( - self.spec['gettext'].prefix.lib)) +# def setup_environment(self, spack_env, run_env): +# spack_env.append_flags('LDFLAGS', '-L{0} -lintl'.format( +# self.spec['gettext'].prefix.lib)) diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index f8d7f82791..cd5f7500a2 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -501,12 +501,10 @@ class Root(CMakePackage): self.spec['ftgl'].prefix)) options.append('-DFTGL_INCLUDE_DIR={0}'.format( self.spec['ftgl'].prefix.include)) - # see https://github.com/spack/spack/pull/11579 if '+python' in self.spec: options.append('-DPYTHON_EXECUTABLE=%s' % spec['python'].command.path) - return options def setup_environment(self, spack_env, run_env): |