Attachment 9709 Details for Bug 34444 – qa-feedback.diff

[patch] qa-feedback.diff

qa-feedback.diff (text/plain), 1.75 KB, created by Arvid Requate on 2018-10-18 21:50:40 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2018-10-18 21:50:40 CEST

Size: 1.75 KB

patch

obsolete

>diff --git a/base/univention-updater/modules/univention/updater/tools.py b/base/univention-updater/modules/univention/updater/tools.py
>index 8bc9e67b0d..d55d526377 100644
>--- a/base/univention-updater/modules/univention/updater/tools.py
>+++ b/base/univention-updater/modules/univention/updater/tools.py
>@@ -42,6 +42,7 @@ from commands import (
>     cmd_update,
> )
> from errors import (
>+    UpdaterException,
>     CannotResolveComponentServerError,
>     ConfigurationError,
>     DownloadError,
>@@ -1167,10 +1168,10 @@ class UniventionUpdater:
>             stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
>         (stdout, stderr) = p1.communicate()
>         ud.debug(ud.NETWORK, ud.PROCESS, 'check for updates with "dist-upgrade -s", the returncode is %d' % p1.returncode)
>-        if p1.returncode == 100:
>-            print stderr
>         ud.debug(ud.NETWORK, ud.PROCESS, 'stderr=%s' % stderr)
>         ud.debug(ud.NETWORK, ud.INFO, 'stdout=%s' % stdout)
>+        if p1.returncode == 100:
>+            raise UpdaterException(stderr)
> 
>         new_packages = []
>         upgraded_packages = []
>diff --git a/doc/errata/staging/univention-updater.yaml b/doc/errata/staging/univention-updater.yaml
>index 7ff2f0e0b4..47a43a0e40 100644
>--- a/doc/errata/staging/univention-updater.yaml
>+++ b/doc/errata/staging/univention-updater.yaml
>@@ -3,8 +3,9 @@ release: "4.3"
> version: [2]
> scope: ucs_4.3-0-errata4.3-2
> src: univention-updater
>-fix: 13.0.1-61A~4.3.0.201810120915 
>+fix: 13.0.1-61A~4.3.0.201810120915
> desc: |
>  This update addresses the following issue(s):
>- * Fixes non existing error message in univention-updater
>+ * In case univention-updater detects a problem while checking for updatable
>+   packages, it now prints the error message provided by apt-get.
> bug: [34444]

Actions: View | Diff

Attachments on bug 34444: 6753 | 9709