Changeset 99

Timestamp:

11/23/05 15:52:53 (18 years ago)

Author:

bas

Message:

distro/src/PBSQuery.py:

• Can now handle exceptions, eg if we can not make an connection with the server

distro/pbs_python.spec:

• New spec file from Martin

Location:

trunk/pbs_swig/distro

Files:

• CHANGES (modified) (1 diff)
• pbs_python.spec (modified) (4 diffs)
• src/PBSQuery.py (modified) (3 diffs)

trunk/pbs_swig/distro/CHANGES

@@ -7 +7 @@
 find the pbs/torque libraries. If unset it will use
 some useful defaults to find the libaries.
-
 Suggested by: Troy Baer
 
-
+PBSQuery.py:
+        - If we can not make an connection with the server
+          the raise an exception.
+
+pbs_python.spec:
+        -  It can now handle mode bits
+        Author: Martin Pels from SARA
+        
 =========== Version 2.8.0
 

trunk/pbs_swig/distro/pbs_python.spec

@@ -1 +1 @@
 Summary: This package contains the pbs python module.
 Name: pbs_python
-Version: 2.7.10 
+Version: 2.8.1 
 Release: 1
 Copyright: See LICENSE
@@ -10 +10 @@
 %description
 This package contains the pbs python module.
-
-%prep
-%setup -q
 
 %build
@@ -24 +21 @@
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,0755)
 %doc README TODO examples
 
+/usr/lib/python2.2/site-packages
+/usr/lib/python2.2/site-packages/pbs
 /usr/lib/python2.2/site-packages/pbs/pbs.py
 /usr/lib/python2.2/site-packages/pbs/PBSQuery.py
@@ -35 +34 @@
 
 %changelog
+* Tue Nov 22 2005 Martin Pels <pels@sara.nl>
+- Changed default directory permissions
 * Tue Nov 01 2005 Martin Pels <pels@sara.nl> 
 - Initial version
+

trunk/pbs_swig/distro/src/PBSQuery.py

@@ -61 +61 @@
 import pbs
 
+class PBSError(Exception):
+        def __init__(self, msg=''):
+                self.msg = msg
+                Exception.__init__(self, msg)
+        def __repr__(self):
+                return self.msg
+        __str__ = __repr__
+
 
 class PBSQuery:
@@ -73 +81 @@
        """Connect to the PBS/Torque server"""
        self.con = pbs.pbs_connect(self.server)
+       if self.con < 0:
+          str = "Could not make an connection with %s\n" %(self.server)
+          raise PBSError(str)
 
     def _disconnect(self):
@@ -86 +97 @@
             self.attribs[i].name = attrib
             i = i + 1
+
+    def _pbsstr_2_list(self, str, delimiter):
+        """Convert an string to an python list and use delimiter as spit char"""
+        l = sting.splitfields(str, delimiter)
+        if len(l) > 1:
+           return l
 
     def _list_2_dict(self, l, class_func):