From ac9ab7e8f5ce0f4fa6169ddd4fd0f014157cb370 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Mon, 19 May 2025 11:05:43 +0200 Subject: [PATCH] refs #2036 downgrade to qt4 browser again --- CHANGELOG.md | 6 ++++++ linux/debian/changelog | 6 ++++++ src/VERSION | 2 +- src/opengnsys/workers/oglive_worker.py | 8 +++----- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbe9efe..59ebbd1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,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). +## [5.5.0] - 2025-05-19 + +### Changed + +- Revert to the QT4 browser again + ## [5.4.0] - 2025-05-19 ### Changed diff --git a/linux/debian/changelog b/linux/debian/changelog index 258d25a..b00af66 100644 --- a/linux/debian/changelog +++ b/linux/debian/changelog @@ -1,3 +1,9 @@ +ogagent (5.5.0-1) stable; urgency=medium + + * Return to the QT4 browser again + + -- OpenGnsys developers Mon, 19 May 2025 10:57:37 +0200 + ogagent (5.4.0-1) stable; urgency=medium * Disable TLS on request diff --git a/src/VERSION b/src/VERSION index 8a30e8f..d50359d 100644 --- a/src/VERSION +++ b/src/VERSION @@ -1 +1 @@ -5.4.0 +5.5.0 diff --git a/src/opengnsys/workers/oglive_worker.py b/src/opengnsys/workers/oglive_worker.py index 2ee36aa..f2f25f1 100644 --- a/src/opengnsys/workers/oglive_worker.py +++ b/src/opengnsys/workers/oglive_worker.py @@ -369,14 +369,12 @@ class ogLiveWorker(ServerWorker): def cargaPaginaWeb (self, url=None): if (not url): url = self.urlMenu - os.system ('pkill -f -9 browser') - os.system ('pkill -f -9 OGBrowser') - os.system ('pkill -f -9 QtWebEngineProcess') + os.system ('pkill -9 browser') - p = subprocess.Popen (['/usr/bin/launch_browser', url]) + p = subprocess.Popen (['/usr/bin/browser', '-qws', url]) try: p.wait (2) ## if the process dies before 2 seconds... - logger.error ('Error al ejecutar OGBrowser, return code "{}"'.format (p.returncode)) + logger.error ('Error al ejecutar browser, return code "{}"'.format (p.returncode)) return False except subprocess.TimeoutExpired: pass