x/cloud-init
Code Issues Proposed changes

1. Change to fixup transform/form transform name

Browse Source 
2. Check lowercase name against .py instead of unknown case.
This commit is contained in:
Joshua Harlow
2012-06-16 09:32:22 -07:00
parent 5ec781a4ce
commit 8da6397f28
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cloudinit/transforms/__init__.py
View File

@@ -26,9 +26,9 @@ from cloudinit import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
def form_module_name(name): def form_transform_name(name):
canon_name = name.replace("-", "_") canon_name = name.replace("-", "_")
if canon_name.endswith(".py"): if canon_name.lower().endswith(".py"):
canon_name = canon_name[0:(len(canon_name) - 3)] canon_name = canon_name[0:(len(canon_name) - 3)]
canon_name = canon_name.strip() canon_name = canon_name.strip()
if not canon_name: if not canon_name:
@@ -38,7 +38,7 @@ def form_module_name(name):
return canon_name return canon_name
def fixup_module(mod, def_freq=PER_INSTANCE): def fixup_transform(mod, def_freq=PER_INSTANCE):
if not hasattr(mod, 'frequency'): if not hasattr(mod, 'frequency'):
setattr(mod, 'frequency', def_freq) setattr(mod, 'frequency', def_freq)
else: else:
@@ -49,7 +49,6 @@ def fixup_module(mod, def_freq=PER_INSTANCE):
def empty_handle(_name, _cfg, _cloud, _log, _args): def empty_handle(_name, _cfg, _cloud, _log, _args):
pass pass
setattr(mod, 'handle', empty_handle) setattr(mod, 'handle', empty_handle)
# Used only for warning if possibly running on a not checked distro...
if not hasattr(mod, 'distros'): if not hasattr(mod, 'distros'):
setattr(mod, 'distros', None) setattr(mod, 'distros', None)
return mod return mod