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

Check if we are actually the repo for the specified build when PR info is in the request

Browse Source
This commit is contained in:
Marvin Pohl 2021-07-05 13:17:29 +02:00
parent 8decb35652
commit de9d594758
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildbot_gitea/step_source.py
View File

@ -17,7 +17,7 @@ class Gitea(Git):
@defer.inlineCallbacks @defer.inlineCallbacks
def _fetch(self, arg): def _fetch(self, arg):
res = yield super(Gitea, self)._fetch(arg) res = yield super(Gitea, self)._fetch(arg)
if self.build.hasProperty("pr_id"): if self.build.hasProperty("pr_id") and self.repourl == self.build.getProperty("base_git_ssh_url", None):
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)
if remote is None or remote.strip() is '': if remote is None or remote.strip() is '':
@ -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)