ports/163674: [PATCH] devel/buildbot-slave: update to 0.8.5

[Michael Gmelin]

>Number:         163674
>Category:       ports
>Synopsis:       [PATCH] devel/buildbot-slave: update to 0.8.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 28 18:10:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Michael Gmelin
>Release:        FreeBSD 8.2-RELEASE-p2 amd64
>Organization:
Grem Equity GmbH
>Environment:
System: FreeBSD settler.grem.de 8.2-RELEASE-p2 FreeBSD 8.2-RELEASE-p2 #3 r222557M: Thu Jun 16 23:58:02 CEST
>Description:
- Update to 0.8.5
- Fix problem in git.py which prevented buildbot-slave from working with git >= 1.7.7 (see http://trac.buildbot.net/ticket/2127 and https://github.com/buildbot/buildbot/commit/6f5ce3b2ab033338f3ad7ddccbf8b6542311f70b)

Added file(s):
- files/patch-buildslave__commands__git.py

Port maintainer (clsung at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- buildbot-slave-0.8.5.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/buildbot-slave.orig/Makefile /usr/ports/devel/buildbot-slave/Makefile
--- /usr/ports/devel/buildbot-slave.orig/Makefile	2011-12-28 16:33:17.201630565 +0100
+++ /usr/ports/devel/buildbot-slave/Makefile	2011-12-28 16:35:59.975374931 +0100
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	buildbot-slave
-PORTVERSION=	0.8.4
+PORTVERSION=	0.8.5
 CATEGORIES=	devel python
 MASTER_SITES=	GOOGLE_CODE
 
diff -ruN --exclude=CVS /usr/ports/devel/buildbot-slave.orig/distinfo /usr/ports/devel/buildbot-slave/distinfo
--- /usr/ports/devel/buildbot-slave.orig/distinfo	2011-12-28 16:33:17.201630565 +0100
+++ /usr/ports/devel/buildbot-slave/distinfo	2011-12-28 16:36:48.477171207 +0100
@@ -1,2 +1,2 @@
-SHA256 (buildbot-slave-0.8.4.tar.gz) = 392ea68373d6e3000c4948c53f3dd157fa4ac491a1ca8a54dba75aca6f361dbb
-SIZE (buildbot-slave-0.8.4.tar.gz) = 97185
+SHA256 (buildbot-slave-0.8.5.tar.gz) = 637c23fcdedbc282b596c2ce652b74be96aa9788c39d9b69f903bdb8c2ede217
+SIZE (buildbot-slave-0.8.5.tar.gz) = 98133
diff -ruN --exclude=CVS /usr/ports/devel/buildbot-slave.orig/files/patch-buildslave__commands__git.py /usr/ports/devel/buildbot-slave/files/patch-buildslave__commands__git.py
--- /usr/ports/devel/buildbot-slave.orig/files/patch-buildslave__commands__git.py	1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/devel/buildbot-slave/files/patch-buildslave__commands__git.py	2011-12-28 18:01:26.000000000 +0100
@@ -0,0 +1,30 @@
+--- buildslave/commands/git.py.orig	2011-12-28 17:02:35.000000000 +0100
++++ buildslave/commands/git.py	2011-12-28 18:00:22.706556955 +0100
+@@ -63,7 +63,7 @@
+     def sourcedirIsUpdateable(self):
+         return os.path.isdir(os.path.join(self._fullSrcdir(), ".git"))
+ 
+-    def _dovccmd(self, command, cb=None, **kwargs):
++    def _dovccmd(self, command, cb=None, stopOnFail=True, **kwargs):
+         git = self.getCommand("git")
+         c = runprocess.RunProcess(self.builder, [git] + command, self._fullSrcdir(),
+                          sendRC=False, timeout=self.timeout,
+@@ -72,7 +72,8 @@
+         self.command = c
+         d = c.start()
+         if cb:
+-            d.addCallback(self._abandonOnFailure)
++            if stopOnFail:
++                d.addCallback(self._abandonOnFailure)
+             d.addCallback(cb)
+         return d
+ 
+@@ -107,7 +108,7 @@
+         # Rename branch, so that the repo will have the expected branch name
+         # For further information about this, see the commit message
+         command = ['branch', '-M', self.branch]
+-        return self._dovccmd(command, self._initSubmodules)
++        return self._dovccmd(command, self._initSubmodules, False)
+         
+     def _didFetch(self, res):
+         if self.revision:
--- buildbot-slave-0.8.5.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: