Handle any extra parameters to _fetch
This commit is contained in:
parent
5524f5f53d
commit
a6754fadba
|
@ -15,8 +15,8 @@ class Gitea(Git):
|
||||||
the Gitea webhook
|
the Gitea webhook
|
||||||
"""
|
"""
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def _fetch(self, arg):
|
def _fetch(self, *args, **kwargs):
|
||||||
res = yield super(Gitea, self)._fetch(arg)
|
res = yield super(Gitea, self)._fetch(*args, **kwargs)
|
||||||
if self.build.hasProperty("pr_id"):
|
if self.build.hasProperty("pr_id"):
|
||||||
remote = yield self._dovccmd(
|
remote = yield self._dovccmd(
|
||||||
['config', 'remote.pr_source.url'], collectStdout=True, abandonOnFailure=False)
|
['config', 'remote.pr_source.url'], collectStdout=True, abandonOnFailure=False)
|
||||||
|
@ -30,4 +30,4 @@ class Gitea(Git):
|
||||||
self.build.getProperty("head_git_ssh_url", None)])
|
self.build.getProperty("head_git_ssh_url", None)])
|
||||||
yield self._dovccmd(['fetch', 'pr_source'])
|
yield self._dovccmd(['fetch', 'pr_source'])
|
||||||
res = yield self._dovccmd(['merge', self.build.getProperty("head_sha", None)])
|
res = yield self._dovccmd(['merge', self.build.getProperty("head_sha", None)])
|
||||||
defer.returnValue(res)
|
defer.returnValue(res)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user