rpm/salt
SHA256
1
0
Fork 0
forked from pool/salt
Code Pull Requests Activity

osc copypac from project:systemsmanagement:saltstack:testing package:salt revision:343

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=170
This commit is contained in:
Jochen Breuer 2020-05-29 07:46:17 +00:00 committed by Git OBS Bridge
parent a3c40ef813
commit 42577176f6
8 changed files with 64 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_lastrevision
View File

@ -1 +1 @@
1a82ea698915484eb266be064a7ddaf207b4b1e9
fb1212e6b081322ac0e32bb841293b347bcb4b62

6
_service
View File

@ -3,7 +3,7 @@
<param name="url">https://github.com/openSUSE/salt-packaging.git</param>
<param name="subdir">salt</param>
<param name="filename">package</param>
<param name="revision">3000.2</param>
<param name="revision">3000.3</param>
<param name="scm">git</param>
</service>
<service name="extract_file" mode="disabled">
@ -12,8 +12,8 @@
</service>
<service name="download_url" mode="disabled">
<param name="host">codeload.github.com</param>
<param name="path">openSUSE/salt/tar.gz/v3000.2-suse</param>
<param name="filename">v3000.2.tar.gz</param>
<param name="path">openSUSE/salt/tar.gz/v3000.3-suse</param>
<param name="filename">v3000.3.tar.gz</param>
</service>
<service name="update_changelog" mode="disabled"></service>
</services>

27
add-publish_batch-to-clearfuncs-exposed-methods.patch Normal file
View File

@ -0,0 +1,27 @@
From da936daeebd701e147707ad814c07bfc259d4be4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
<psuarezhernandez@suse.com>
Date: Thu, 28 May 2020 09:37:08 +0100
Subject: [PATCH] Add publish_batch to ClearFuncs exposed methods
---
salt/master.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/salt/master.py b/salt/master.py
index 485c16029b12fc38fc88b54aba95f03aa95d14ee..7d7a094a1a212180bfb294df3ad8b38477981450 100644
--- a/salt/master.py
+++ b/salt/master.py
@@ -1906,7 +1906,7 @@ class ClearFuncs(TransportMethods):
# These methods will be exposed to the transport layer by
# MWorker._handle_clear
expose_methods = (
- 'ping', 'publish', 'get_token', 'mk_token', 'wheel', 'runner',
+ 'ping', 'publish', 'publish_batch', 'get_token', 'mk_token', 'wheel', 'runner',
)
# The ClearFuncs object encapsulates the functions that can be executed in
--
2.23.0

28
fix-typo-in-minion_runner-for-aesfuncs-exposed-metho.patch
View File

@ -1,28 +0,0 @@
From a5ef829408685d9e65eaa24bba40d221adffaa95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
<psuarezhernandez@suse.com>
Date: Thu, 30 Apr 2020 14:15:00 +0100
Subject: [PATCH] Fix typo in 'minion_runner' for AESFuncs exposed
methods
---
salt/master.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/salt/master.py b/salt/master.py
index 997fd643b59aa133152b0280f408fcb41afe02b1..5a6ba44f11cf7a3ad3a4477524ed468dbba43993 100644
--- a/salt/master.py
+++ b/salt/master.py
@@ -1178,7 +1178,7 @@ class AESFuncs(TransportMethods):
'verify_minion', '_master_tops', '_ext_nodes', '_master_opts',
'_mine_get', '_mine', '_mine_delete', '_mine_flush', '_file_recv',
'_pillar', '_minion_event', '_handle_minion_event', '_return',
- '_syndic_return', '_minion_runner', 'pub_ret', 'minion_pub',
+ '_syndic_return', 'minion_runner', 'pub_ret', 'minion_pub',
'minion_publish', 'revoke_auth', 'run_func', '_serve_file',
'_file_find', '_file_hash', '_file_find_and_stat', '_file_list',
'_file_list_emptydirs', '_dir_list', '_symlink_list', '_file_envs',
--
2.23.0

