Changeset 270

Timestamp:

08/24/11 14:11:46 (13 years ago)

Author:

bas

Message:

fixed an error in examples/sara_nodes.py

Location:

trunk

Files:

• CHANGES (modified) (3 diffs)
• debian/changelog (modified) (1 diff)
• examples/sara_nodes.py (modified) (2 diffs)

trunk/CHANGES

@@ -1 +1 @@
 =========== 4.X.X
  * New generated files for pbs_wrap.c and pbs.py to support python 3.X versions
+   Author: Bas van der Vlies 
+
  * Fixed AdvancedParser when using 01-12 range the zero was not appended.
    Reported by: Ramon Bastiaans
    Author: Dennis Stam
+
+ * examples/sara_nodes.py: Catch the PBSQuery error if we can not make a 
+   connection with the batch server and exit the program.
+   Author: Bas van der Vlies 
 
 =========== 4.3.0
@@ -20 +26 @@
   Added the following syntax for node:
         * node['error']
-        * node['event']
+    * node['event']
 
   eg: node: n1
@@ -32 +38 @@
   example code:
         p = PBSQuery()
-        node = p.getnode(n1)
-        print node.event['sample.time']
-        print node['event']['sample.time']
+    node = p.getnode(n1)
+    print node.event['sample.time']
+    print node['event']['sample.time']
 
    Requested by: Roy Dragseth <roy dot dragseth add uit dotno>

trunk/debian/changelog

@@ +1 @@
+pbs-python (4.3.1-1) lenny; urgency=low
+
+  * see CHANGES 
+
+ -- Bas van der Vlies <bas@sara.nl>  Wed, 24 Aug 2011 14:08:09 +0200
+
 pbs-python (4.3.0-1) lenny; urgency=low
 

trunk/examples/sara_nodes.py

@@ -232 +232 @@
                 '''
 
-                header = ' %-10s | %-19s | %s' % ( 'Nodename', 'State', 'Note' )
-                if not options.quiet:
-                        print '\n%s\n%s' % ( header, ( '-' * 80 ) )
                 
                 p = PBSQuery.PBSQuery()
@@ -242 +239 @@
                         p.new_data_structure()
 
-                nodes = p.getnodes( ['state', 'note'] )
+                try:
+                    nodes = p.getnodes( ['state', 'note'] )
+                except PBSQuery.PBSError, detail:
+                    print "PBSQuery error: %s" %detail
+                    sys.exit(1)
+
+                header = ' %-10s | %-19s | %s' % ( 'Nodename', 'State', 'Note' )
+                if not options.quiet:
+                        print '\n%s\n%s' % ( header, ( '-' * 80 ) )
 
                 if args: