SF.net SVN: gar:[25152] csw/mgar/pkg/lang-python/carbon/trunk

[dmichelsen at users.sourceforge.net]

Revision: 25152
          http://sourceforge.net/p/gar/code/25152
Author:   dmichelsen
Date:     2015-07-02 12:35:32 +0000 (Thu, 02 Jul 2015)
Log Message:
-----------
lang-python/carbon/trunk: Add patch for carbon-aggregator

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/carbon/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/lang-python/carbon/trunk/files/0001-Fix-for-351.patch

Modified: csw/mgar/pkg/lang-python/carbon/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/carbon/trunk/Makefile	2015-07-02 09:50:00 UTC (rev 25151)
+++ csw/mgar/pkg/lang-python/carbon/trunk/Makefile	2015-07-02 12:35:32 UTC (rev 25152)
@@ -14,6 +14,12 @@
 MANIFESTS += cswcarbon-relay.xml
 DISTFILES += $(MANIFESTS)
 
+# Apply patch until this is fixed:
+#   https://github.com/graphite-project/carbon/issues/364
+# Patch taken from
+#   https://github.com/graphite-project/carbon/commit/2cc77752383288c27c4623a659cd0a76ef95b5a9
+PATCHFILES += 0001-Fix-for-351.patch
+
 PACKAGES += CSWpy-carbon
 SPKG_DESC_CSWpy-carbon = Backend data caching and persistence daemon for Graphite
 # PKGFILES is catchall

Added: csw/mgar/pkg/lang-python/carbon/trunk/files/0001-Fix-for-351.patch
===================================================================
--- csw/mgar/pkg/lang-python/carbon/trunk/files/0001-Fix-for-351.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-python/carbon/trunk/files/0001-Fix-for-351.patch	2015-07-02 12:35:32 UTC (rev 25152)
@@ -0,0 +1,25 @@
+From 854066039fcaf9a1e8867468f59600386ba241d3 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 2 Jul 2015 14:31:32 +0200
+Subject: [PATCH] Fix for #351
+
+---
+ lib/carbon/service.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/carbon/service.py b/lib/carbon/service.py
+index be00876..7124450 100644
+--- a/lib/carbon/service.py
++++ b/lib/carbon/service.py
+@@ -24,7 +24,7 @@ from carbon import state, util, events
+ from carbon.log import carbonLogObserver
+ from carbon.exceptions import CarbonConfigException
+ 
+-state.events = state
++state.events = events
+ 
+ 
+ class CarbonRootService(MultiService):
+-- 
+2.4.0
+

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