Skip to content

Commit

Permalink
Merge pull request #2323 from msarahan/clean_conda_error
Browse files Browse the repository at this point in the history
remove meaningless error with glob_files during env creation
  • Loading branch information
msarahan authored Aug 27, 2017
2 parents 526e244 + 38194e6 commit af6317b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions conda_build/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -996,8 +996,7 @@ def build(m, post=None, need_source_download=True, need_reparse_in_env=False, bu
if (not m.config.dirty or not os.path.isdir(m.config.build_prefix) or
not os.listdir(m.config.build_prefix)):
environ.create_env(m.config.build_prefix, build_actions, env='build', config=m.config,
subdir=m.config.build_subdir, is_cross=m.is_cross,
always_include_files=m.always_include_files())
subdir=m.config.build_subdir, is_cross=m.is_cross)

# this check happens for the sake of tests, but let's do it before the build so we don't
# make people wait longer only to see an error
Expand Down
2 changes: 1 addition & 1 deletion conda_build/environ.py
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@ def get_install_actions(prefix, specs, env, retries=0, subdir=None,


def create_env(prefix, specs_or_actions, env, config, subdir, clear_cache=True, retry=0,
locks=None, is_cross=False, always_include_files=[]):
locks=None, is_cross=False):
'''
Create a conda envrionment for the given prefix and specs.
'''
Expand Down

0 comments on commit af6317b

Please sign in to comment.