From e854ee6a3ceb3e1e30a5d2e8d869fb235af84eaf Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Mon, 3 Oct 2022 11:35:46 +0200 Subject: [PATCH] Fix reference to version properties that don't exist. version.prerelease does not exist, swapped this out for version.pre. There is no "+" inside prerelease (ie "-alpha"), this was probably being confused with the build version ( ie. +testing_120). Both "+" and "-" are removed from these values so I have prepended "_internal" to the build number instead. --- conanfile.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/conanfile.py b/conanfile.py index c868c8cb52..66c7e39015 100644 --- a/conanfile.py +++ b/conanfile.py @@ -152,12 +152,10 @@ class CuraConan(ConanFile): cura_version = self.conf_info.get("user.cura:version", default = self.version, check_type = str) if self.options.internal: version = Version(cura_version) - self.output.error("="*100) - self.output.error(f"version: {version}") - self.output.error(f"cura_version: {cura_version}") - self.output.error(f"version.prerelease: {version.prerelease}") - self.output.error("="*100) - cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.prerelease.replace('+', '+internal_')}" + if version.pre: + cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.pre}+internal_{version.build}" + else: + cura_version = f"{version.major}.{version.minor}.{version.patch}+internal_{version.build}" with open(Path(location, "CuraVersion.py"), "w") as f: f.write(cura_version_py.render(