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 13:35:04 +0300
committerSergey Sharybin <sergey@blender.org>2020-11-13 13:35:04 +0300
commita2e00236d0dfc8e3bb5f6c6a63a8431415889a17 (patch)
tree534da1fa1f024d7ffeb1dcdfbd1d68d6b63ddcc5 /build_files
parenta8f9a2493915bf9384553b3933593a5296e70a1c (diff)
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.
Diffstat (limited to 'build_files')
-rw-r--r--build_files/buildbot/codesign/archive_with_indicator.py9
1 files changed, 0 insertions, 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