From 02fe0939f2406def023e6d6ed1957aaee7dc946c6b2ce1067175420917a47d02 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Tue, 8 Aug 2017 12:42:26 +0000 Subject: [PATCH 1/2] Accepting request 515066 from home:dmulder:branches:network:samba:STABLE Fix duplicate CTDB_LOGGING params when downgraded and upgraded again (bsc#1048339) OBS-URL: https://build.opensuse.org/request/show/515066 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=568 --- samba.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/samba.spec b/samba.spec index 11cd528..f1ef370 100644 --- a/samba.spec +++ b/samba.spec @@ -1628,7 +1628,8 @@ fi %service_add_pre ctdb.service %endif if [ -e %{_sysconfdir}/sysconfig/ctdb ] ; then - sed -i s/CTDB_LOGFILE=/CTDB_LOGGING=file:/g %{_sysconfdir}/sysconfig/ctdb + grep CTDB_LOGGING %{_sysconfdir}/sysconfig/ctdb >/dev/null 2>&1 || + sed -i s/CTDB_LOGFILE=/CTDB_LOGGING=file:/g %{_sysconfdir}/sysconfig/ctdb fi %preun -n ctdb From af6fd2963a4332eb715fc56b288cc68e27606306c0409b751700b5ebcbbecea4 Mon Sep 17 00:00:00 2001 From: David Mulder Date: Tue, 8 Aug 2017 13:01:02 +0000 Subject: [PATCH 2/2] - Fix duplicate CTDB_LOGGING params when downgraded and upgraded again; (bsc#1048339). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=569 --- samba.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/samba.changes b/samba.changes index 28630eb..8316e21 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 8 12:58:56 UTC 2017 - dmulder@suse.com + +- Fix duplicate CTDB_LOGGING params when downgraded and upgraded again; + (bsc#1048339). + ------------------------------------------------------------------- Mon Jul 24 13:34:55 UTC 2017 - ddiss@suse.com