Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2021-10-04 18:39:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "salt" Mon Oct 4 18:39:27 2021 rev:120 rq:922525 version:3003.3 Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2021-09-30 23:43:16.744461391 +0200 +++ /work/SRC/openSUSE:Factory/.salt.new.2443/salt.changes 2021-10-04 18:40:36.922120914 +0200 @@ -1,0 +2,8 @@ +Thu Sep 30 10:49:56 UTC 2021 - Pablo Su??rez Hern??ndez <pablo.suarezhernan...@suse.com> + +- Do not break master_tops for minion with version lower to 3003 + +- Added: + * do-not-break-master_tops-for-minion-with-version-low.patch + +------------------------------------------------------------------- New: ---- do-not-break-master_tops-for-minion-with-version-low.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.8rKiUW/_old 2021-10-04 18:40:38.246123065 +0200 +++ /var/tmp/diff_new_pack.8rKiUW/_new 2021-10-04 18:40:38.250123072 +0200 @@ -284,6 +284,8 @@ Patch68: templates-move-the-globals-up-to-the-environment-jin.patch # PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/59777 Patch69: 3003.3-postgresql-json-support-in-pillar-423.patch +# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/60980 +Patch70: do-not-break-master_tops-for-minion-with-version-low.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -768,6 +770,7 @@ %patch67 -p1 %patch68 -p1 %patch69 -p1 +%patch70 -p1 %build # Putting /usr/bin at the front of $PATH is needed for RHEL/RES 7. Without this ++++++ _lastrevision ++++++ --- /var/tmp/diff_new_pack.8rKiUW/_old 2021-10-04 18:40:38.302123156 +0200 +++ /var/tmp/diff_new_pack.8rKiUW/_new 2021-10-04 18:40:38.306123163 +0200 @@ -1 +1 @@ -deacfe2304a0b9f34a9130b61bd69dea851962a7 \ No newline at end of file +0f00e37ce7f38b6d92b7a2b04cb2faa03098b0fc \ No newline at end of file ++++++ do-not-break-master_tops-for-minion-with-version-low.patch ++++++ >From a4412799453bf967aa14b93660bfc70f94e11a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= <psuarezhernan...@suse.com> Date: Thu, 30 Sep 2021 11:06:09 +0100 Subject: [PATCH] Do not break master_tops for minion with version lower to 3003 --- salt/master.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/salt/master.py b/salt/master.py index 1bfd278b31..2c5739cc90 100644 --- a/salt/master.py +++ b/salt/master.py @@ -1234,6 +1234,7 @@ class AESFuncs(TransportMethods): "_dir_list", "_symlink_list", "_file_envs", + "_ext_nodes", ) def __init__(self, opts): @@ -1433,6 +1434,9 @@ class AESFuncs(TransportMethods): return {} return self.masterapi._master_tops(load, skip_verify=True) + # Needed so older minions can request master_tops + _ext_nodes = _master_tops + def _master_opts(self, load): """ Return the master options to the minion -- 2.33.0
