phase2: remove duplicate branch argument

[buildbot.git] / phase2 / master.cfg

diff --git a/phase2/master.cfg b/phase2/master.cfg
index ea3e0fb459bbef52f6f9b84061f87f39bf589390..c3e2600c463f626e775890aab6c9c5e95622dcaf 100644 (file)
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -72,6 +72,8 @@ rsync_sdk_pat = "lede-sdk-*.tar.xz"
 
 if ini.has_option("rsync", "sdk_url"):
        rsync_sdk_url = ini.get("rsync", "sdk_url")
+
+if ini.has_option("rsync", "sdk_password"):
        rsync_sdk_key = ini.get("rsync", "sdk_password")
 
 if ini.has_option("rsync", "sdk_pattern"):
@@ -118,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]), pollinterval=300))
 
 
 ####### SCHEDULERS
@@ -219,7 +223,7 @@ for arch in arches:
        factory.addStep(ShellCommand(
                name = "mkdldir",
                description = "Preparing download directory",
-               command = ["sh", "-c", "mkdir -p $HOME/dl && rmdir ./sdk/dl && ln -sf $HOME/dl ./sdk/dl"]))
+               command = ["sh", "-c", "mkdir -p $HOME/dl && rm -rf ./sdk/dl && ln -sf $HOME/dl ./sdk/dl"]))
 
        factory.addStep(ShellCommand(
                name = "mkconf",