Ticket #60: PBSQuery_torque5_ranges_fix_exechosts_split.patch

src/PBSQuery.py

@@ -483 +483 @@
         if not nodes:
             return list()
 
-        if isinstance(nodes, str):
-            nodelist = string.split(nodes,'+')
-        else:
-            nodelist = []
-            for n in nodes:
-                if REG_SUBRANGE.search(n):
-                    # This is a range split by _list_2_dict in a list
-                    # E.g. exec_host node1/4,5,8-9 is after _list_dict ['node1/4', '5', '8-9']
-                    # Re-join them with the last node
-                    nodelist[-1] += ',%s' % n
-                else:
-                    nodelist.extend(n.split('+'))
+        if not isinstance(nodes, str):
+            # reassemble the split from _list_2_dict
+            # which results in things like nodes = ['nx/1','2','3+ny/4-6','8']
+            nodes = ",".join(nodes)
+        
+        nodelist = string.split(nodes, '+')
 
         res=[]
         for n in nodelist: