From c1b672c45bf888750f3110ce99eaeb0b290c59a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Mon, 17 Oct 2011 13:17:45 +0200
Subject: [PATCH] - are forbidden in module names.
---
setup.py | 6 +++---
.../{generic-cloudooo => generic_cloudooo}/__init__.py | 0
.../template/cloudooo.cfg.in | 0
.../recipe/{generic-kumofs => generic_kumofs}/__init__.py | 0
.../template/kumo_gateway.in | 0
.../template/kumo_manager.in | 0
.../template/kumo_server.in | 0
.../{generic-memcached => generic_memcached}/__init__.py | 0
.../template/memcached.in | 0
9 files changed, 3 insertions(+), 3 deletions(-)
rename slapos/recipe/{generic-cloudooo => generic_cloudooo}/__init__.py (100%)
rename slapos/recipe/{generic-cloudooo => generic_cloudooo}/template/cloudooo.cfg.in (100%)
rename slapos/recipe/{generic-kumofs => generic_kumofs}/__init__.py (100%)
rename slapos/recipe/{generic-kumofs => generic_kumofs}/template/kumo_gateway.in (100%)
rename slapos/recipe/{generic-kumofs => generic_kumofs}/template/kumo_manager.in (100%)
rename slapos/recipe/{generic-kumofs => generic_kumofs}/template/kumo_server.in (100%)
rename slapos/recipe/{generic-memcached => generic_memcached}/__init__.py (100%)
rename slapos/recipe/{generic-memcached => generic_memcached}/template/memcached.in (100%)
diff --git a/setup.py b/setup.py
index 709f4fb07..66bd35e3a 100644
--- a/setup.py
+++ b/setup.py
@@ -49,15 +49,15 @@ setup(name=name,
'erp5 = slapos.recipe.erp5:Recipe',
'erp5testnode = slapos.recipe.erp5testnode:Recipe',
'helloworld = slapos.recipe.helloworld:Recipe',
- 'generic.cloudooo = slapos.recipe.generic-cloudooo:Recipe',
+ 'generic.cloudooo = slapos.recipe.generic_cloudooo:Recipe',
'java = slapos.recipe.java:Recipe',
'kumofs = slapos.recipe.kumofs:Recipe',
- 'generic.kumofs = slapos.recipe.generic-kumofs:Recipe',
+ 'generic.kumofs = slapos.recipe.generic_kumofs:Recipe',
'kvm = slapos.recipe.kvm:Recipe',
'libcloud = slapos.recipe.libcloud:Recipe',
'libcloudrequest = slapos.recipe.libcloudrequest:Recipe',
'memcached = slapos.recipe.memcached:Recipe',
- 'generic.memcached = slapos.recipe.generic-memcached:Recipe',
+ 'generic.memcached = slapos.recipe.generic_memcached:Recipe',
'mysql = slapos.recipe.mysql:Recipe',
'mkdirectory = slapos.recipe.mkdirectory:Recipe',
'nbdserver = slapos.recipe.nbdserver:Recipe',
diff --git a/slapos/recipe/generic-cloudooo/__init__.py b/slapos/recipe/generic_cloudooo/__init__.py
similarity index 100%
rename from slapos/recipe/generic-cloudooo/__init__.py
rename to slapos/recipe/generic_cloudooo/__init__.py
diff --git a/slapos/recipe/generic-cloudooo/template/cloudooo.cfg.in b/slapos/recipe/generic_cloudooo/template/cloudooo.cfg.in
similarity index 100%
rename from slapos/recipe/generic-cloudooo/template/cloudooo.cfg.in
rename to slapos/recipe/generic_cloudooo/template/cloudooo.cfg.in
diff --git a/slapos/recipe/generic-kumofs/__init__.py b/slapos/recipe/generic_kumofs/__init__.py
similarity index 100%
rename from slapos/recipe/generic-kumofs/__init__.py
rename to slapos/recipe/generic_kumofs/__init__.py
diff --git a/slapos/recipe/generic-kumofs/template/kumo_gateway.in b/slapos/recipe/generic_kumofs/template/kumo_gateway.in
similarity index 100%
rename from slapos/recipe/generic-kumofs/template/kumo_gateway.in
rename to slapos/recipe/generic_kumofs/template/kumo_gateway.in
diff --git a/slapos/recipe/generic-kumofs/template/kumo_manager.in b/slapos/recipe/generic_kumofs/template/kumo_manager.in
similarity index 100%
rename from slapos/recipe/generic-kumofs/template/kumo_manager.in
rename to slapos/recipe/generic_kumofs/template/kumo_manager.in
diff --git a/slapos/recipe/generic-kumofs/template/kumo_server.in b/slapos/recipe/generic_kumofs/template/kumo_server.in
similarity index 100%
rename from slapos/recipe/generic-kumofs/template/kumo_server.in
rename to slapos/recipe/generic_kumofs/template/kumo_server.in
diff --git a/slapos/recipe/generic-memcached/__init__.py b/slapos/recipe/generic_memcached/__init__.py
similarity index 100%
rename from slapos/recipe/generic-memcached/__init__.py
rename to slapos/recipe/generic_memcached/__init__.py
diff --git a/slapos/recipe/generic-memcached/template/memcached.in b/slapos/recipe/generic_memcached/template/memcached.in
similarity index 100%
rename from slapos/recipe/generic-memcached/template/memcached.in
rename to slapos/recipe/generic_memcached/template/memcached.in
--
2.30.9