From 9d172f007eeb5ade5ddad03e1f71fa4c373855f8 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 13 Nov 2020 09:48:11 +0100 Subject: [PATCH] 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. --- build_files/buildbot/codesign/archive_with_indicator.py | 9 +++++++++ 1 file changed, 9 insertions(+) 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