forked from bartvdbraak/blender
Buildbot: Fixed crash when building RC builds
Building RC builds would parse `BLENDER_VERSION_CYCLE_NUMBER` that doesn't exist anymore. It was removed by {D7748}. This change removes it from `buildbot_utils.py`.
This commit is contained in:
parent
fba35a02c6
commit
dd2b616320
@ -88,7 +88,6 @@ class VersionInfo:
|
|||||||
self.short_version = "%d.%02d" % (version_numbers[0], version_numbers[1])
|
self.short_version = "%d.%02d" % (version_numbers[0], version_numbers[1])
|
||||||
self.version = "%d.%02d.%d" % version_numbers
|
self.version = "%d.%02d.%d" % version_numbers
|
||||||
self.version_cycle = self._parse_header_file(blender_h, 'BLENDER_VERSION_CYCLE')
|
self.version_cycle = self._parse_header_file(blender_h, 'BLENDER_VERSION_CYCLE')
|
||||||
self.version_cycle_number = self._parse_header_file(blender_h, 'BLENDER_VERSION_CYCLE_NUMBER')
|
|
||||||
self.hash = self._parse_header_file(buildinfo_h, 'BUILD_HASH')[1:-1]
|
self.hash = self._parse_header_file(buildinfo_h, 'BUILD_HASH')[1:-1]
|
||||||
|
|
||||||
if self.version_cycle == "release":
|
if self.version_cycle == "release":
|
||||||
@ -97,8 +96,7 @@ class VersionInfo:
|
|||||||
self.is_development_build = False
|
self.is_development_build = False
|
||||||
elif self.version_cycle == "rc":
|
elif self.version_cycle == "rc":
|
||||||
# Release candidate
|
# Release candidate
|
||||||
version_cycle = self.version_cycle + self.version_cycle_number
|
self.full_version = self.version + self.version_cycle
|
||||||
self.full_version = self.version + version_cycle
|
|
||||||
self.is_development_build = False
|
self.is_development_build = False
|
||||||
else:
|
else:
|
||||||
# Development build
|
# Development build
|
||||||
|
Loading…
Reference in New Issue
Block a user