Merge pull request 'refs #2521 have CrearImagenGit not receive the "tag" parameter' (#102) from crearimagengit-no-tag into main

Reviewed-on: #102

CHANGELOG.md

@@ -5,6 +5,30 @@ 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).
 
+## [1.1.0] - 2025-07-24
+
+### Changed
+
+- Have CrearImagenGit not receive the "tag" parameter
+
+## [1.0.3] - 2025-07-24
+
+### Fixed
+
+- Have GetGitData deal with the fact that .git may be a regular file
+
+## [1.0.2] - 2025-07-24
+
+### Changed
+
+- Write listSoftwareInfo errors in the log
+
+## [1.0.1] - 2025-07-23
+
+### Fixed
+
+- Fixed small bugs in the py init scripts
+
 ## [1.0.0] - 2025-07-18
 
 ### Changed

ogclient/etc/preinit.py

@@ -4,8 +4,9 @@
 import os
 import sys
 OPENGNSYS = os.environ.get ('OPENGNSYS', '/opt/opengnsys')
-os.environ['PYTHONPATH'] = f'{OPENGNSYS}/lib/python3'
-sys.path.insert (0, os.environ['PYTHONPATH'])
+libs = [f'{OPENGNSYS}/lib/python3', '/usr/share/opengnsys-modules/python3/dist-packages']
+os.environ['PYTHONPATH'] = ':'.join (libs)
+for l in libs: sys.path.insert (0, l)
 ## end
 
 import subprocess

ogclient/interfaceAdm/CrearImagenGit

@@ -4,7 +4,6 @@ import resource
 import logging
 
 
-import NetLib
 import ogGlobals
 import SystemLib
 import DiskLib
@@ -35,7 +34,7 @@ class OgLogger(logging.StreamHandler):
 
 
 
-def create_image(disk_num, partition_num, repo, image_name, tagName):
+def create_image(disk_num, partition_num, repo, image_name):
 
     ntfs_impl = NTFSImplementation.NTFS3G
     og_git = OpengnsysGitLibrary(ntfs_implementation = ntfs_impl)
@@ -44,8 +43,6 @@ def create_image(disk_num, partition_num, repo, image_name, tagName):
     device = DiskLib.ogDiskToDev(disk_num, partition_num)
     if og_git.initRepo(device, image_name):
         return 0
-        #if tagName:
-        #    og_git.tag(device = device, tagName = tagName, commit = "HEAD", message = "Image created")
     else:
         return 1
 
@@ -63,14 +60,13 @@ def main():
 
 
 
-    if len(sys.argv) != 6:
-        sys.exit(SystemLib.ogRaiseError([], ogGlobals.OG_ERR_FORMAT, "Incorrect number of arguments. Usage: CrearImagenGit disk_num partition_num image_name repo tag"))
+    if len(sys.argv) < 5:
+        sys.exit(SystemLib.ogRaiseError([], ogGlobals.OG_ERR_FORMAT, "Incorrect number of arguments. Usage: CrearImagenGit disk_num partition_num image_name repo"))
 
     # repo - repositorio, ip address. Opcional porque oglive lo recibe como parametro de kernel
-    # tag - tag a crear automaticamente. Opcional, no necesitamos crear un tag siempre.
 
 
-    disk_num, partition_num, image_name, repo, tag = sys.argv[1:6]
+    disk_num, partition_num, image_name, repo = sys.argv[1:5]
 
 
     opengnsys_log_dir = "/opt/opengnsys/log"
@@ -96,7 +92,7 @@ def main():
     logger.info("Starting CrearImagenGit")
 
 
-    retval = create_image(disk_num, partition_num, repo, image_name, tag)
+    retval = create_image(disk_num, partition_num, repo, image_name)
 
 
 

ogclient/interfaceAdm/GetGitData

@@ -23,8 +23,8 @@ ogEcho (['log', 'session'], None, f'{ogGlobals.lang.MSG_INTERFACE_START} {prog}
 mntpt = ogMount (dsk, par)
 git_dir = f'{mntpt}/.git'
 
-if not os.path.isdir (git_dir):
-    ogRaiseError (['log', 'session'], ogGlobals.OG_ERR_FORMAT, f'"{git_dir}" no existe o no es un directorio')
+if not os.path.exists (git_dir):
+    ogRaiseError (['log', 'session'], ogGlobals.OG_ERR_FORMAT, f'"{git_dir}" no existe')
     sys.exit (1)
 
 p = subprocess.run (['git', '--git-dir', git_dir, 'branch', '--show-current'], capture_output=True, text=True)

ogclient/interfaceAdm/InventarioSoftware

@@ -27,12 +27,18 @@ if __name__ == "__main__":
 # Registro de inicio de ejecución
     ogEcho (['log', 'session'], None, f'{ogGlobals.lang.MSG_INTERFACE_START} {prog} {disk} {par} {dest_file}')
 
-    listsi_out = subprocess.run ([f'{ogGlobals.OGSCRIPTS}/listSoftwareInfo', disk, par], capture_output=True, text=True).stdout
+    p = subprocess.run ([f'{ogGlobals.OGSCRIPTS}/listSoftwareInfo', disk, par], capture_output=True, text=True)
+    listsi_out = p.stdout
+    listsi_err = p.stderr
     if listsi_out:
         file = listsi_out.splitlines()[0]
     else:
-        ogRaiseError ([], ogGlobals.OG_ERR_GENERIC, 'listSoftwareInfo failed')
-        sys.exit (1)
+        if listsi_err:
+            ogRaiseError ([], ogGlobals.OG_ERR_FORMAT, listsi_err)
+            sys.exit (1)
+        else:
+            ogRaiseError ([], ogGlobals.OG_ERR_FORMAT, 'listSoftwareInfo failed')
+            sys.exit (1)
 
     shutil.copy (file, dest_file)
 

ogclient/lib/python3/GitLib/__init__.py

@@ -10,7 +10,6 @@
 #
 import os
 import sys
-sys.path.insert(0, "/usr/share/opengnsys-modules/python3/dist-packages")
 
 
 import shutil

ogclient/lib/python3/InitLib.py

@@ -95,7 +95,8 @@ def clean_esp():
         if esp:
             esp_disk, esp_par = esp.split()
             mntpt = ogMount (esp_disk, esp_par)
-            os.unlink (f'{mntpt}/boot/grub/grub.cfg')
+            if os.path.exists (f'{mntpt}/boot/grub/grub.cfg'):
+                os.unlink (f'{mntpt}/boot/grub/grub.cfg')
             ogUnmount (esp_disk, esp_par)
 
 def fileslinks():
@@ -227,7 +228,7 @@ def filebeat():
 
     os.chmod (F, 0o600)
     subprocess.run (['sed', '-i',
-        '-e', f's/__OGLOG_IP/{oglog}/g',
+        '-e', f's/__OGLOG_IP__/{oglog}/g',
         '-e', f's/__OGLOG_PORT__/{OPENSEARCH_PORT}/g',
         '-e', f's/__OPENSEARCH_PASSWORD__/{PASS}/g',
         F

ogclient/lib/python3/NetLib.py

@@ -160,7 +160,7 @@ def ogGetIpAddress():
         addrs = e['addr_info']
         for a in addrs:
             if 'inet' != a['family']: continue
-            addresses.append ({ 'local': a['local'], 'prefixlen': a['prefixlen'] })
+            addresses.append (a['local'])
 
     if 1 != len (addresses):
         raise Exception ('more than one local IP address found')