From 951f29769b819ba47b3f3545ae07d00b5da1eeee Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 26 Nov 2021 10:31:16 +0100
Subject: [PATCH 1/2] allow online patches in decimal format
---
pandora_console/godmode/um_client/lib/UpdateManager/Client.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pandora_console/godmode/um_client/lib/UpdateManager/Client.php b/pandora_console/godmode/um_client/lib/UpdateManager/Client.php
index 27425f535f..bb62d63959 100644
--- a/pandora_console/godmode/um_client/lib/UpdateManager/Client.php
+++ b/pandora_console/godmode/um_client/lib/UpdateManager/Client.php
@@ -835,7 +835,7 @@ class Client
function ($carry, $item) {
$matches = [];
if (is_array($item) !== true
- && preg_match('/(\d+)\.tar/', $item, $matches) > 0
+ && preg_match('/([\d\.\d]+?)\.tar/', $item, $matches) > 0
) {
$carry[] = [
'version' => $matches[1],
From eba4a1b0db1580e8cd66c48d25232f41a79046dd Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 26 Nov 2021 12:36:49 +0000
Subject: [PATCH 2/2] repoDisk patch (MC => Nodes)
---
.../godmode/um_client/lib/UpdateManager/RepoDisk.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pandora_console/godmode/um_client/lib/UpdateManager/RepoDisk.php b/pandora_console/godmode/um_client/lib/UpdateManager/RepoDisk.php
index bb6368a823..426cf4be4e 100644
--- a/pandora_console/godmode/um_client/lib/UpdateManager/RepoDisk.php
+++ b/pandora_console/godmode/um_client/lib/UpdateManager/RepoDisk.php
@@ -75,8 +75,8 @@ class RepoDisk extends Repo
$this->files = [];
while ($file_name = readdir($dh)) {
// Files must contain a version number.
- if (preg_match('/(\d+)\_x86_64.'.$this->extension.'$/', $file_name, $utimestamp) === 1
- || preg_match('/(\d+)\.'.$this->extension.'$/', $file_name, $utimestamp) === 1
+ if (preg_match('/([\d\.]+?)\_x86_64.'.$this->extension.'$/', $file_name, $utimestamp) === 1
+ || preg_match('/([\d\.]+?)\.'.$this->extension.'$/', $file_name, $utimestamp) === 1
) {
// Add the file to the repository.
$this->files[$utimestamp[1]] = $file_name;