From 659f348cd2fe6587f5daaf91e227509b95be6d6f Mon Sep 17 00:00:00 2001
From: Michal Minar <miminar@redhat.com>
Date: Wed, 24 Oct 2012 16:38:37 +0200
Subject: modified for used under tog-pegasus

Checkum property of LMI_SoftwareFileCheck had different type than
in base class. This prevented registration.
 - Solved by renaming:
     Checksum         -> FileChecksum
     ExpectedChecksum -> ExpectedFileChecksum
     ChecksumType     -> FileChecksumType

fixed filtering of found available and installed packages
 - search by nevra replaced with search for particular keys
---
 mof/LMI_Software.mof | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'mof')

diff --git a/mof/LMI_Software.mof b/mof/LMI_Software.mof
index 90c7974..ecab140 100644
--- a/mof/LMI_Software.mof
+++ b/mof/LMI_Software.mof
@@ -150,7 +150,7 @@ class LMI_SoftwareFileCheck : CIM_FileSpecification {
              , "Execute User" , "Write User" , "Read User"
              , "Sticky", "SGID", "SUID"
              } ]
-  Uint8 FileModeFlags[];
+  uint8 FileModeFlags[];
     [ Description ( 
       "File mode as an array of permissions of file from RPM database."
       " Each value represents a bit position in file mode."),
@@ -164,17 +164,17 @@ class LMI_SoftwareFileCheck : CIM_FileSpecification {
              , "Execute User" , "Write User" , "Read User"
              , "Sticky", "SGID", "SUID"
              } ]
-  Uint8 ExpectedFileModeFlags[];
+  uint8 ExpectedFileModeFlags[];
 
     [ Override("MD5Checksum"),
       Description("MD5 checksum of installed file.") ]
   String MD5Checksum;
     [ Description("Checksum of installed file."
       " Hash algorithm used can be obtained with ChecksumType property.") ]
-  String Checksum;
+  String FileChecksum;
     [ Description("Checksum of file from RPM database."
       " Hash algorithm used can be obtained with ChecksumType property.") ]
-  String ExpectedChecksum;
+  String ExpectedFileChecksum;
 
     [ Description("Number of hash algorithm according to RFC4880."
       " This algorithm is used for making checksums of RPM files and"
@@ -183,7 +183,7 @@ class LMI_SoftwareFileCheck : CIM_FileSpecification {
                , "8", "9","10","11" },
       Values { "UNKNOWN", "MD5", "SHA-1", "RIPE-MD/160"
              , "SHA256", "SHA384", "SHA512", "SHA224" } ]
-  uint16 ChecksumType;
+  uint16 FileChecksumType;
 
     [ Description("User ID of installed file.") ]
   uint32 FileUserID;
-- 
cgit