diff options
| author |   Magnus Granberg <zorry@gentoo.org> | 2023-05-28 11:51:02 +0200 |
|---|---|---|
| committer | Magnus Granberg <zorry@gentoo.org> | 2023-05-28 11:51:02 +0200 |
| commit | 79ced78fa0f1b8a74e5582884e650225c658645e (patch) | |
| tree | dc7dc98037f948f528429418fb70eb6bd9f2fd0a | |
| parent | Update db python code to bb3.8 (diff) | |
| download | tinderbox-cluster-79ced78fa0f1b8a74e5582884e650225c658645e.tar.gz tinderbox-cluster-79ced78fa0f1b8a74e5582884e650225c658645e.tar.bz2 tinderbox-cluster-79ced78fa0f1b8a74e5582884e650225c658645e.zip | |
Update gitlab patch to bb3.8
Signed-off-by: Magnus Granberg <zorry@gentoo.org>
| -rw-r--r-- | patches/bb-gitlab.patch | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/patches/bb-gitlab.patch b/patches/bb-gitlab.patch index 8c466f8..251991a 100644 --- a/patches/bb-gitlab.patch +++ b/patches/bb-gitlab.patch @@ -27,20 +27,7 @@ index 5a403d5d0..a6fc698e2 100644 log.msg( f'Could not send status "{state}" for ' f'{sourcestamp["repository"]} at {sha}: {message}') -diff --git a/buildbot/secrets/providers/file.py b/buildbot/secrets/providers/file.py -index 11daf327a..25e010b38 100644 ---- a/buildbot/secrets/providers/file.py -+++ b/buildbot/secrets/providers/file.py -@@ -55,7 +55,7 @@ class SecretInAFile(SecretProviderBase): - secretvalue = source.read() - if suffix: - secretfile = secretfile[:-len(suffix)] -- if strip: -+ if strip and not "OPENSSH PRIVATE KEY" in secretvalue: - secretvalue = secretvalue.rstrip("\r\n") - secrets[secretfile] = secretvalue - return secrets -diff --git a/master/buildbot/www/hooks/gitlab.py b/master/buildbot/www/hooks/gitlab.py +diff --git a/buildbot/www/hooks/gitlab.py b/buildbot/www/hooks/gitlab.py index 8f2f80a83..40de0273e 100644 --- a/buildbot/www/hooks/gitlab.py +++ b/buildbot/www/hooks/gitlab.py |