diff options
| author | Matt Rendina <mrendina@stsci.edu> | 2017-04-18 13:25:32 -0400 |
|---|---|---|
| committer | Matt Rendina <mrendina@stsci.edu> | 2017-04-18 13:25:32 -0400 |
| commit | c898304423815fb795d07891fb2504e99d1549f7 (patch) | |
| tree | b21879f87e24f95d8ae1d1296bd914b6c55c86e8 /patches | |
| parent | 0b0b80a2582d684a6d8e4abf3b87d335772177dc (diff) | |
| download | build_control-c898304423815fb795d07891fb2504e99d1549f7.tar.gz | |
Testing conda machinery patching capability; use cleaner approach for shellc all arguments; manifest grooming; use filtered and culled manifest provided by build utility
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/conda_build_2.1.1_substr_fix_py2.patch | 11 | ||||
| -rw-r--r-- | patches/conda_build_2.1.1_substr_fix_py3.patch | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/patches/conda_build_2.1.1_substr_fix_py2.patch b/patches/conda_build_2.1.1_substr_fix_py2.patch new file mode 100644 index 0000000..20a69f0 --- /dev/null +++ b/patches/conda_build_2.1.1_substr_fix_py2.patch @@ -0,0 +1,11 @@ +--- config.py.ORIG 2017-04-18 10:00:00.000000000 -0400 ++++ config.py 2017-04-18 10:00:24.000000000 -0400 +@@ -246,7 +246,7 @@ + assert not os.path.isabs(package_name), ("package name should not be a absolute path, " + "to preserve croot during path joins") + build_folders = sorted([build_folder for build_folder in get_build_folders(self.croot) +- if package_name in build_folder]) ++ if package_name + "_" in build_folder]) + + if self.dirty and build_folders: + # Use the most recent build with matching recipe name diff --git a/patches/conda_build_2.1.1_substr_fix_py3.patch b/patches/conda_build_2.1.1_substr_fix_py3.patch new file mode 100644 index 0000000..88fbaf4 --- /dev/null +++ b/patches/conda_build_2.1.1_substr_fix_py3.patch @@ -0,0 +1,11 @@ +--- config.py.ORIG 2017-04-18 08:08:06.000000000 -0400 ++++ config.py 2017-04-18 08:08:20.000000000 -0400 +@@ -327,7 +327,7 @@ + assert not os.path.isabs(package_name), ("package name should not be a absolute path, " + "to preserve croot during path joins") + build_folders = sorted([build_folder for build_folder in get_build_folders(self.croot) +- if package_name in build_folder]) ++ if package_name + "_" in build_folder]) + + if self.dirty and build_folders: + # Use the most recent build with matching recipe name |