[Opensrf-commits] [GIT] OpenSRF branch master updated. 3a439d12874170d4b947e498694e8b9d2ec6d01c

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".

The branch, master has been updated
       via  3a439d12874170d4b947e498694e8b9d2ec6d01c (commit)
      from  a408589d648c5960798e571d9cb3518ea176a696 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3a439d12874170d4b947e498694e8b9d2ec6d01c
Author: Dan Scott <dan at coffeecode.net>
Date:   Sun May 15 16:23:32 2011 -0400

    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 at 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'
     )
 )
 

-----------------------------------------------------------------------

Summary of changes:
 examples/buildbot.cfg |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
OpenSRF