From 607b37a81d8c9ecb1d2b478659e0ef433c4c97ae Mon Sep 17 00:00:00 2001 From: Michal Minar Date: Fri, 10 May 2013 16:00:40 +0200 Subject: fixed method invocation of SoftwareInstallationService Undefined variable used in logging statement would generate error for installation from URI. --- .../openlmi/software/core/InstallationService.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/software/openlmi/software/core/InstallationService.py b/src/software/openlmi/software/core/InstallationService.py index 40e863e..ccb27a6 100644 --- a/src/software/openlmi/software/core/InstallationService.py +++ b/src/software/openlmi/software/core/InstallationService.py @@ -747,34 +747,33 @@ def install_or_remove_package(env, method, try: ydb = YumDB.get_instance() if action == values.InstallOptions.Uninstall: - nevra = Identity.object_path2nevra( - source, with_epoch='ALWAYS') - cmpi_logging.logger.info('removing package %s', nevra) - jobid = ydb.remove_package(nevra, async=True, **metadata) + src = Identity.object_path2nevra(source, with_epoch='ALWAYS') + cmpi_logging.logger.info('removing package %s', src) + jobid = ydb.remove_package(src, async=True, **metadata) else: update = action == values.InstallOptions.Update - if method == InstallationJob.JOB_METHOD_INSTALL_FROM_URI: + if method == Job.JOB_METHOD_INSTALL_FROM_URI: cmpi_logging.logger.info('%s package "%s"', 'updating' if update else 'installing', source) + src = source jobid = ydb.install_package_from_uri( source, update_only=update, force=force or repair, async=True, **metadata) else: # software identity - nevra = Identity.object_path2nevra(source, with_epoch='ALWAYS') + src = Identity.object_path2nevra(source, with_epoch='ALWAYS') if update: - jobid = ydb.update_package(nevra, + jobid = ydb.update_package(src, force=force or repair, async=True, **metadata) else: - jobid = ydb.install_package(nevra, + jobid = ydb.install_package(src, force=force or repair, async=True, **metadata) cmpi_logging.logger.info('installation job %s for pkg "%s"' - ' enqueued', jobid, nevra) + ' enqueued', jobid, src) return jobid except (pywbem.CIMError, errors.InvalidURI) as exc: cmpi_logging.logger.exception('failed to install/remove package "%s"' ' from %s: %s', source, - JOB_METHOD_SRC_PARAM_NAMES[method].lower(), - str(exc)) + JOB_METHOD_SRC_PARAM_NAMES[method].lower(), str(exc)) raise InstallationError(values.Unspecified_Error, str(exc)) -- cgit