From a5d3d8088d0e3fc0cbe3c29b0acef7fd654db831 Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Mon, 4 Nov 2024 18:13:15 +0100
Subject: [PATCH] refs #1086 don't use set difference--it isn't stable

---
 client/lib/engine/bin/DiskLib.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/client/lib/engine/bin/DiskLib.py b/client/lib/engine/bin/DiskLib.py
index 52e33fe..3ad3b05 100644
--- a/client/lib/engine/bin/DiskLib.py
+++ b/client/lib/engine/bin/DiskLib.py
@@ -428,14 +428,6 @@ def ogDiskToDev (arg_disk=None, arg_part=None):
         ogRaiseError([], ogGlobals.OG_ERR_FORMAT, arg_disk)
         return
 
-    # Si se solicita, mostrar ayuda.
-    #if len(args) == 1 and args[0] == "help":
-    #    ogHelp('ogDiskToDev', 'ogDiskToDev int_ndisk [int_npartition]',
-    #           'ogDiskToDev      =>  /dev/sda /dev/sdb',
-    #           'ogDiskToDev 1    =>  /dev/sda',
-    #           'ogDiskToDev 1 1  =>  /dev/sda1')
-    #    return
-
     # Borrar fichero de caché de configuración si hay cambios en las particiones.
     proc_partitions = Path ('/proc/partitions').read_text()
     tmp_partitions  = Path ('/tmp/.partitions').read_text() if os.path.exists ('/tmp/.partitions') else ''
@@ -443,7 +435,6 @@ def ogDiskToDev (arg_disk=None, arg_part=None):
         # Guardar copia de las particiones definidas para comprobar cambios.
         shutil.copy2('/proc/partitions', '/tmp/.partitions')
         try:
-            ogEcho ([], 'info', f'removing cachefile')
             os.remove(CACHEFILE)
         except FileNotFoundError:
             pass
@@ -452,7 +443,6 @@ def ogDiskToDev (arg_disk=None, arg_part=None):
     if arg_disk and os.path.exists (CACHEFILE):
         with open(CACHEFILE, 'r') as f:
             args_joined = ' '.join (map (str, filter (None, [arg_disk,arg_part])))
-            ogEcho ([], 'info', f'args_joined ({args_joined})')
             for line in f:
                 parts = line.strip().split(':')
                 if len(parts) == 2 and parts[0] == args_joined:
@@ -466,11 +456,11 @@ def ogDiskToDev (arg_disk=None, arg_part=None):
     ALLDISKS += VOLGROUPS
 
     MPATH, ALLDISKS_to_remove =_getMPath()
-    ALLDISKS = list (set (ALLDISKS) - set (ALLDISKS_to_remove))
+    for d in ALLDISKS_to_remove:
+        if d in ALLDISKS: ALLDISKS.remove (d)
 
     ZFSVOLS = _getAllZFSVols()
     ALLDISKS += ZFSVOLS
-    print (f'ALLDISKS ({ALLDISKS}) VOLGROUPS ({VOLGROUPS}) MPATH ({MPATH}) ALLDISKS_to_remove ({ALLDISKS_to_remove}) ZFSVOLS ({ZFSVOLS})')
 
     # No params: return all disks
     if arg_disk is None: