In quick need for a recent python3-version of py-carbon I put together this update diff
for py-whisper and py-carbon to 1.1.7 including quirks and conflict markers.
It also goes straight from python2 to python3 so I'm not directly asking for OKs but
would like to know if ports can go this path. Additional tests also welcome, py-carbon
does not come with a test-suite but py-whisper does. The other thing is: py-whisper
still pulls in python2 via rrdtool,-python. py-carbon depends on py-whisper but both
ports don't have any other consumers.
Comments? Am I missing something?
-m
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1076
diff -u -p -r1.1076 Makefile
--- devel/quirks/Makefile 25 Oct 2020 18:12:58 -0000 1.1076
+++ devel/quirks/Makefile 27 Oct 2020 19:05:30 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.468
+PKGNAME = quirks-3.469
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1094
diff -u -p -r1.1094 Quirks.pm
--- devel/quirks/files/Quirks.pm 25 Oct 2020 18:12:58 -0000 1.1094
+++ devel/quirks/files/Quirks.pm 27 Oct 2020 19:05:30 -0000
@@ -497,6 +497,8 @@ my $stem_extensions = {
'py-relatorio' => 'py3-relatorio',
'py-croniter' => 'py3-croniter',
'biopython' => 'py3-biopython',
+ 'py-whisper' => 'py3-whisper',
+ 'py-carbon' => 'py3-carbon',
};
my $obsolete_reason = {
Index: databases/py-whisper/Makefile
===================================================================
RCS file: /cvs/ports/databases/py-whisper/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- databases/py-whisper/Makefile 12 Jul 2019 20:44:01 -0000 1.10
+++ databases/py-whisper/Makefile 27 Oct 2020 19:05:30 -0000
@@ -1,22 +1,27 @@
# $OpenBSD: Makefile,v 1.10 2019/07/12 20:44:01 sthen Exp $
-COMMENT= fixed size round-robin style database
+COMMENT = fixed size round-robin style database
-MODPY_EGG_VERSION= 1.0.2
+MODPY_EGG_VERSION = 1.1.7
-DISTNAME= whisper-${MODPY_EGG_VERSION}
-PKGNAME= py-${DISTNAME}
-CATEGORIES= databases
+DISTNAME = whisper-${MODPY_EGG_VERSION}
+PKGNAME = py-${DISTNAME}
+CATEGORIES = databases
# Apache
-PERMIT_PACKAGE= Yes
+PERMIT_PACKAGE = Yes
-MODULES= lang/python
+MODULES = lang/python
MODPY_PI = Yes
+MODPY_SETUPTOOLS = Yes
-RUN_DEPENDS= net/rrdtool,-python
+FLAVORS = python3
+FLAVOR = python3
-NO_TEST = Yes
+RUN_DEPENDS = net/rrdtool,-python
+
+TEST_DEPENDS = devel/py-mock${MODPY_FLAVOR} \
+ devel/py-six${MODPY_FLAVOR}
.include <bsd.port.mk>
Index: databases/py-whisper/distinfo
===================================================================
RCS file: /cvs/ports/databases/py-whisper/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- databases/py-whisper/distinfo 14 Nov 2017 15:59:27 -0000 1.6
+++ databases/py-whisper/distinfo 27 Oct 2020 19:05:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (whisper-1.0.2.tar.gz) = Q9v7R9wUHBdKANjVYdsByfCZp18imTjJJ9fEQN2IK+w=
-SIZE (whisper-1.0.2.tar.gz) = 24064
+SHA256 (whisper-1.1.7.tar.gz) = huAeZudLW/6gbFNvCKpxuwfN3vrKbWqDUuKabt7gcSE=
+SIZE (whisper-1.1.7.tar.gz) = 37376
Index: databases/py-whisper/pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/py-whisper/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- databases/py-whisper/pkg/PLIST 8 Jul 2017 16:09:17 -0000 1.4
+++ databases/py-whisper/pkg/PLIST 27 Oct 2020 19:05:30 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.4 2017/07/08 16:09:17 jasper Exp $
+@conflict py-whisper-*
+@pkgpath databases/py-whisper
bin/find-corrupt-whisper-files.py
bin/rrd2whisper.py
bin/update-storage-times.py
@@ -15,6 +17,12 @@ bin/whisper-resize.py
bin/whisper-set-aggregation-method.py
bin/whisper-set-xfilesfactor.py
bin/whisper-update.py
-lib/python${MODPY_VERSION}/site-packages/whisper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}whisper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/whisper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/whisper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/whisper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/whisper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/whisper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/whisper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/whisper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/whisper.py
-lib/python${MODPY_VERSION}/site-packages/whisper.pyc
Index: databases/py-carbon/Makefile
===================================================================
RCS file: /cvs/ports/databases/py-carbon/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- databases/py-carbon/Makefile 12 Jul 2019 20:43:59 -0000 1.10
+++ databases/py-carbon/Makefile 27 Oct 2020 19:05:30 -0000
@@ -2,25 +2,28 @@
COMMENT= backend data caching and persistence daemon for Graphite
-MODPY_EGG_VERSION= 1.0.1
+MODPY_EGG_VERSION= 1.1.7
DISTNAME= carbon-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
CATEGORIES= databases
-REVISION= 0
# Apache
PERMIT_PACKAGE= Yes
MODULES= lang/python
-MODPY_PI = Yes
+MODPY_PI= Yes
BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= databases/py-whisper \
- devel/py-twisted
+RUN_DEPENDS= databases/py-whisper${MODPY_FLAVOR} \
+ devel/py-twisted${MODPY_FLAVOR}
+
+FLAVORS= python3
+FLAVOR= python3
BIN_FILES= carbon-aggregator.py carbon-cache.py carbon-client.py \
- carbon-relay.py validate-storage-schemas.py
+ carbon-relay.py validate-storage-schemas.py \
+ carbon-aggregator-cache.py
.for b in ${BIN_FILES}
MODPY_ADJ_FILES+= bin/$b
Index: databases/py-carbon/distinfo
===================================================================
RCS file: /cvs/ports/databases/py-carbon/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- databases/py-carbon/distinfo 8 Jul 2017 16:09:46 -0000 1.3
+++ databases/py-carbon/distinfo 27 Oct 2020 19:05:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (carbon-1.0.1.tar.gz) = JbScsdVAFC38wAY4IwjGO5Ic+J0s2EhhHkmHTN1ciUU=
-SIZE (carbon-1.0.1.tar.gz) = 61444
+SHA256 (carbon-1.1.7.tar.gz) = 2aoISx4Aer8gZectpnmCpdxCiRdWy+LIUqK3xS68zSI=
+SIZE (carbon-1.1.7.tar.gz) = 73380
Index: databases/py-carbon/patches/patch-bin_validate-storage-schemas_py
===================================================================
RCS file: /cvs/ports/databases/py-carbon/patches/patch-bin_validate-storage-schemas_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-bin_validate-storage-schemas_py
--- databases/py-carbon/patches/patch-bin_validate-storage-schemas_py 11 Oct 2012 18:00:30 -0000 1.1.1.1
+++ databases/py-carbon/patches/patch-bin_validate-storage-schemas_py 27 Oct 2020 19:05:30 -0000
@@ -1,12 +1,13 @@
$OpenBSD: patch-bin_validate-storage-schemas_py,v 1.1.1.1 2012/10/11 18:00:30 jasper Exp $
---- bin/validate-storage-schemas.py.orig Thu Oct 11 19:15:55 2012
-+++ bin/validate-storage-schemas.py Thu Oct 11 19:16:45 2012
-@@ -22,7 +22,7 @@ if len(sys.argv) == 2:
+Index: bin/validate-storage-schemas.py
+--- bin/validate-storage-schemas.py.orig
++++ bin/validate-storage-schemas.py
+@@ -26,7 +26,7 @@ if len(sys.argv) == 2:
SCHEMAS_FILE = sys.argv[1]
- print "Loading storage-schemas configuration from: '%s'" % SCHEMAS_FILE
+ print("Loading storage-schemas configuration from: '%s'" % SCHEMAS_FILE)
else:
- SCHEMAS_FILE = realpath(join(dirname(__file__), '..', 'conf', 'storage-schemas.conf'))
+ SCHEMAS_FILE = '${SYSCONFDIR}/graphite/storage-schemas.conf'
- print "Loading storage-schemas configuration from default location at: '%s'" % SCHEMAS_FILE
+ print("Loading storage-schemas configuration from default location at: '%s'" % SCHEMAS_FILE)
config_parser = ConfigParser()
Index: databases/py-carbon/patches/patch-lib_carbon_conf_py
===================================================================
RCS file: /cvs/ports/databases/py-carbon/patches/patch-lib_carbon_conf_py,v
retrieving revision 1.3
diff -u -p -r1.3 patch-lib_carbon_conf_py
--- databases/py-carbon/patches/patch-lib_carbon_conf_py 8 Jul 2017 16:09:46 -0000 1.3
+++ databases/py-carbon/patches/patch-lib_carbon_conf_py 27 Oct 2020 19:05:30 -0000
@@ -2,15 +2,16 @@ $OpenBSD: patch-lib_carbon_conf_py,v 1.3
Index: lib/carbon/conf.py
--- lib/carbon/conf.py.orig
+++ lib/carbon/conf.py
-@@ -545,6 +545,7 @@ def read_config(program, options, **kwargs):
+@@ -598,7 +598,7 @@ def read_config(program, options, **kwargs):
+ for name, value in kwargs.items():
settings.setdefault(name, value)
- graphite_root = kwargs.get("ROOT_DIR")
+- graphite_root = kwargs.get("ROOT_DIR")
+ graphite_root = '/var/graphite/'
if graphite_root is None:
graphite_root = os.environ.get('GRAPHITE_ROOT')
if graphite_root is None:
-@@ -555,7 +556,7 @@ def read_config(program, options, **kwargs):
+@@ -609,7 +609,7 @@ def read_config(program, options, **kwargs):
# 'GRAPHITE_CONF_DIR' environment variable.
settings.setdefault("CONF_DIR",
os.environ.get("GRAPHITE_CONF_DIR",
Index: databases/py-carbon/patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/databases/py-carbon/patches/patch-setup_py,v
retrieving revision 1.3
diff -u -p -r1.3 patch-setup_py
--- databases/py-carbon/patches/patch-setup_py 8 Jul 2017 16:09:46 -0000 1.3
+++ databases/py-carbon/patches/patch-setup_py 27 Oct 2020 19:05:30 -0000
@@ -2,20 +2,20 @@ $OpenBSD: patch-setup_py,v 1.3 2017/07/0
Index: setup.py
--- setup.py.orig
+++ setup.py
-@@ -54,7 +54,7 @@ else:
- storage_dirs = [ ('storage/ceres', []), ('storage/whisper',[]),
- ('storage/lists',[]), ('storage/log',[]),
- ('storage/rrd',[]) ]
+@@ -61,7 +61,7 @@ else:
+ storage_dirs = [ ('storage/ceres/dummy.txt', []), ('storage/whisper/dummy.txt',[]),
+ ('storage/lists',[]), ('storage/log/dummy.txt',[]),
+ ('storage/rrd/dummy.txt',[]) ]
-conf_files = [ ('conf', glob('conf/*.example')) ]
+conf_files = [ ('${GRAPHITE_EGDIR}', glob('conf/*.example')) ]
install_files = storage_dirs + conf_files
-@@ -63,7 +63,6 @@ install_files = storage_dirs + conf_files
+@@ -70,7 +70,6 @@ install_files = storage_dirs + conf_files
init_scripts = [ ('examples/init.d', ['distro/redhat/init.d/carbon-cache',
'distro/redhat/init.d/carbon-relay',
'distro/redhat/init.d/carbon-aggregator']) ]
-install_files += init_scripts
- try:
- setup(
+ def read(fname):
+ with open(os.path.join(os.path.dirname(__file__), fname)) as f:
Index: databases/py-carbon/pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/py-carbon/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- databases/py-carbon/pkg/PLIST 1 Nov 2017 10:44:39 -0000 1.4
+++ databases/py-carbon/pkg/PLIST 27 Oct 2020 19:05:30 -0000
@@ -1,6 +1,9 @@
@comment $OpenBSD: PLIST,v 1.4 2017/11/01 10:44:39 landry Exp $
+@conflict py-carbon-*
+@pkgpath databases/py-carbon
@newgroup _graphite:706
@newuser _graphite:706:_graphite:daemon:Graphite and Carbon user:/nonexistent:/sbin/nologin
+bin/carbon-aggregator-cache.py
bin/carbon-aggregator.py
bin/carbon-cache.py
bin/carbon-client.py
@@ -9,75 +12,83 @@ bin/validate-storage-schemas.py
lib/python${MODPY_VERSION}/site-packages/carbon/
lib/python${MODPY_VERSION}/site-packages/carbon-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/carbon/__init__.py
-lib/python${MODPY_VERSION}/site-packages/carbon/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}amqp_listener.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}amqp_publisher.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}carbon_pb2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}conf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}database.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}hashing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}instrumentation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}management.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}manhole.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}pipeline.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}protobuf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}protocols.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}regexlist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}relayrules.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}resolver.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}rewrite.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}routers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}service.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}state.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}storage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/${MODPY_PYCACHE}writer.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/carbon/aggregator/
lib/python${MODPY_VERSION}/site-packages/carbon/aggregator/__init__.py
-lib/python${MODPY_VERSION}/site-packages/carbon/aggregator/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/carbon/aggregator/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/carbon/aggregator/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/aggregator/${MODPY_PYCACHE}buffers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/aggregator/${MODPY_PYCACHE}processor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/aggregator/${MODPY_PYCACHE}rules.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/carbon/aggregator/buffers.py
-lib/python${MODPY_VERSION}/site-packages/carbon/aggregator/buffers.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/aggregator/processor.py
-lib/python${MODPY_VERSION}/site-packages/carbon/aggregator/processor.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/aggregator/rules.py
-lib/python${MODPY_VERSION}/site-packages/carbon/aggregator/rules.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/amqp0-8.xml
lib/python${MODPY_VERSION}/site-packages/carbon/amqp_listener.py
-lib/python${MODPY_VERSION}/site-packages/carbon/amqp_listener.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/amqp_publisher.py
-lib/python${MODPY_VERSION}/site-packages/carbon/amqp_publisher.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/cache.py
-lib/python${MODPY_VERSION}/site-packages/carbon/cache.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/carbon_pb2.py
-lib/python${MODPY_VERSION}/site-packages/carbon/carbon_pb2.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/client.py
-lib/python${MODPY_VERSION}/site-packages/carbon/client.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/conf.py
-lib/python${MODPY_VERSION}/site-packages/carbon/conf.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/database.py
-lib/python${MODPY_VERSION}/site-packages/carbon/database.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/events.py
-lib/python${MODPY_VERSION}/site-packages/carbon/events.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/exceptions.py
-lib/python${MODPY_VERSION}/site-packages/carbon/exceptions.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/hashing.py
-lib/python${MODPY_VERSION}/site-packages/carbon/hashing.pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/http.py
lib/python${MODPY_VERSION}/site-packages/carbon/instrumentation.py
-lib/python${MODPY_VERSION}/site-packages/carbon/instrumentation.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/log.py
-lib/python${MODPY_VERSION}/site-packages/carbon/log.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/management.py
-lib/python${MODPY_VERSION}/site-packages/carbon/management.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/manhole.py
-lib/python${MODPY_VERSION}/site-packages/carbon/manhole.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/pipeline.py
-lib/python${MODPY_VERSION}/site-packages/carbon/pipeline.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/protobuf.py
-lib/python${MODPY_VERSION}/site-packages/carbon/protobuf.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/protocols.py
-lib/python${MODPY_VERSION}/site-packages/carbon/protocols.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/regexlist.py
-lib/python${MODPY_VERSION}/site-packages/carbon/regexlist.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/relayrules.py
-lib/python${MODPY_VERSION}/site-packages/carbon/relayrules.pyc
+lib/python${MODPY_VERSION}/site-packages/carbon/resolver.py
lib/python${MODPY_VERSION}/site-packages/carbon/rewrite.py
-lib/python${MODPY_VERSION}/site-packages/carbon/rewrite.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/routers.py
-lib/python${MODPY_VERSION}/site-packages/carbon/routers.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/service.py
-lib/python${MODPY_VERSION}/site-packages/carbon/service.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/state.py
-lib/python${MODPY_VERSION}/site-packages/carbon/state.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/storage.py
-lib/python${MODPY_VERSION}/site-packages/carbon/storage.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/util.py
-lib/python${MODPY_VERSION}/site-packages/carbon/util.pyc
lib/python${MODPY_VERSION}/site-packages/carbon/writer.py
-lib/python${MODPY_VERSION}/site-packages/carbon/writer.pyc
+lib/python${MODPY_VERSION}/site-packages/twisted/plugins/${MODPY_PYCACHE}carbon_aggregator_cache_plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twisted/plugins/${MODPY_PYCACHE}carbon_aggregator_plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twisted/plugins/${MODPY_PYCACHE}carbon_cache_plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twisted/plugins/${MODPY_PYCACHE}carbon_relay_plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/twisted/plugins/carbon_aggregator_cache_plugin.py
lib/python${MODPY_VERSION}/site-packages/twisted/plugins/carbon_aggregator_plugin.py
-lib/python${MODPY_VERSION}/site-packages/twisted/plugins/carbon_aggregator_plugin.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/plugins/carbon_cache_plugin.py
-lib/python${MODPY_VERSION}/site-packages/twisted/plugins/carbon_cache_plugin.pyc
lib/python${MODPY_VERSION}/site-packages/twisted/plugins/carbon_relay_plugin.py
-lib/python${MODPY_VERSION}/site-packages/twisted/plugins/carbon_relay_plugin.pyc
share/examples/graphite/
@sample ${SYSCONFDIR}/graphite/
share/examples/graphite/aggregation-rules.conf.example
@@ -108,3 +119,13 @@ share/examples/graphite/whitelist.conf.e
@sample /var/graphite/storage/whisper/
@owner
@group
+storage/
+storage/ceres/
+storage/ceres/dummy.txt/
+storage/lists/
+storage/log/
+storage/log/dummy.txt/
+storage/rrd/
+storage/rrd/dummy.txt/
+storage/whisper/
+storage/whisper/dummy.txt/
No comments:
Post a Comment