projects
/
buildbot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1f38155
)
phase2: remove duplicate branch argument
author
Jo-Philipp Wich
<
[email protected]
>
Mon, 14 Nov 2016 14:38:21 +0000
(15:38 +0100)
committer
Jo-Philipp Wich
<
[email protected]
>
Mon, 14 Nov 2016 14:38:21 +0000
(15:38 +0100)
Signed-off-by: Jo-Philipp Wich <
[email protected]
>
phase2/master.cfg
patch
|
blob
|
history
diff --git
a/phase2/master.cfg
b/phase2/master.cfg
index ad84ab202fd185688a898c874fa959a31119f896..c3e2600c463f626e775890aab6c9c5e95622dcaf 100644
(file)
--- a/
phase2/master.cfg
+++ b/
phase2/master.cfg
@@
-122,7
+122,7
@@
with open(home_dir+'/source.git/feeds.conf.default', 'r') as f:
feeds.append(parts)
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))
+ c['change_source'].append(GitPoller(url[0], branch=branch, workdir='%s/%s.git' %(os.getcwd(), parts[1]), pollinterval=300))
####### SCHEDULERS