Merge remote-tracking branch 'origin/master' into software-smash

Conflicts:
	src/software/cli/software.py
	src/software/openlmi/__init__.py
	src/software/openlmi/software/LMI_HostedSoftwareIdentityResource.py
	src/software/openlmi/software/LMI_SoftwareFileCheck.py
	src/software/openlmi/software/LMI_SoftwareInstalledPackage.py
	src/software/openlmi/software/LMI_SoftwarePackage.py
	src/software/openlmi/software/__init__.py
	src/software/openlmi/software/cimom_entry.py
	src/software/openlmi/software/core/ComputerSystem.py
	src/software/openlmi/software/core/SoftwareFileCheck.py
	src/software/openlmi/software/core/SoftwareInstalledPackage.py
	src/software/openlmi/software/core/SoftwarePackage.py
	src/software/openlmi/software/core/SoftwarePackageChecks.py
	src/software/openlmi/software/core/__init__.py
	src/software/openlmi/software/util/__init__.py
	src/software/openlmi/software/yumdb/__init__.py
	src/software/openlmi/software/yumdb/errors.py
	src/software/openlmi/software/yumdb/jobs.py
	src/software/openlmi/software/yumdb/packagecheck.py
	src/software/openlmi/software/yumdb/packageinfo.py
	src/software/openlmi/software/yumdb/process.py
	src/software/test/base.py
	src/software/test/rpmcache.py
	src/software/test/run.py
	src/software/test/test_software_file_check.py
	src/software/test/test_software_installed_package.py
	src/software/test/test_software_package.py

1 files changed, 31 insertions, 31 deletions

diff --git a/src/software/openlmi/software/core/Identity.py b/src/software/openlmi/software/core/Identity.py
index 6cde2d8..b7e8020 100644
--- a/src/software/openlmi/software/core/Identity.py
+++ b/src/software/openlmi/software/core/Identity.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 # Software Management Providers
 #
