From a2e00236d0dfc8e3bb5f6c6a63a8431415889a17 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 13 Nov 2020 11:35:04 +0100 Subject: [PATCH] Revert "Codesign: Versioning code to support older branches" This reverts commit 9d172f007eeb5ade5ddad03e1f71fa4c373855f8. Got a second thought and remembered why it was not done in the first place. The issue here is that the server needs to communicate codesign result back and that must happen within the new protocol. So if the client talks old protocol it is possible to receieve data from it, but is not possible to communicate result back to it. --- build_files/buildbot/codesign/archive_with_indicator.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/build_files/buildbot/codesign/archive_with_indicator.py b/build_files/buildbot/codesign/archive_with_indicator.py index 9f903ddd9fe..aebf5a15417 100644 --- a/build_files/buildbot/codesign/archive_with_indicator.py +++ b/build_files/buildbot/codesign/archive_with_indicator.py @@ -76,15 +76,6 @@ 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