diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-03-08 14:40:19 +0100 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-03-08 14:40:19 +0100 |
| commit | e42f8192b965bc5b6fa929e7ec52804a907f4091 (patch) | |
| tree | 1669a274c621a272af5e96584af39b50c09a1cee /modules/private/buildbot/common | |
| parent | d5b16fe0827745409206fc5df0fe06d8fa293ff7 (diff) | |
| download | Nix-e42f8192b965bc5b6fa929e7ec52804a907f4091.tar.gz Nix-e42f8192b965bc5b6fa929e7ec52804a907f4091.tar.zst Nix-e42f8192b965bc5b6fa929e7ec52804a907f4091.zip | |
Fix buildbot slack/xmpp push
Diffstat (limited to 'modules/private/buildbot/common')
| -rw-r--r-- | modules/private/buildbot/common/build_helpers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/private/buildbot/common/build_helpers.py b/modules/private/buildbot/common/build_helpers.py index 384b1ac..ed7ada3 100644 --- a/modules/private/buildbot/common/build_helpers.py +++ b/modules/private/buildbot/common/build_helpers.py | |||
| @@ -115,7 +115,7 @@ class SlackStatusPush(HttpStatusPushBase): | |||
| 115 | msg = "{} environment".format(build["properties"]["environment"][0]) | 115 | msg = "{} environment".format(build["properties"]["environment"][0]) |
| 116 | if "build" in build["properties"]: | 116 | if "build" in build["properties"]: |
| 117 | msg = "of archive {} in ".format(build["properties"]["build"][0]) + msg | 117 | msg = "of archive {} in ".format(build["properties"]["build"][0]) + msg |
| 118 | elif len(build["buildset"]["sourcestamps"][0]["branch"]) > 0: | 118 | elif len(build["buildset"]["sourcestamps"][0]["branch"] or []) > 0: |
| 119 | msg = "revision {}".format(build["buildset"]["sourcestamps"][0]["branch"]) | 119 | msg = "revision {}".format(build["buildset"]["sourcestamps"][0]["branch"]) |
| 120 | else: | 120 | else: |
| 121 | msg = "build" | 121 | msg = "build" |
| @@ -223,7 +223,7 @@ class XMPPStatusPush(HttpStatusPushBase): | |||
| 223 | msg = "{} environment".format(build["properties"]["environment"][0]) | 223 | msg = "{} environment".format(build["properties"]["environment"][0]) |
| 224 | if "build" in build["properties"]: | 224 | if "build" in build["properties"]: |
| 225 | msg = "of archive {} in ".format(build["properties"]["build"][0]) + msg | 225 | msg = "of archive {} in ".format(build["properties"]["build"][0]) + msg |
| 226 | elif len(build["buildset"]["sourcestamps"][0]["branch"]) > 0: | 226 | elif len(build["buildset"]["sourcestamps"][0]["branch"] or []) > 0: |
| 227 | msg = "revision {}".format(build["buildset"]["sourcestamps"][0]["branch"]) | 227 | msg = "revision {}".format(build["buildset"]["sourcestamps"][0]["branch"]) |
| 228 | else: | 228 | else: |
| 229 | msg = "build" | 229 | msg = "build" |