Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey@blender.org>2020-11-13 11:48:11 +0300
committerSergey Sharybin <sergey@blender.org>2020-11-13 11:49:02 +0300
commit9d172f007eeb5ade5ddad03e1f71fa4c373855f8 (patch)
tree249762c31c987500197bb4a87b56ce1dea0aaad2 /build_files/buildbot
parent12f394ece7c870d5b7aa2fae4098f58dca1893e7 (diff)
Codesign: Versioning code to support older branches
Turns out it is easier to have suboptimal versioning code on the server side than to deal with branches where changes are to be merged into.
Diffstat (limited to 'build_files/buildbot')
-rw-r--r--build_files/buildbot/codesign/archive_with_indicator.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/build_files/buildbot/codesign/archive_with_indicator.py b/build_files/buildbot/codesign/archive_with_indicator.py
index aebf5a15417..9f903ddd9fe 100644
--- a/build_files/buildbot/codesign/archive_with_indicator.py
+++ b/build_files/buildbot/codesign/archive_with_indicator.py
@@ -76,6 +76,15 @@ class ArchiveState:
except json.decoder.JSONDecodeError:
raise ArchiveStateError('Error parsing JSON')
+ # NOTE: Compatibility code with older codesign code from times when client
+ # did not use JSON for the archive indicator. After all branches has codesign
+ # merged this code should be removed.
+ if type(object_as_dict) == int:
+ result = cls()
+ result.file_size = int(object_as_dict)
+ result.error_message = ''
+ return result
+
return cls(**object_as_dict)
@classmethod