From dd2b616320edaffb19f9e527bcf995e3dc2ebb5a Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Mon, 25 Jan 2021 11:50:56 +0100 Subject: 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`. --- build_files/buildbot/buildbot_utils.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'build_files') diff --git a/build_files/buildbot/buildbot_utils.py b/build_files/buildbot/buildbot_utils.py index 2fce979466e..057c2155fb6 100644 --- a/build_files/buildbot/buildbot_utils.py +++ b/build_files/buildbot/buildbot_utils.py @@ -88,7 +88,6 @@ class VersionInfo: self.short_version = "%d.%02d" % (version_numbers[0], version_numbers[1]) self.version = "%d.%02d.%d" % version_numbers 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] if self.version_cycle == "release": @@ -97,8 +96,7 @@ class VersionInfo: self.is_development_build = False elif self.version_cycle == "rc": # Release candidate - version_cycle = self.version_cycle + self.version_cycle_number - self.full_version = self.version + version_cycle + self.full_version = self.version + self.version_cycle self.is_development_build = False else: # Development build -- cgit v1.2.3