[buildbot] phase2: honour branch references in feeds.conf

LEDE Commits lede-commits at lists.infradead.org
Mon Nov 14 06:36:58 PST 2016


jow pushed a commit to buildbot.git, branch master:
https://git.lede-project.org/1f38155892e09505dce834178415d4bd55c853c4

commit 1f38155892e09505dce834178415d4bd55c853c4
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Mon Nov 14 15:36:40 2016 +0100

    phase2: honour branch references in feeds.conf
    
    Signed-off-by: Jo-Philipp Wich <jo at mein.io>
---
 phase2/master.cfg | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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



More information about the lede-commits mailing list