refs #1502 add ogListPrimaryPartitions

client/lib/engine/bin/DiskLib.py

@@ -1096,28 +1096,22 @@ def ogListPartitions (disk):
 #@param   int_ndisk  nº de orden del disco
 #@see     ogListPartitions
 #*/ ##
-def ogListPrimaryPartitions(*args):
+def ogListPrimaryPartitions (disk):
-    # Variables locales
+    PTTYPE = ogGetPartitionTableType (disk)
-    PTTYPE = None
+    if not PTTYPE: return None
-    PARTS = None
 
-    # Si se solicita, mostrar ayuda.
+    PARTS = ogListPartitions (disk)
-    if len(args) == 1 and args[0] == "help":
+    if not PARTS: return None
-        SystemLib.ogHelp('ogListPrimaryPartitions', 'ogListPrimaryPartitions int_ndisk', 'ogListPrimaryPartitions 1  =>  NTFS:10000000 EXT3:5000000 EXTENDED:1000000')
-        return
 
-    PTTYPE = ogGetPartitionTableType(args[0])
+    if 'GPT' == PTTYPE:
-    if PTTYPE is None:
+        res = []
-        return
+        for idx in range (len(PARTS),0,-1):
-    PARTS = ogListPartitions(*args)
+            item = PARTS[idx-1]
-    if PARTS is None:
+            if 0==len(res) and 'EMPTY:0' == item: continue
-        return
+            res.insert (0, item)
-
+        return res
-    if PTTYPE == "GPT":
+    elif 'MSDOS' == PTTYPE:
-        print(PARTS.rstrip(" EMPTY:0"))
+        return PARTS[0:4]
-    elif PTTYPE == "MSDOS":
-        print(PARTS.split(" ")[0:4])
-    return
 
 
 #/**

client/shared/functions/ogListPrimaryPartitions

@@ -0,0 +1,22 @@
+#!/usr/bin/python3
+
+import sys
+import argparse
+from SystemLib import ogHelp
+from DiskLib import ogListPrimaryPartitions
+
+parser = argparse.ArgumentParser (add_help=False)
+parser.add_argument ('disk')
+
+if 2 == len (sys.argv) and 'help' == sys.argv[1]:
+    #parser.print_help() sale en inglés aunque la locale indique otra cosa
+    ogHelp ('ogListPrimaryPartitions', 'ogListPrimaryPartitions int_ndisk', ['ogListPrimaryPartitions 1'])
+    sys.exit (0)
+
+args = parser.parse_args()
+ret = ogListPrimaryPartitions (args.disk)
+
+if ret is not None:
+    if   ret == True: sys.exit (0)
+    elif ret == False: sys.exit (1)
+    else: print (' '.join (ret))