diff --git a/_lastrevision b/_lastrevision index 263e7a1..9f38e34 100644 --- a/_lastrevision +++ b/_lastrevision @@ -1 +1 @@ -a2ebac5641c371563ae0521639d3ff2f3aed22c1 \ No newline at end of file +19d76462de94cefedc905c8c5d24635c7c8e9b40 \ No newline at end of file diff --git a/fix-syndic-start-issue.patch b/fix-syndic-start-issue.patch new file mode 100644 index 0000000..7447fc9 --- /dev/null +++ b/fix-syndic-start-issue.patch @@ -0,0 +1,26 @@ +From 0b15fe1ecc3ed468714a5a8d84787ab23ac6144e Mon Sep 17 00:00:00 2001 +From: Mihai Dinca +Date: Thu, 2 May 2019 10:50:17 +0200 +Subject: [PATCH] Fix syndic start issue + +--- + salt/utils/event.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/salt/utils/event.py b/salt/utils/event.py +index d2700bd2a0..160cba9bde 100644 +--- a/salt/utils/event.py ++++ b/salt/utils/event.py +@@ -879,7 +879,7 @@ class SaltEvent(object): + self.subscriber.callbacks.add(event_handler) + if not self.subscriber.reading: + # This will handle reconnects +- self.subscriber.read_async() ++ return self.subscriber.read_async() + + def __del__(self): + # skip exceptions in destroy-- since destroy() doesn't cover interpreter +-- +2.20.1 + + diff --git a/salt.changes b/salt.changes index d9ec62a..0d81950 100644 --- a/salt.changes +++ b/salt.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu May 2 16:18:45 UTC 2019 - mdinca + +- Fix issue preventing syndic to start +- Update year on spec copyright notice + +- Added: + * fix-syndic-start-issue.patch + ------------------------------------------------------------------- Tue Apr 30 11:51:59 UTC 2019 - psuarezhernandez@suse.com diff --git a/salt.spec b/salt.spec index 8555f39..e4f8046 100644 --- a/salt.spec +++ b/salt.spec @@ -1,7 +1,7 @@ # # spec file for package salt # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -167,6 +167,8 @@ Patch49: add-batch_presence_ping_timeout-and-batch_presence_p.patch Patch50: do-not-report-patches-as-installed-when-not-all-the-.patch # PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/52527 Patch51: use-threadpool-from-multiprocessing.pool-to-avoid-le.patch +# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/52519 (partial porting) +Patch52: fix-syndic-start-issue.patch # BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -676,6 +678,7 @@ cp %{S:5} ./.travis.yml %patch49 -p1 %patch50 -p1 %patch51 -p1 +%patch52 -p1 %build %if 0%{?build_py2}