From 4f0543fe79ae95d1506e49806ea750db4a433a55 Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Tue, 24 Jun 2025 15:25:09 +0200
Subject: [PATCH] refs #2308 do ogExecAndLog also when creating images

---
 CHANGELOG.md                    | 6 ++++++
 ogclient/scripts/createImage.py | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f20070..959bee9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.20.2] - 2025-06-24
+
+### Changed
+
+- Do a couple of ogExecAndLog()s also when creating images
+
 ## [0.20.1] - 2025-06-24
 
 ### Changed
diff --git a/ogclient/scripts/createImage.py b/ogclient/scripts/createImage.py
index aabc3cb..903883e 100755
--- a/ogclient/scripts/createImage.py
+++ b/ogclient/scripts/createImage.py
@@ -140,7 +140,7 @@ def main (disk, par, repo, imgname):
 # Evaluar variable de engine.cfg para reducir el sistema de archivos en la creacion
     if ogGlobals.IMGREDUCE:
         SystemLib.ogEcho (['log', 'session'], None, f'[30] {ogGlobals.lang.MSG_HELP_ogReduceFs}')
-        FileSystemLib.ogReduceFs (disk, par)
+        SystemLib.ogExecAndLog ('command', [f'{ogGlobals.OGPYFUNCS}/ogReduceFs}', disk, par])
         newsizefs = FileSystemLib.ogGetFsSize (disk, par)
         timeaux = time.time() - time1
         SystemLib.ogEcho (['log', 'session'], None, f'      {ogGlobals.lang.MSG_SCRIPTS_TIME_PARTIAL} ( {newsizefs} KB ) : {int (timeaux/60)}m {int (timeaux%60)}s')
@@ -157,7 +157,7 @@ def main (disk, par, repo, imgname):
     with open (ogGlobals.OGLOGCOMMAND, 'w') as fd: fd.write ('')
     time2 = time.time()
     SystemLib.ogEcho (['log', 'session'], None, f'[40] {ogGlobals.lang.MSG_HELP_ogCreateImage} : ogCreateImage {disk} {par} {repo} {imgname} {ogGlobals.IMGPROG} {ogGlobals.IMGCOMP}')
-    if not ImageLib.ogCreateImage (disk, par, repo, f'/{imgname}', ogGlobals.IMGPROG, ogGlobals.IMGCOMP):
+    if not SystemLib.ogExecAndLog ('command', [f'{ogGlobals.OGPYFUNCS}/ogCreateImage}', disk, par, repo, f'/{imgname}', ogGlobals.IMGPROG, ogGlobals.IMGCOMP]):
         SystemLib.ogRaiseError ([], ogGlobals.OG_ERR_IMAGE, 'ogCreateImage')
         sys.exit (1)
     resumecreateimage = subprocess.run (['grep', 'Total Time:', ogGlobals.OGLOGCOMMAND], capture_output=True, text=True).stdout