shekhar-cis/buildbot-transifex
1
0
Fork 0
forked from Bitmessage/buildbot-transifex
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed repository regular expression, fixed error message getter

Browse Source
This commit is contained in:
kaou 2019-01-21 20:01:50 +00:00
parent b6facc6362
commit f42f2f44ae
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
buildbot_gitea/reporter.py
View File

@ -25,7 +25,7 @@ import re
class GiteaStatusPush(http.HttpStatusPushBase): class GiteaStatusPush(http.HttpStatusPushBase):
name = "GiteaStatusPush" name = "GiteaStatusPush"
neededDetails = dict(wantProperties=True) neededDetails = dict(wantProperties=True)
ssh_url_match = re.compile(r"(ssh://)?[\w+\-\_]+@[\w+\.\-\_]:?\d*/(?P<owner>[\w_\-\.]+)/(?P<repo_name>[\w_\-\.]+)\.git") ssh_url_match = re.compile(r"(ssh://)?[\w+\-\_]+@[\w\.\-\_]+:?(\d*/)?(?P<owner>[\w_\-\.]+)/(?P<repo_name>[\w_\-\.]+)(\.git)?")
@defer.inlineCallbacks @defer.inlineCallbacks
def reconfigService(self, baseURL, token, def reconfigService(self, baseURL, token,
@ -157,12 +157,13 @@ class GiteaStatusPush(http.HttpStatusPushBase):
) )
if res.code not in (200, 201, 204): if res.code not in (200, 201, 204):
message = yield res.json() message = yield res.json()
message = message.get('message', 'unspecified error') message = message[0].get('message', 'unspecified error')
log.msg( log.msg(
'Could not send status "{state}" for ' 'Could not send status "{state}" for '
'{repo} at {sha}: {message}'.format( '{repo} at {sha}: {code} : {message}'.format(
state=state, state=state,
repo=sourcestamp['repository'], sha=sha, repo=sourcestamp['repository'], sha=sha,
code=res.code,
message=message)) message=message))
elif self.verbose: elif self.verbose:
log.msg( log.msg(