Merge pull request 'fix-syntax-and-others' (#72) from fix-syntax-and-others into main

Reviewed-on: #72

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.21.1] - 2025-06-26
+
+### Fixed
+
+- Fixed syntax and other errors
+
 ## [0.21.0] - 2025-06-25
 
 ### Changed

ogclient/interfaceAdm/Configurar.py

@@ -97,10 +97,10 @@ for item in tbprm:
         elif 'ope' == k: ope = int (v)
 
     missing_params = []
-    if par is None: missing_params.append ('par')
-    if cpt is None: missing_params.append ('cpt')
-    if sfi is None: missing_params.append ('sfi')
-    if tam is None: missing_params.append ('tam')
+    if par is None or 'None' == par: missing_params.append ('par')
+    if cpt is None or 'None' == cpt: missing_params.append ('cpt')
+    if sfi is None or 'None' == sfi: missing_params.append ('sfi')
+    if tam is None or 'None' == tam: missing_params.append ('tam')
     if missing_params:
         print (f'partition data ({item}) missing required parameters ({' '.join (missing_params)})')
         sys.exit (1)

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}')
-        SystemLib.ogExecAndLog ('command', [f'{ogGlobals.OGPYFUNCS}/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 SystemLib.ogExecAndLog ('command', [f'{ogGlobals.OGPYFUNCS}/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

ogclient/scripts/updateCache.py

@@ -156,9 +156,10 @@ CacheLib.ogMountCache()
 imgdir = FileLib.ogGetParentPath ('CACHE', f'/{path}')
 if not imgdir:
     SystemLib.ogEcho (['log', 'session'], None, f'[5] {ogGlobals.lang.MSG_HELP_ogMakeDir}  "{path} {os.path.dirname (path)}".')
-    FileLib.ogMakeDir ('CACHE', os.path.dirname (f'/{path}'))
-    imgdir = ogGetParentPath ('CACHE', f'/{path}')
+    FileLib.ogMakeDir (container='CACHE', file=os.path.dirname (f'/{path}'))
+    imgdir = FileLib.ogGetParentPath ('CACHE', f'/{path}')
     if not imgdir:
+        SystemLib.ogRaiseError ('session', ogGlobals.OG_ERR_IMAGE, 'no directory for images')
         sys.exit (1)
 
 t0 = time.time()