From 73721d70f73cecb86e5204a023007783e9995a2b Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Thu, 10 Jul 2025 14:50:09 +0200
Subject: [PATCH] refs #2414 make initCache.py output more silent

---
 ogclient/lib/python3/CacheLib.py | 14 +++++++-------
 ogclient/scripts/initCache.py    |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ogclient/lib/python3/CacheLib.py b/ogclient/lib/python3/CacheLib.py
index b305184..ab0ff90 100644
--- a/ogclient/lib/python3/CacheLib.py
+++ b/ogclient/lib/python3/CacheLib.py
@@ -94,8 +94,8 @@ def ogCreateCache (ndsk=1, part=4, sizecache=0):
         sfdisk_line = f'{DISK}{NVME_PREFIX}{part} : start= {START}, size= {SIZE}, type={ID}, name=CACHE'
     elif 'MSDOS' == get_ptt:
         # Si la tabla de particiones no es valida, volver a generarla.
-        if subprocess.run (['parted', '-s', DISK, 'print']).returncode:     ## if True, then parted failed
-            subprocess.run (['fdisk', DISK], input='w\n', text=True)
+        if subprocess.run (['parted', '-s', DISK, 'print'], capture_output=True).returncode:     ## if True, then parted failed
+            subprocess.run (['fdisk', DISK], input='w\n', text=True, capture_output=True)
 
         ID = DiskLib.ogTypeToId ('CACHE', 'MSDOS')
         sfdisk_line = f'{DISK}{NVME_PREFIX}{part} : start= {START}, size= {SIZE}, Id={ID}'
@@ -143,15 +143,15 @@ def ogDeleteCache():
     ptt = DiskLib.ogGetPartitionTableType (ndisk)
     if 'GPT' == ptt:
         # Si la tabla de particiones no es valida, volver a generarla.
-        if subprocess.run (['sgdisk', '-p', disk]).returncode:     ## if True, then sgdisk failed
-            subprocess.run (['gdisk', disk], input='2\nw\nY\n', text=True)
+        if subprocess.run (['sgdisk', '-p', disk], capture_output=True).returncode:     ## if True, then sgdisk failed
+            subprocess.run (['gdisk', disk], input='2\nw\nY\n', text=True, capture_output=True)
         subprocess.run (['sgdisk', disk, f'-d{npart}'])
     elif 'MSDOS' == ptt:
         # Si la tabla de particiones no es valida, volver a generarla.
-        if subprocess.run (['parted', '-s', disk, 'print']).returncode:     ## if True, then parted failed
-            subprocess.run (['fdisk', disk], input='w', text=True)
+        if subprocess.run (['parted', '-s', disk, 'print'], capture_output=True).returncode:     ## if True, then parted failed
+            subprocess.run (['fdisk', disk], input='w', text=True, capture_output=True)
         # Eliminar la partición de caché.
-        subprocess.run (['fdisk', disk], input=f'd\n{npart}\nw', text=True)
+        subprocess.run (['fdisk', disk], input=f'd\n{npart}\nw', text=True, capture_output=True)
 # Borrar etiqueta de la caché.
     if os.path.exists ('/dev/disk/by-label/CACHE'):
         os.unlink ('/dev/disk/by-label/CACHE')
diff --git a/ogclient/scripts/initCache.py b/ogclient/scripts/initCache.py
index f564924..6371ceb 100755
--- a/ogclient/scripts/initCache.py
+++ b/ogclient/scripts/initCache.py
@@ -50,6 +50,8 @@ def main (NDISK, NPART, SIZE, MOUNT):
                 SystemLib.ogRaiseError ([], ogGlobals.OG_ERR_CACHE, 'failed to create cache')
                 return False
             DiskLib.ogUpdatePartitionTable()
+        else:
+            print("[10] Partición de caché solicitada es del mismo tamaño que la existente, ignorar.")
 
     # Si caché no montada y no formateada o cambia el tamaño: formatear.
         cache = CacheLib.ogFindCache()