diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2021-01-25 13:50:56 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2021-01-25 13:53:59 +0300 |
| commit | 79976ba4dff8d917cc538f8325bc49e0813812d1 (patch) | |
| tree | 3d5c9cfb3bc220da020e246b6d0b7557bdd24571 | |
| parent | fbddc8d2e4a1e60986728967878ff8bd8058f78d (diff) | |
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`.
| -rw-r--r-- | build_files/buildbot/buildbot_utils.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/build_files/buildbot/buildbot_utils.py b/build_files/buildbot/buildbot_utils.py index 2732c92de97..6dc65446c23 100644 --- a/build_files/buildbot/buildbot_utils.py +++ b/build_files/buildbot/buildbot_utils.py @@ -85,7 +85,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": @@ -94,8 +93,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 |