[Bf-blender-cvs] [dd2b616320e] blender-v2.92-release: Buildbot: Fixed crash when building RC builds

[Jeroen Bakker]

Commit: dd2b616320edaffb19f9e527bcf995e3dc2ebb5a
Author: Jeroen Bakker
Date:   Mon Jan 25 11:50:56 2021 +0100
Branches: blender-v2.92-release
https://developer.blender.org/rBdd2b616320edaffb19f9e527bcf995e3dc2ebb5a

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`.

===================================================================

M	build_files/buildbot/buildbot_utils.py

===================================================================

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