From: Dan Scott <dan@coffeecode.net>
Date: Sun, 15 May 2011 20:23:32 +0000 (-0400)
Subject: Add a workdir for each GitPoller source repository
X-Git-Tag: osrf_rel_2_1_0-alpha1~42
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=3a439d12874170d4b947e498694e8b9d2ec6d01c;p=OpenSRF.git

Add a workdir for each GitPoller source repository

Not 100% sure, but with two GitPollers using the same working
directory, I suspect that there was a conflict between the
underlying repos as to which commit was the newest. Give
each of them an explicit working directory in the attempt
to avoid this.

Signed-off-by: Dan Scott <dan@coffeecode.net>
---

diff --git a/examples/buildbot.cfg b/examples/buildbot.cfg
index 1af1454..571b70c 100644
--- a/examples/buildbot.cfg
+++ b/examples/buildbot.cfg
@@ -46,13 +46,15 @@ osrf_git = 'git://git.evergreen-ils.org/OpenSRF.git'
 
 from buildbot.changes import gitpoller
 c['change_source'] = (
-	gitpoller.GitPoller(
-		project='OpenSRF',
-		repourl=osrf_git
+    gitpoller.GitPoller(
+        project='OpenSRF',
+        repourl=osrf_git,
+        workdir='/tmp/buildbot_osrf_work'
     ),
-	gitpoller.GitPoller(
-		project='Evergreen',
-        repourl=eg_git
+    gitpoller.GitPoller(
+        project='Evergreen',
+        repourl=eg_git,
+        workdir='/tmp/buildbot_eg_work'
     )
 )