aboutsummaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorMatt Rendina <rendinam@users.noreply.github.com>2017-09-18 17:36:52 -0400
committerGitHub <noreply@github.com>2017-09-18 17:36:52 -0400
commitf869f3a58709adae33bcbe20fca78a414f66e207 (patch)
treed20e13973bf03bf6caab6b1841f4a27452507098 /patches
parent7a6b78f03f4ac1879c7dd6c3408ad0564823c74f (diff)
parentcc0098f24e73fc5f7172218ddc19c43597e168bf (diff)
downloadbuild_control-f869f3a58709adae33bcbe20fca78a414f66e207.tar.gz
Merge pull request #33 from rendinam/cb3_bugfix_patch1.0.1
generalized conda-build 3.x substring bugfix patch
Diffstat (limited to 'patches')
-rw-r--r--patches/conda_build_3.0.15_substr_fix2.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/patches/conda_build_3.0.15_substr_fix2.patch b/patches/conda_build_3.0.15_substr_fix2.patch
new file mode 100644
index 0000000..3086592
--- /dev/null
+++ b/patches/conda_build_3.0.15_substr_fix2.patch
@@ -0,0 +1,11 @@
+--- config.py 2017-09-18 17:22:59.000000000 -0400
++++ config.py.new 2017-09-18 16:39:48.000000000 -0400
+@@ -370,7 +370,7 @@
+ "to preserve croot during path joins")
+ build_folders = sorted([os.path.basename(build_folder)
+ for build_folder in get_build_folders(self.croot)
+- if os.path.basename(build_folder).startswith(package_name + "_")])
++ if build_folder[:build_folder.rfind('_')] == package_name])
+ if self.dirty and build_folders:
+ # Use the most recent build with matching recipe name
+ self._build_id = build_folders[-1]