From: Petr Štetiar <ynezz@true.cz>
Date: Wed, 23 Feb 2022 17:23:43 +0000 (+0100)
Subject: phase2: fix obsolete assumption about feed methods
X-Git-Tag: v1~7
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=f3fcdbec877e3f411e3a0ab35ea54e5d573083a1;p=buildbot.git

phase2: fix obsolete assumption about feed methods

In commit 7fae1e5677e9 ("feeds: use git-src-full to allow Git
versioning") there was `src-git` method of shallow clone replaced with
`src-git-full` and this has caused issue with GitPoller configuration as
it only assumed, that only `src-git` method is going to be used for feed
updates. Fix currently stuck buildbot master by allowing usage of both
Git update methods.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
---

diff --git a/phase2/master.cfg b/phase2/master.cfg
index 7742ad6..0281828 100644
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -199,7 +199,7 @@ c['change_source'] = []
 
 def parse_feed_entry(line):
 	parts = line.strip().split()
-	if parts[0] == "src-git":
+	if parts[0].startswith("src-git"):
 		feeds.append(parts)
 		url = parts[2].strip().split(';')
 		branch = url[1] if len(url) > 1 else 'master'