3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix reference to version properties that don't exist.

Browse source 
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.
This commit is contained in:
Joey de l'Arago 2022-10-03 11:35:46 +02:00 • committed by GitHub
parent ed48fd2e82
commit e854ee6a3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
conanfile.py
View file

@ -152,12 +152,10 @@ class CuraConan(ConanFile):
cura_version = self.conf_info.get("user.cura:version", default = self.version, check_type = str) cura_version = self.conf_info.get("user.cura:version", default = self.version, check_type = str)
if self.options.internal: if self.options.internal:
version = Version(cura_version) version = Version(cura_version)
self.output.error("="*100) if version.pre:
self.output.error(f"version: {version}") cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.pre}+internal_{version.build}"
self.output.error(f"cura_version: {cura_version}") else:
self.output.error(f"version.prerelease: {version.prerelease}") cura_version = f"{version.major}.{version.minor}.{version.patch}+internal_{version.build}"
self.output.error("="*100)
cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.prerelease.replace('+', '+internal_')}"
with open(Path(location, "CuraVersion.py"), "w") as f: with open(Path(location, "CuraVersion.py"), "w") as f:
f.write(cura_version_py.render( f.write(cura_version_py.render(