From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 14 Nov 2016 14:36:40 +0000 (+0100)
Subject: phase2: honour branch references in feeds.conf
X-Git-Tag: v1~223
X-Git-Url: http://git.openwrt.org/?p=buildbot.git;a=commitdiff_plain;h=1f38155892e09505dce834178415d4bd55c853c4

phase2: honour branch references in feeds.conf

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/phase2/master.cfg b/phase2/master.cfg
index d598521..ad84ab2 100644
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -120,7 +120,9 @@ with open(home_dir+'/source.git/feeds.conf.default', 'r') as f:
 		parts = line.strip().split()
 		if parts[0] == "src-git":
 			feeds.append(parts)
-			c['change_source'].append(GitPoller(parts[2], workdir='%s/%s.git' %(os.getcwd(), parts[1]), branch='master', pollinterval=300))
+			url = parts[2].strip().split(';')
+			branch = url[1] if len(url) > 1 else 'master'
+			c['change_source'].append(GitPoller(url[0], branch=branch, workdir='%s/%s.git' %(os.getcwd(), parts[1]), branch='master', pollinterval=300))
 
 
 ####### SCHEDULERS