From 1f38155892e09505dce834178415d4bd55c853c4 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 14 Nov 2016 15:36:40 +0100 Subject: [PATCH] phase2: honour branch references in feeds.conf Signed-off-by: Jo-Philipp Wich --- 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 -- 2.30.2