From 38194e6e69e554c921a0d038a7ca0ce5b35c8652 Mon Sep 17 00:00:00 2001 From: Michael Sarahan Date: Sat, 26 Aug 2017 19:07:10 -0500 Subject: [PATCH] remove meaningless error with glob_files during env creation --- conda_build/build.py | 3 +-- conda_build/environ.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/conda_build/build.py b/conda_build/build.py index fc6b109473..607369d877 100644 --- a/conda_build/build.py +++ b/conda_build/build.py @@ -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 diff --git a/conda_build/environ.py b/conda_build/environ.py index 14b5742a65..0354e2d26a 100644 --- a/conda_build/environ.py +++ b/conda_build/environ.py @@ -723,7 +723,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. '''