diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2017-12-21 11:41:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-21 11:41:02 -0500 |
| commit | 64db301e7a309ea38b644c12bb3727a7cefc8e61 (patch) | |
| tree | 7e98741166ed9599aa33fda53ab9a20288bdc926 | |
| parent | fe8db28cc5ca8423f7fe010dd55dd76f8233f1a1 (diff) | |
| parent | 09d1c07a4dc598543319314a7fdad447a636a063 (diff) | |
| download | build_control-64db301e7a309ea38b644c12bb3727a7cefc8e61.tar.gz | |
Merge pull request #48 from rendinam/patch_restriction
Restrict bugfix patching to conda-build 3.0.x series.
| -rw-r--r-- | jenkins/dispatch.groovy | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index 5c8f0a6..e1eaef2 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -210,6 +210,7 @@ node(LABEL) { // all output under both circumstances. def conda_build_version = sh(script: "conda-build --version 2>&1", returnStdout: true).trim() def conda_build_maj_ver = conda_build_version.tokenize()[1].tokenize('.')[0] + def conda_build_min_ver = conda_build_version.tokenize()[1].tokenize('.')[1] if (conda_build_maj_ver == "2") { println("conda-build major version ${conda_build_maj_ver} detected. Applying bugfix patch.") def filename = "${this.conda_install_dir}/lib/python${PY_VERSION}/" + @@ -219,7 +220,7 @@ node(LABEL) { def full_patchname = "${patches_dir}/${patchname}" sh "patch ${filename} ${full_patchname}" } - if (conda_build_maj_ver == "3") { + if (conda_build_maj_ver == "3" && conda_build_min_version == "0") { println("conda-build major version ${conda_build_maj_ver} detected. Applying bugfix patch.") def filename = "${this.conda_install_dir}/lib/python${PY_VERSION}/" + "site-packages/conda_build/config.py" |