From 2f304f9250b0d2d75dae6f4195af8f5abf7e9b5d Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 23 Feb 2022 10:53:33 +0100
Subject: [PATCH] sync with updatemanager repo

---
 .../godmode/um_client/lib/UpdateManager/Client.php           | 5 ++++-
 pandora_console/godmode/um_client/tests/ClientTest.php       | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/um_client/lib/UpdateManager/Client.php b/pandora_console/godmode/um_client/lib/UpdateManager/Client.php
index bb62d63959..b048adef34 100644
--- a/pandora_console/godmode/um_client/lib/UpdateManager/Client.php
+++ b/pandora_console/godmode/um_client/lib/UpdateManager/Client.php
@@ -1582,7 +1582,10 @@ class Client
                 ) {
                     // When PharData failes because of no space left on device
                     // a PHP Notice is received instead of a PharData\Exception.
-                    throw new \Exception(error_get_last());
+                    $err = error_get_last();
+                    if ($err !== null) {
+                        throw new \Exception($err['message']);
+                    }
                 }
             } catch (\Exception $e) {
                 error_reporting($er);
diff --git a/pandora_console/godmode/um_client/tests/ClientTest.php b/pandora_console/godmode/um_client/tests/ClientTest.php
index 131d3f80ad..8563f926c0 100644
--- a/pandora_console/godmode/um_client/tests/ClientTest.php
+++ b/pandora_console/godmode/um_client/tests/ClientTest.php
@@ -181,7 +181,7 @@ class ClientTest extends \PHPUnit\Framework\TestCase
     {
         // Load the conf.
         try {
-            $this->conf = new \Config('client/conf/test.ini');
+            $this->conf = new \Config(__DIR__.'/../conf/test.ini');
         } catch (\Exception $e) {
             $this->fail($e->getMessage());
         }