diff options
| author | Remco Burema <r.burema@ultimaker.com> | 2022-09-28 18:40:47 +0300 |
|---|---|---|
| committer | Remco Burema <r.burema@ultimaker.com> | 2022-09-28 18:40:47 +0300 |
| commit | 91c6f17bb31175d8654f94ee46f125d2642b6d8c (patch) | |
| tree | 7a7a8a1d836d8dc7011055f103cb4ca690f4f227 | |
| parent | f1250514ef6ddb74014313567641e847423dd79e (diff) | |
Not building with prerelease-string if none present.CURA-8416_upgrade_scipy
| -rw-r--r-- | conanfile.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/conanfile.py b/conanfile.py index 29cb38502a..c032d6d83f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -153,12 +153,13 @@ class CuraConan(ConanFile): cura_version = self.conf_info.get("user.cura:version", default = self.version, check_type = str) version = Version(cura_version) + prerelease = "" if self.options.extra_build_version != "": - version.prerelease = self.options.extra_build_version + prerelease = self.options.extra_build_version if self.options.internal: - version.prerelease = version.prerelease.replace('+', '+internal_') - if version.prerelease and version.prerelease != "": - cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.prerelease}" + prerelease = version.prerelease.replace('+', '+internal_') + if prerelease != "": + cura_version = f"{version.major}.{version.minor}.{version.patch}-{prerelease}" else: cura_version = f"{version.major}.{version.minor}.{version.patch}" |