-# Copyright (C) 2013 Red Hat, Inc.  All rights reserved.
+# Copyright (C) 2012-2013 Red Hat, Inc.  All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 Just a common functionality related to LMI_SoftwareIdentity provider.
 """
 
-import pywbem 
+import pywbem
 
 from openlmi.common import cmpi_logging
 from openlmi.software import util
@@ -245,40 +245,40 @@ def pkg2model(pkg_info, keys_only=True, model=None):
         _set_key = model.__setitem__
     _set_key('InstanceID', 'LMI:SoftwareIdentity:'+pkg_info.nevra)
     if not keys_only:
-        #model['BuildNumber'] = pywbem.Uint16() # TODO 
+        #model['BuildNumber'] = pywbem.Uint16() # TODO
         model['Caption'] = pkg_info.summary
-        #model['ClassificationDescriptions'] = ['',] # TODO 
+        #model['ClassificationDescriptions'] = ['',] # TODO
         model['Classifications'] = [pywbem.Uint16(0)]
         #model['CommunicationStatus'] = \
-                # self.Values.CommunicationStatus.<VAL> # TODO 
+                # self.Values.CommunicationStatus.<VAL> # TODO
         model['Description'] = pkg_info.description
-        #model['DetailedStatus'] = self.Values.DetailedStatus.<VAL> # TODO 
+        #model['DetailedStatus'] = self.Values.DetailedStatus.<VAL> # TODO
         model['ElementName'] = pkg_info.nevra
         #model['ExtendedResourceType'] = \
-                #self.Values.ExtendedResourceType.<VAL> # TODO 
-        #model['HealthState'] = self.Values.HealthState.<VAL> # TODO 
-        #model['IdentityInfoType'] = ['',] # TODO 
-        #model['IdentityInfoValue'] = ['',] # TODO 
+                #self.Values.ExtendedResourceType.<VAL> # TODO
+        #model['HealthState'] = self.Values.HealthState.<VAL> # TODO
+        #model['IdentityInfoType'] = ['',] # TODO
+        #model['IdentityInfoValue'] = ['',] # TODO
         if pkg_info.installed:
             model['InstallDate'] = pywbem.CIMDateTime(pkg_info.install_time)
         else:
             model['InstallDate'] = pywbem.CIMProperty(
                     'InstallDate', None, type='datetime')
         model['IsEntity'] = True
-        #model['IsLargeBuildNumber'] = bool(False) # TODO 
-        #model['Languages'] = ['',] # TODO 
-        #model['LargeBuildNumber'] = pywbem.Uint64() # TODO 
-        #model['MajorVersion'] = pywbem.Uint16() # TODO 
-        #model['Manufacturer'] = '' # TODO 
+        #model['IsLargeBuildNumber'] = bool(False) # TODO
+        #model['Languages'] = ['',] # TODO
+        #model['LargeBuildNumber'] = pywbem.Uint64() # TODO
+        #model['MajorVersion'] = pywbem.Uint16() # TODO
+        #model['Manufacturer'] = '' # TODO
         #model['MinExtendedResourceTypeBuildNumber'] = \
-                #pywbem.Uint16() # TODO 
+                #pywbem.Uint16() # TODO
         #model['MinExtendedResourceTypeMajorVersion'] = \
-                #pywbem.Uint16() # TODO 
+                #pywbem.Uint16() # TODO
         #model['MinExtendedResourceTypeMinorVersion'] = \
-                #pywbem.Uint16() # TODO 
+                #pywbem.Uint16() # TODO
         #model['MinExtendedResourceTypeRevisionNumber'] = \
-                #pywbem.Uint16() # TODO 
-        #model['MinorVersion'] = pywbem.Uint16() # TODO 
+                #pywbem.Uint16() # TODO
+        #model['MinorVersion'] = pywbem.Uint16() # TODO
         model['Name'] = pkg_info.name
         try:
             model["Epoch"] = pywbem.Uint32(int(pkg_info.epoch))
@@ -290,18 +290,18 @@ def pkg2model(pkg_info, keys_only=True, model=None):
         model['Release'] = pkg_info.release
         model['Architecture'] = pkg_info.arch
         #model['OperatingStatus'] = \
-                #self.Values.OperatingStatus.<VAL> # TODO 
+                #self.Values.OperatingStatus.<VAL> # TODO
         #model['OperationalStatus'] = \
-                #[self.Values.OperationalStatus.<VAL>,] # TODO 
-        #model['OtherExtendedResourceTypeDescription'] = '' # TODO 
-        #model['PrimaryStatus'] = self.Values.PrimaryStatus.<VAL> # TODO 
-        #model['ReleaseDate'] = pywbem.CIMDateTime() # TODO 
-        #model['RevisionNumber'] = pywbem.Uint16() # TODO 
-        #model['SerialNumber'] = '' # TODO 
-        #model['Status'] = self.Values.Status.<VAL> # TODO 
-        #model['StatusDescriptions'] = ['',] # TODO 
-        #model['TargetOperatingSystems'] = ['',] # TODO 
-        #model['TargetOSTypes'] = [pywbem.Uint16(),] # TODO 
+                #[self.Values.OperationalStatus.<VAL>,] # TODO
+        #model['OtherExtendedResourceTypeDescription'] = '' # TODO
+        #model['PrimaryStatus'] = self.Values.PrimaryStatus.<VAL> # TODO
+        #model['ReleaseDate'] = pywbem.CIMDateTime() # TODO
+        #model['RevisionNumber'] = pywbem.Uint16() # TODO
+        #model['SerialNumber'] = '' # TODO
+        #model['Status'] = self.Values.Status.<VAL> # TODO
+        #model['StatusDescriptions'] = ['',] # TODO
+        #model['TargetOperatingSystems'] = ['',] # TODO
+        #model['TargetOSTypes'] = [pywbem.Uint16(),] # TODO
         model['TargetTypes'] = ['rpm', 'yum']
         model['VersionString'] = pkg_info.evra
     return model