summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.van.berkom@gmail.com>2020-08-20 06:00:50 +0000
committerTristan Van Berkom <tristan.van.berkom@gmail.com>2020-08-20 06:00:50 +0000
commit3f6a92f9f7d4c113569abdaec8998c898dcb27c2 (patch)
treed3376aa0129727f6aab13426294ab4d2abeb605b
parent2091dce22e072aee71f947a977d3168dd7a0bad4 (diff)
parentf5784d0b123ea3dabde07c68e0e37f6be0b69c41 (diff)
downloadbuildstream-bst-1.4.tar.gz
Merge branch 'bwh/fix-git-remote-name-check-1.4' into 'bst-1.4'bst-1.4
git source plugin: Fix check for remote existence See merge request BuildStream/buildstream!2031
-rw-r--r--buildstream/plugins/sources/git.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/buildstream/plugins/sources/git.py b/buildstream/plugins/sources/git.py
index 495246423..94472bacd 100644
--- a/buildstream/plugins/sources/git.py
+++ b/buildstream/plugins/sources/git.py
@@ -185,7 +185,7 @@ class GitMirror(SourceFetcher):
fail="Failed to retrieve list of remotes in {}".format(self.mirror),
cwd=self.mirror
)
- if remote_name not in remotes:
+ if remote_name not in remotes.strip().split():
self.source.call(
[self.source.host_git, 'remote', 'add', remote_name, url],
fail="Failed to add remote {} with url {}".format(remote_name, url),