diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2017-04-24 15:23:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-24 15:23:30 -0400 |
| commit | 9e3af5b2c3f17190c6a62440b153a52f80d2a2d9 (patch) | |
| tree | e2d509a97ee580881f0ed57c84d75c34afb06296 /patches | |
| parent | ad13f9a34cf6c6309f303fc09cda8dfcbac440a3 (diff) | |
| parent | 9cd9a4f9e8cead821bb6750ae26a612cfded443d (diff) | |
| download | build_control-9e3af5b2c3f17190c6a62440b153a52f80d2a2d9.tar.gz | |
Merge pull request #10 from rendinam/flags_and_patching
Flags and patching update, misc manifest and parameter updates
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/conda_build_2.1.1_substr_fix_py2.patch | 6 | ||||
| -rw-r--r-- | patches/conda_build_2.1.1_substr_fix_py3.patch | 8 |
2 files changed, 7 insertions, 7 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 index 20a69f0..4548d80 100644 --- a/patches/conda_build_2.1.1_substr_fix_py2.patch +++ b/patches/conda_build_2.1.1_substr_fix_py2.patch @@ -1,11 +1,11 @@ ---- config.py.ORIG 2017-04-18 10:00:00.000000000 -0400 -+++ config.py 2017-04-18 10:00:24.000000000 -0400 +--- config.py 2017-04-21 21:51:11.000000000 -0400 ++++ config.py.fixed 2017-04-21 11:12:31.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 build_folder.startswith(package_name + "_")]) 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 index 88fbaf4..fdfe7ef 100644 --- a/patches/conda_build_2.1.1_substr_fix_py3.patch +++ b/patches/conda_build_2.1.1_substr_fix_py3.patch @@ -1,11 +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 @@ +--- config.py 2017-04-21 21:51:11.000000000 -0400 ++++ config.py.fixed 2017-04-21 21:53:21.000000000 -0400 +@@ -231,7 +231,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 build_folder.startswith(package_name + "_")]) if self.dirty and build_folders: # Use the most recent build with matching recipe name |