Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2014-08-11 10:07:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "salt" Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2014-08-05 10:24:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.salt.new/salt.changes 2014-08-11 10:07:23.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 6 06:36:02 UTC 2014 - [email protected] + +- Ensure salt uses systemd for services on SLES + + Added disable-service-py-for-suse-family.patch + +------------------------------------------------------------------- New: ---- disable-service-py-for-suse-family.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.aposfL/_old 2014-08-11 10:07:24.000000000 +0200 +++ /var/tmp/diff_new_pack.aposfL/_new 2014-08-11 10:07:24.000000000 +0200 @@ -32,6 +32,8 @@ Patch3: pass-all-systemd-list-units.patch # PATCH-FIX-OPENSUSE use-forking-daemon.patch [email protected] -- We don't have python-systemd, so notify can't work Patch4: use-forking-daemon.patch +# PATCH-FIX-UPSTREAM disable-service-py-for-suse-family.patch [email protected] -- ensure salt uses systemd for services on SLES +Patch5: disable-service-py-for-suse-family.patch #for building BuildRequires: fdupes @@ -234,6 +236,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build python setup.py build ++++++ disable-service-py-for-suse-family.patch ++++++ >From 372d68180c35213de57b0b0b5a4773ffa92a4e5e Mon Sep 17 00:00:00 2001 From: Tim Serong <[email protected]> Date: Wed, 6 Aug 2014 16:33:07 +1000 Subject: [PATCH] Disable service.py for entire SUSE family >= 12 Checking os_family allows us to pick up openSUSE and SUSE Linux Enterprise, rather than just checking for os == openSUSE. --- salt/modules/service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/modules/service.py b/salt/modules/service.py index cfafe24..d581916 100644 --- a/salt/modules/service.py +++ b/salt/modules/service.py @@ -47,7 +47,7 @@ def __virtual__(): if __grains__['kernel'] != 'Linux': return False # Suse >=12.0 uses systemd - if __grains__.get('os', '') == 'openSUSE': + if __grains__.get('os_family', '') == 'Suse': try: if int(__grains__.get('osrelease', '').split('.')[0]) >= 12: return False -- 2.0.3 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
