fixed conflicts in python package

2016-06-20 16:17:07 -07:00
parent 76d950b103
commit 4041f45b6c
4 changed files with 7 additions and 1 deletions
--- a/var/spack/repos/builtin/packages/python/package.py
+++ b/var/spack/repos/builtin/packages/python/package.py
@@ -203,8 +203,11 @@ def python_ignore(self, ext_pkg, args):
                r'site-packages/site[^/]*\.pyc?$',
                r'site-packages/__pycache__/site[^/]*\.pyc?$'
            ])
+        if ext_pkg.name != 'py-pygments':
+            patterns.append(r'bin/pygmentize$')
        if ext_pkg.name != 'py-numpy':
            patterns.append(r'bin/f2py$')
+            patterns.append(r'bin/f2py3$')

        return match_predicate(ignore_arg, patterns)