SF.net SVN: gar:[22309] csw/mgar/pkg/buildbot/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Fri Oct 25 14:09:22 CEST 2013


Revision: 22309
          http://gar.svn.sourceforge.net/gar/?rev=22309&view=rev
Author:   dmichelsen
Date:     2013-10-25 12:09:22 +0000 (Fri, 25 Oct 2013)
Log Message:
-----------
buildbot/trunk: Remove unnecessary patches, now done via REINPLACEMENT

Modified Paths:
--------------
    csw/mgar/pkg/buildbot/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/buildbot/trunk/files/buildbot-debug.patch
    csw/mgar/pkg/buildbot/trunk/files/buildbot-tail.patch

Modified: csw/mgar/pkg/buildbot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/buildbot/trunk/Makefile	2013-10-25 12:08:44 UTC (rev 22308)
+++ csw/mgar/pkg/buildbot/trunk/Makefile	2013-10-25 12:09:22 UTC (rev 22309)
@@ -23,8 +23,6 @@
 endef
 
 MASTER_SITES = $(PYPI_MIRROR)
-PATCHFILES  = buildbot-tail.patch
-#PATCHFILES += buildbot-debug.patch
 DISTFILES += $(DISTNAME).tar.gz
 
 PACKAGES += CSWbuildbot

Deleted: csw/mgar/pkg/buildbot/trunk/files/buildbot-debug.patch
===================================================================
--- csw/mgar/pkg/buildbot/trunk/files/buildbot-debug.patch	2013-10-25 12:08:44 UTC (rev 22308)
+++ csw/mgar/pkg/buildbot/trunk/files/buildbot-debug.patch	2013-10-25 12:09:22 UTC (rev 22309)
@@ -1,25 +0,0 @@
-diff -ru buildbot-0.7.11p1.orig/buildbot/changes/changes.py buildbot-0.7.11p1/buildbot/changes/changes.py
---- buildbot-0.7.11p1.orig/buildbot/changes/changes.py	2009-07-15 20:09:30.000000000 +0100
-+++ buildbot-0.7.11p1/buildbot/changes/changes.py	2009-07-30 13:30:01.632031291 +0100
-@@ -73,6 +73,9 @@
-         self.files = files[:]
-         self.files.sort()
- 
-+    def __repr__(self):
-+        return "branch(%s) at %s by %s" % (self.branch, self.revision, self.who)
-+
-     def asText(self):
-         data = ""
-         data += self.getFileContents()
-diff -ru buildbot-0.7.11p1.orig/buildbot/scheduler.py buildbot-0.7.11p1/buildbot/scheduler.py
---- buildbot-0.7.11p1.orig/buildbot/scheduler.py	2009-07-15 20:09:30.000000000 +0100
-+++ buildbot-0.7.11p1/buildbot/scheduler.py	2009-07-30 16:56:59.195283110 +0100
-@@ -287,6 +287,8 @@
- 
-     def addChange(self, change):
-         branch = change.branch
-+        log.msg("branch = %s" % repr(branch))
-+        log.msg("self.branches = %s" % repr(self.branches))
-         if self.branches is not None and branch not in self.branches:
-             log.msg("%s ignoring off-branch %s" % (self, change))
-             return

Deleted: csw/mgar/pkg/buildbot/trunk/files/buildbot-tail.patch
===================================================================
--- csw/mgar/pkg/buildbot/trunk/files/buildbot-tail.patch	2013-10-25 12:08:44 UTC (rev 22308)
+++ csw/mgar/pkg/buildbot/trunk/files/buildbot-tail.patch	2013-10-25 12:09:22 UTC (rev 22309)
@@ -1,12 +0,0 @@
-diff -ru buildbot-0.7.11p1.orig/buildbot/scripts/logwatcher.py buildbot-0.7.11p1/buildbot/scripts/logwatcher.py
---- buildbot-0.7.11p1.orig/buildbot/scripts/logwatcher.py	2009-03-02 18:13:03.000000000 +0100
-+++ buildbot-0.7.11p1/buildbot/scripts/logwatcher.py	2009-07-29 18:00:44.304903854 +0200
-@@ -43,7 +43,7 @@
-         # been seen within 10 seconds, and with ReconfigError if the error
-         # line was seen. If the logfile could not be opened, it errbacks with
-         # an IOError.
--        self.p = reactor.spawnProcess(self.pp, "/usr/bin/tail",
-+        self.p = reactor.spawnProcess(self.pp, "/opt/csw/bin/gtail",
-                                       ("tail", "-f", "-n", "0", self.logfile),
-                                       env=os.environ,
-                                       )

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list