Commit 2922f9d0 authored by Paul McCarthy's avatar Paul McCarthy 🚵
Browse files

Merge branch 'bf/excclude-package' into 'master'

Bf/excclude package

See merge request fsl/conda/installer!32
parents 1ce47f73 6adc0da5
......@@ -50,7 +50,7 @@ log = logging.getLogger(__name__)
__absfile__ = op.abspath(__file__).rstrip('c')
__version__ = '1.7.1'
__version__ = '1.7.2'
"""Installer script version number. This must be updated
whenever a new version of the installer script is released.
"""
......@@ -1270,8 +1270,9 @@ def download_fsl_environment(ctx):
basepkgs[pkg] = pkgver.replace(' ', '=')
# Exclude packages upon user request
pkgname = line.strip(' -').split()[0]
for pattern in ctx.args.exclude_package:
if fnmatch.fnmatch(line.strip(), '- {}'.format(pattern)):
if fnmatch.fnmatch(pkgname, pattern):
log.debug('Excluding package %s (matched '
'--exclude_package %s)', line, pattern)
break
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment