diff options
author | Peter Schiffer <pschiffe@redhat.com> | 2013-04-23 15:46:11 +0200 |
---|---|---|
committer | Peter Schiffer <pschiffe@redhat.com> | 2013-04-23 15:46:11 +0200 |
commit | 6c60ed63585024726dd43e35130d6cf2679e16fc (patch) | |
tree | 13c68c0ce00f4b795c7cd4410da5eecb9e68a89d /src | |
parent | 1e4187b50657065445a33148bfb2224005fb0dff (diff) | |
parent | e916644d46adf08f49a5bcb1158e4e11120b61cb (diff) | |
download | openlmi-providers-6c60ed63585024726dd43e35130d6cf2679e16fc.tar.gz openlmi-providers-6c60ed63585024726dd43e35130d6cf2679e16fc.tar.xz openlmi-providers-6c60ed63585024726dd43e35130d6cf2679e16fc.zip |
Merge branch 'master' of ssh://git.fedorahosted.org/git/openlmi-providers
Diffstat (limited to 'src')
-rw-r--r-- | src/account/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/fan/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/hardware/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/logicalfile/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/power/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/python/openlmi/common/IndicationManager.py | 4 | ||||
-rw-r--r-- | src/service/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/software/openlmi/software/LMI_ResourceForSoftwareIdentity.py | 4 |
8 files changed, 10 insertions, 10 deletions
diff --git a/src/account/CMakeLists.txt b/src/account/CMakeLists.txt index 776ce87..38ecd02 100644 --- a/src/account/CMakeLists.txt +++ b/src/account/CMakeLists.txt @@ -1,7 +1,7 @@ set(PROVIDER_NAME Account) set(LIBRARY_NAME cmpiLMI_${PROVIDER_NAME}) -set(MOF LMI_Account.mof) +set(MOF 60_LMI_Account.mof) set(ACCOUNT_SCRIPT cmpiLMI_${PROVIDER_NAME}-cimprovagt) set(provider_SRCS diff --git a/src/fan/CMakeLists.txt b/src/fan/CMakeLists.txt index 7cb801a..e8e87aa 100644 --- a/src/fan/CMakeLists.txt +++ b/src/fan/CMakeLists.txt @@ -1,7 +1,7 @@ set(PROVIDER_NAME Fan) set(LIBRARY_NAME cmpiLMI_${PROVIDER_NAME}) -set(MOF LMI_Fan.mof) +set(MOF 60_LMI_Fan.mof) set(provider_SRCS fan.c diff --git a/src/hardware/CMakeLists.txt b/src/hardware/CMakeLists.txt index c50acef..eb45adc 100644 --- a/src/hardware/CMakeLists.txt +++ b/src/hardware/CMakeLists.txt @@ -1,6 +1,6 @@ set(PROVIDER_NAME Hardware) set(LIBRARY_NAME cmpiLMI_${PROVIDER_NAME}) -set(MOF LMI_Hardware.mof) +set(MOF 60_LMI_Hardware.mof) set(provider_SRCS utils.c diff --git a/src/logicalfile/CMakeLists.txt b/src/logicalfile/CMakeLists.txt index 8b0097a..3a80353 100644 --- a/src/logicalfile/CMakeLists.txt +++ b/src/logicalfile/CMakeLists.txt @@ -1,7 +1,7 @@ set(PROVIDER_NAME LogicalFile) set(LIBRARY_NAME cmpiLMI_${PROVIDER_NAME}) -set(MOF LMI_LogicalFile.mof) +set(MOF 60_LMI_LogicalFile.mof) set(provider_SRCS file.c diff --git a/src/power/CMakeLists.txt b/src/power/CMakeLists.txt index 73725d3..f77b3ae 100644 --- a/src/power/CMakeLists.txt +++ b/src/power/CMakeLists.txt @@ -1,7 +1,7 @@ set(PROVIDER_NAME PowerManagement) set(LIBRARY_NAME cmpiLMI_${PROVIDER_NAME}) -set(MOF LMI_PowerManagement.mof) +set(MOF 60_LMI_PowerManagement.mof) set(provider_SRCS power.c diff --git a/src/python/openlmi/common/IndicationManager.py b/src/python/openlmi/common/IndicationManager.py index b517373..ba0919d 100644 --- a/src/python/openlmi/common/IndicationManager.py +++ b/src/python/openlmi/common/IndicationManager.py @@ -638,8 +638,8 @@ class IndicationManager(singletonmixin.Singleton): new_instance.classname, filter_id) ind['PerceivedSeverity'] = self.SEVERITY_INFO - cmpi_logging.logger.info("Sending indication %s for %s" % - (ind["IndicationFilterName"], str(path))) + cmpi_logging.logger.info("Sending indication %s for %s", + ind["IndicationFilterName"], str(path)) self.send_indication(ind) @cmpi_logging.trace_method diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt index c0f236f..34d766e 100644 --- a/src/service/CMakeLists.txt +++ b/src/service/CMakeLists.txt @@ -1,7 +1,7 @@ set(PROVIDER_NAME Service) set(LIBRARY_NAME cmpiLMI_${PROVIDER_NAME}) -set(MOF LMI_Service.mof) +set(MOF 60_LMI_Service.mof) set(provider_SRCS util/serviceutil.c diff --git a/src/software/openlmi/software/LMI_ResourceForSoftwareIdentity.py b/src/software/openlmi/software/LMI_ResourceForSoftwareIdentity.py index 42ef7dc..7afa264 100644 --- a/src/software/openlmi/software/LMI_ResourceForSoftwareIdentity.py +++ b/src/software/openlmi/software/LMI_ResourceForSoftwareIdentity.py @@ -182,10 +182,10 @@ class LMI_ResourceForSoftwareIdentity(CIMProvider2): for r in ydb.get_repository_list('enabled')) for pkg in pl: try: - repo = repos[pkg.repo] + repo = repos[pkg.repoid] except KeyError: cmpi_logging.logger.error('unknown or disabled repository' - ' "%s" for package "%s"' % (pkg, pkg.repo)) + ' "%s" for package "%s"', pkg, pkg.repoid) model["AvailableSAP"] = IdentityResource.repo2model( repo, model=sap_model) model["ManagedElement"] = Identity.pkg2model( |