diff options
author | Jan Safranek <jsafrane@redhat.com> | 2013-01-31 13:03:10 +0100 |
---|---|---|
committer | Jan Safranek <jsafrane@redhat.com> | 2013-01-31 13:03:10 +0100 |
commit | fb93e3a7ca64a56b29b7d67e92fb9c05a07eb6a0 (patch) | |
tree | 169c3e64040ec4ace7485fa117fbc64b37fb1980 | |
parent | f89342d2153cb66122508c9b3d209b83442d73e8 (diff) | |
parent | 861a85d3b8e7ed6eaa68edc6d03f1192d46272e1 (diff) | |
download | openlmi-providers-fb93e3a7ca64a56b29b7d67e92fb9c05a07eb6a0.tar.gz openlmi-providers-fb93e3a7ca64a56b29b7d67e92fb9c05a07eb6a0.tar.xz openlmi-providers-fb93e3a7ca64a56b29b7d67e92fb9c05a07eb6a0.zip |
Merge branch 'master' of ssh://git.fedorahosted.org/git/openlmi-providers
-rw-r--r-- | cmake/modules/OpenLMIMacros.cmake | 2 | ||||
-rw-r--r-- | tools/pylint/plugins/cim_provider_checker.py | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cmake/modules/OpenLMIMacros.cmake b/cmake/modules/OpenLMIMacros.cmake index 6468658..ad20a00 100644 --- a/cmake/modules/OpenLMIMacros.cmake +++ b/cmake/modules/OpenLMIMacros.cmake @@ -101,5 +101,5 @@ macro(cim_registration PROVIDER_NAME LIBRARY_NAME MOF DEST) PATHS ${CMAKE_SOURCE_DIR}/mof/ ) add_custom_target(register-${PROVIDER_NAME} - ${CMAKE_SOURCE_DIR}/register.sh ${MOF_FILE} ${CMAKE_CURRENT_BINARY_DIR}/LMI_${PROVIDER_NAME}.reg) + ${CMAKE_SOURCE_DIR}/openlmi-mof-register register ${MOF_FILE} ${CMAKE_CURRENT_BINARY_DIR}/LMI_${PROVIDER_NAME}.reg) endmacro(cim_registration) diff --git a/tools/pylint/plugins/cim_provider_checker.py b/tools/pylint/plugins/cim_provider_checker.py index cf4e229..8ce775b 100644 --- a/tools/pylint/plugins/cim_provider_checker.py +++ b/tools/pylint/plugins/cim_provider_checker.py @@ -79,6 +79,7 @@ def supress_cim_provider_messages(linter, node): or ( child.name not in generated_methods and not child.name.startswith('cim_method_'))): continue + linter.disable('R0201', scope='module', line=node.lineno) for arg in child.args.get_children(): linter.disable('W0613', scope='module', line=arg.lineno) @@ -128,7 +129,7 @@ class CIMProviderChecker(BaseChecker): modm = _RE_PROVIDER_MODULE_NAME.match(parent.name) if clsm and not modm: self.add_message('C9905', node=node, args=parent.name) - if clsm and clsm.group('prefix') != modm.group('prefix'): + if clsm and modm and clsm.group('prefix') != modm.group('prefix'): self.add_message('C9906', node=node, args=(modm.group('prefix'), clsm.group('prefix'))) if clsm and clsm.group('prefix') != 'LMI': @@ -146,6 +147,9 @@ class CIMProviderChecker(BaseChecker): if not node.name in [i[0].value for i in dictionary.items]: self.add_message('W9909', node=getprovs, args=node.name) + elif node.name == "Values" and len([a for a in node.ancestors()]) == 1: + recursively_clean_cls_values(self.linter, node) + def visit_module(self, node): """ Check for invalid module name. |