17
salt.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Thu May 28 08:51:19 UTC 2020 - Pablo Suárez Hernández <pablo.suarezhernandez@suse.com>
- Add publish_batch to ClearFuncs exposed methods
- Added:
* add-publish_batch-to-clearfuncs-exposed-methods.patch
-------------------------------------------------------------------
Tue May 26 14:37:09 UTC 2020 - Pablo Suárez Hernández <pablo.suarezhernandez@suse.com>
- Update to Salt release version 3000.3
See release notes: https://docs.saltstack.com/en/latest/topics/releases/3000.3.html
- Removed:
* fix-typo-in-minion_runner-for-aesfuncs-exposed-metho.patch
-------------------------------------------------------------------
Thu May 21 08:35:30 UTC 2020 - Pablo Suárez Hernández <pablo.suarezhernandez@suse.com>

27
salt.spec
View File

@ -63,7 +63,7 @@
%bcond_with builddocs
Name: salt
Version: 3000.2
Version: 3000.3
Release: 0
Summary: A parallel remote execution system
License: Apache-2.0
@ -298,26 +298,26 @@ Patch106: adds-explicit-type-cast-for-port.patch
Patch107: fixed-bug-lvm-has-no-parttion-type.-the-scipt-later-.patch
# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/commit/4f80e969e31247a4755d98d25f29b5d8b1b916c3
Patch108: remove-vendored-backports-abc-from-requirements.patch
# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/commit/a5ef829408685d9e65eaa24bba40d221adffaa95
Patch109: fix-typo-in-minion_runner-for-aesfuncs-exposed-metho.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/57119
Patch110: make-lazyloader.__init__-call-to-_refresh_file_mappi.patch
Patch109: make-lazyloader.__init__-call-to-_refresh_file_mappi.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/57123
Patch111: prevent-logging-deadlock-on-salt-api-subprocesses-bs.patch
Patch110: prevent-logging-deadlock-on-salt-api-subprocesses-bs.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/57122
Patch112: msgpack-support-versions-1.0.0.patch
Patch111: msgpack-support-versions-1.0.0.patch
# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/235
Patch113: python3.8-compatibility-pr-s-235.patch
Patch112: python3.8-compatibility-pr-s-235.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/56419
Patch114: option-to-en-disable-force-refresh-in-zypper-215.patch
Patch113: option-to-en-disable-force-refresh-in-zypper-215.patch
# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/229
Patch115: fix-a-test-and-some-variable-names-229.patch
Patch114: fix-a-test-and-some-variable-names-229.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/56439
Patch116: add-docker-logout-237.patch
Patch115: add-docker-logout-237.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/56595
Patch117: fix-for-return-value-ret-vs-return-in-batch-mode.patch
Patch116: fix-for-return-value-ret-vs-return-in-batch-mode.patch
# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/57392
Patch118: zypperpkg-filter-patterns-that-start-with-dot-244.patch
Patch117: zypperpkg-filter-patterns-that-start-with-dot-244.patch
# PATCH-FIX_OPENSUSE: hhttps://github.com/openSUSE/salt/commit/da936daeebd701e147707ad814c07bfc259d4be
Patch118: add-publish_batch-to-clearfuncs-exposed-methods.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: logrotate
@ -821,8 +821,7 @@ This package adds the standalone configuration for the Salt master in order to m
%prep
# %setup -q -n salt-%{version}
%setup -q -n salt-3000.2-suse
%setup -q -n salt-%{version}-suse
cp %{S:1} .
cp %{S:5} ./.travis.yml
%patch1 -p1

3
v3000.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:076fc5752da6a0a5cfcc0ca6428664a89611a4a41b2757dba9ecf469c3e8a0d1
size 15253221

3
v3000.3.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:923b9c43c53a9ac290dc3e2176d998b1f5e09742e6ff26a1a9d7275db1cee4ad
size 15256160