Commit 1ce47f73 authored by Paul McCarthy's avatar Paul McCarthy 🚵
Browse files

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

BF: Bad logic handling exclude_package

See merge request fsl/conda/installer!31
parents be180ae7 468466f5
......@@ -50,7 +50,7 @@ log = logging.getLogger(__name__)
__absfile__ = op.abspath(__file__).rstrip('c')
__version__ = '1.7.0'
__version__ = '1.7.1'
"""Installer script version number. This must be updated
whenever a new version of the installer script is released.
"""
......@@ -1274,9 +1274,9 @@ def download_fsl_environment(ctx):
if fnmatch.fnmatch(line.strip(), '- {}'.format(pattern)):
log.debug('Excluding package %s (matched '
'--exclude_package %s)', line, pattern)
continue
outf.write(line)
break
else:
outf.write(line)
ctx.environment_channels = channels
ctx.fsl_base_packages = basepkgs
......
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