SHA256
1
0
forked from pool/salt

Accepting request 832998 from systemsmanagement:saltstack

- Reintroduces the patches from
  opensuse-3000.2-virt-backports-236.patch coming from Salt 3001
- Added:
  * backport-virt-patches-from-3001-256.patch

- Adding missing virt backports to 3000.3
- Added:
  * opensuse-3000.2-virt-backports-236-257.patch

- Do not raise StreamClosedError traceback but only log it (bsc#1175549)
- Added:
  * do-not-raise-streamclosederror-traceback-but-only-lo.patch

- Take care of failed, skipped and unreachable tasks and propagate "retcode" (bsc#1173911) (bsc#1173909)
- Added:
  * ansiblegate-take-care-of-failed-skipped-and-unreacha.patch

OBS-URL: https://build.opensuse.org/request/show/832998
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/salt?expand=0&rev=108
This commit is contained in:
Dominique Leuenberger 2020-09-10 20:48:11 +00:00 committed by Git OBS Bridge
commit 26c563e740
7 changed files with 30143 additions and 1 deletions

View File

@ -1 +1 @@
3c85bd3a365dd15aae8f08c2cb95f16db987fe7b b193a24466b79150ec137a7e4cc144362b588ef0

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,27 @@
From b651c2cd8b719a72e66b63afd9061739624763e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
<psuarezhernandez@suse.com>
Date: Wed, 26 Aug 2020 10:24:58 +0100
Subject: [PATCH] Do not raise StreamClosedError traceback but only log
it (bsc#1175549)
---
salt/transport/ipc.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/salt/transport/ipc.py b/salt/transport/ipc.py
index 33ee3d4182..624eca5a9c 100644
--- a/salt/transport/ipc.py
+++ b/salt/transport/ipc.py
@@ -667,7 +667,6 @@ class IPCMessageSubscriber(IPCClient):
except StreamClosedError as exc:
log.trace('Subscriber disconnected from IPC %s', self.socket_path)
self._read_stream_future = None
- exc_to_raise = exc
except Exception as exc: # pylint: disable=broad-except
log.error('Exception occurred in Subscriber while handling stream: %s', exc)
self._read_stream_future = None
--
2.28.0

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,36 @@
-------------------------------------------------------------------
Tue Sep 8 12:59:11 UTC 2020 - Jochen Breuer <jbreuer@suse.de>
- Reintroduces the patches from
opensuse-3000.2-virt-backports-236.patch coming from Salt 3001
- Added:
* backport-virt-patches-from-3001-256.patch
-------------------------------------------------------------------
Tue Sep 1 08:42:50 UTC 2020 - Pablo Suárez Hernández <pablo.suarezhernandez@suse.com>
- Adding missing virt backports to 3000.3
- Added:
* opensuse-3000.2-virt-backports-236-257.patch
-------------------------------------------------------------------
Thu Aug 27 14:30:10 UTC 2020 - Pablo Suárez Hernández <pablo.suarezhernandez@suse.com>
- Do not raise StreamClosedError traceback but only log it (bsc#1175549)
- Added:
* do-not-raise-streamclosederror-traceback-but-only-lo.patch
-------------------------------------------------------------------
Mon Aug 17 11:28:26 UTC 2020 - Pablo Suárez Hernández <pablo.suarezhernandez@suse.com>
- Take care of failed, skipped and unreachable tasks and propagate "retcode" (bsc#1173911) (bsc#1173909)
- Added:
* ansiblegate-take-care-of-failed-skipped-and-unreacha.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 10 15:15:31 UTC 2020 - Alexander Graul <alexander.graul@suse.com> Mon Aug 10 15:15:31 UTC 2020 - Alexander Graul <alexander.graul@suse.com>

View File

@ -328,6 +328,14 @@ Patch121: opensuse-3000.3-spacewalk-runner-parse-command-250.patch
Patch122: opensuse-3000-libvirt-engine-fixes-251.patch Patch122: opensuse-3000-libvirt-engine-fixes-251.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/58013 # PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/58013
Patch123: fix-__mount_device-wrapper-254.patch Patch123: fix-__mount_device-wrapper-254.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/58214
Patch124: ansiblegate-take-care-of-failed-skipped-and-unreacha.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/58301
Patch125: do-not-raise-streamclosederror-traceback-but-only-lo.patch
# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/257
Patch126: opensuse-3000.2-virt-backports-236-257.patch
# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/256
Patch127: backport-virt-patches-from-3001-256.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: logrotate BuildRequires: logrotate
@ -957,6 +965,10 @@ cp %{S:5} ./.travis.yml
%patch121 -p1 %patch121 -p1
%patch122 -p1 %patch122 -p1
%patch123 -p1 %patch123 -p1
%patch124 -p1
%patch125 -p1
%patch126 -p1
%patch127 -p1
%build %build
# Putting /usr/bin at the front of $PATH is needed for RHEL/RES 7. Without this # Putting /usr/bin at the front of $PATH is needed for RHEL/RES 7. Without this