From 78f27b724e46e58d181c61dd8533314a4ca1c741 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Wed, 25 Jun 2025 11:21:53 +0200 Subject: [PATCH] refs #2316 prevent Configurar.py from messing with the browser --- CHANGELOG.md | 6 ++++++ ogclient/interfaceAdm/Configurar.py | 9 --------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28f5fc8..77a07ff 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.21.0] - 2025-06-25 + +### Changed + +- Prevent Configurar.py from messing with the browser + ## [0.20.3] - 2025-06-25 ### Fixed diff --git a/ogclient/interfaceAdm/Configurar.py b/ogclient/interfaceAdm/Configurar.py index 39f2308..0363fd0 100755 --- a/ogclient/interfaceAdm/Configurar.py +++ b/ogclient/interfaceAdm/Configurar.py @@ -47,9 +47,6 @@ prog = os.path.basename(__name__) #param = ''.join(sys.argv[2:]).replace(' ', '').replace('\t', '') param = sys.argv[2] -# Activa navegador para ver progreso -coproc = subprocess.Popen (['/opt/opengnsys/bin/browser', '-qws', 'http://localhost/cgi-bin/httpd-log.sh']) - # Leer los dos bloques de parámetros, separados por '!'. tbprm = param.split ('!') pparam = tbprm[0] # General disk parameters @@ -71,7 +68,6 @@ for item in tbprm: # Error si no se define el parámetro de disco (dis). if dis is None: - coproc.kill() sys.exit (ogGlobals.OG_ERR_FORMAT) # Toma valores de distribución de particiones, separados por "%". @@ -107,7 +103,6 @@ for item in tbprm: if tam is None: missing_params.append ('tam') if missing_params: print (f'partition data ({item}) missing required parameters ({' '.join (missing_params)})') - coproc.kill() sys.exit (1) # Componer datos de particionado. @@ -153,7 +148,6 @@ if 'CACHE' in sparam: rc = SystemLib.ogExecAndLog ('command', [f'{ogGlobals.OGSCRIPTS}/initCache', tch]) if not rc: SystemLib.ogRaiseError (['log', 'session'], ogGlobals.OG_ERR_CACHE, f'initCache failed') - coproc.kill() sys.exit (1) # Definir particionado. @@ -161,7 +155,6 @@ SystemLib.ogEcho (['session', 'log'], None, f'[50] {ogGlobals.lang.MSG_HELP_ogCr SystemLib.ogEcho (['session', 'log'], None, f' ogCreatePartitions {dis} {' '.join (tbp)}') res = SystemLib.ogExecAndLog ('command', [f'{ogGlobals.OGPYFUNCS}/ogCreatePartitions', str(dis)] + tbp) if not res: - coproc.kill() SystemLib.ogRaiseError (['log', 'session'], ogGlobals.OG_ERR_GENERIC, f'ogCreatePartitions {dis} {' '.join (tbp)}') sys.exit (1) SystemLib.ogExecAndLog ('command', [f'{ogGlobals.OGPYFUNCS}/ogUpdatePartitionTable']) @@ -177,7 +170,6 @@ for p in range (1, maxp+1): retval = SystemLib.ogExecAndLog ('command', [f'{ogGlobals.OGPYFUNCS}/ogFormatCache']) else: SystemLib.ogEcho (['session', 'log'], None, f' ogFormatFs {dis} {p} {tbf[p]}') - coproc.kill() retval = SystemLib.ogExecAndLog ('command', [f'{ogGlobals.OGPYFUNCS}/ogFormatFs', str(dis), str(p), tbf[p]]) if not retval: SystemLib.ogRaiseError (['session', 'log'], ogGlobals.OG_ERR_GENERIC, f'ogFormatFs {dis} {p} {tbf[p]}') @@ -190,5 +182,4 @@ SystemLib.ogEcho (['session', 'log'], None, f'{ogGlobals.lang.MSG_INTERFACE_END} # Retorno #___________________________________________________________________ -coproc.kill() sys.exit (0)