[Omc-commit] SF.net SVN: omc: [524] pybase/trunk

[<ba...@us...>]

Revision: 524
          http://omc.svn.sourceforge.net/omc/?rev=524&view=rev
Author:   bartw
Date:     2007-12-21 12:37:06 -0800 (Fri, 21 Dec 2007)

Log Message:
-----------
some fixes

Modified Paths:
--------------
    pybase/trunk/OMC_OperatingSystem.py
    pybase/trunk/OMC_UnixProcess.py
    pybase/trunk/omc-pybase-providers.spec

Modified: pybase/trunk/OMC_OperatingSystem.py
===================================================================
--- pybase/trunk/OMC_OperatingSystem.py	2007-12-19 00:03:20 UTC (rev 523)
+++ pybase/trunk/OMC_OperatingSystem.py	2007-12-21 20:37:06 UTC (rev 524)
@@ -109,7 +109,7 @@
             uex(Description = version)
             uex(Caption = version)
             fo.close()
-            install_time = Popen(['rpm', '-qf','/etc/SuSE-release',
+            install_time = Popen(['/bin/rpm', '-qf','/etc/SuSE-release',
                 '--queryformat','%{INSTALLTIME}'], 
                 stdout=PIPE).communicate()[0]
             uex(InstallDate = pywbem.CIMDateTime.fromtimestamp(int(install_time)))

Modified: pybase/trunk/OMC_UnixProcess.py
===================================================================
--- pybase/trunk/OMC_UnixProcess.py	2007-12-19 00:03:20 UTC (rev 523)
+++ pybase/trunk/OMC_UnixProcess.py	2007-12-21 20:37:06 UTC (rev 524)
@@ -306,7 +306,7 @@
         try:
             s = os.readlink('/proc/%d/exe' % self.pid)
         except:
-            return ''
+            return None
         return s
 
     def get_exec_name(self):
@@ -479,9 +479,8 @@
         model['PercentCPU'] = pywbem.Real32(ps['percent_cpu'])
         model['KernelModeTime'] = pywbem.Uint64(ps['kernel_mode_time'])
         model['UserModeTime'] = pywbem.Uint64(ps['user_mode_time'])
-        modpath = lp.get_module_path();
-        if modpath:
-            model['ModulePath'] = modpath
+        modpath = lp.get_module_path()
+        model['ModulePath'] = lp.get_module_path()
         model['SharedMemorySize'] = pywbem.Uint64(_bytes2KB(ps['shared_mem_size']))
         model['ResidentSetSize'] = pywbem.Uint64(_bytes2KB(ps['resident_set_size']))
         cl = lp.get_command_line()
@@ -813,7 +812,7 @@
         logger.log_debug('Entering %s.enum_instances()' \
                 % self.__class__.__name__)
         for lp in LinuxProcess.procs():
-            model['Dependent'] = lp.get_instance_name(cim_class.namespace)
+            model['Dependent'] = lp.get_instance_name(model.path.namespace)
             fname = lp.get_module_path()
             if fname:
                 model['Antecedent'] = OMC_LogicalFile.get_file_path(fname)

Modified: pybase/trunk/omc-pybase-providers.spec
===================================================================
--- pybase/trunk/omc-pybase-providers.spec	2007-12-19 00:03:20 UTC (rev 523)
+++ pybase/trunk/omc-pybase-providers.spec	2007-12-21 20:37:06 UTC (rev 524)
@@ -19,9 +19,9 @@
 License:        BSD
 URL:            http://omc-project.org/
 BuildArch:      noarch
-Source0:	%{name}-%{version}.tar.gz
-PreReq:		/usr/bin/loadmof.sh
-Requires:       python-pywbem pyprovifc>=1.0.0
+Source0:	    %{name}-%{version}.tar.gz
+PreReq:		    /usr/bin/loadmof.sh
+Requires:       python-pywbem, pyprovifc >= 1.0.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.