From 4bff73228ebc6711d58f00b4e80a58d937a390b3 Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Jun 06 2017 15:28:29 +0000 Subject: Revise upgrade logic --- diff --git a/389-ds-base.spec b/389-ds-base.spec index 1a6561a..5549bab 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -31,7 +31,7 @@ Summary: 389 Directory Server (base) Name: 389-ds-base Version: 1.3.6.6 -Release: %{?relprefix}2%{?prerel}%{?dist} +Release: %{?relprefix}2%{?prerel}%{?dist}.1 License: GPLv3+ URL: http://www.port389.org Group: System Environment/Daemons @@ -337,11 +337,15 @@ if ! getent passwd $USERNAME >/dev/null ; then fi fi -echo looking for services in %{_sysconfdir}/systemd/system/%{groupname}.wants/* >> $output 2>&1 || : -for service in %{_sysconfdir}/systemd/system/%{groupname}.wants/* ; do - if [ ! -f "$service" ] ; then continue ; fi # in case nothing matches - inst=`echo $service | sed -e 's,%{_sysconfdir}/systemd/system/%{groupname}.wants/,,'` - echo found instance $inst - getting status >> $output 2>&1 || : +echo looking for instances in %{_sysconfdir}/%{pkgname} > $output 2>&1 || : +instbase="%{_sysconfdir}/%{pkgname}" +for dir in $instbase/slapd-* ; do + echo dir = $dir >> $output 2>&1 || : + if [ ! -d "$dir" ] ; then continue ; fi + case "$dir" in *.removed) continue ;; esac + basename=`basename $dir` + inst="%{pkgname}@`echo $basename | sed -e 's/slapd-//g'`" + echo found instance $inst - getting status >> $output 2>&1 || : if /bin/systemctl -q is-active $inst ; then echo instance $inst is running >> $output 2>&1 || : instances="$instances $inst" @@ -465,6 +469,9 @@ fi %{python3_sitelib}/* %changelog +* Tue Jun 6 2017 Mark Reynolds - 1.3.6.6-2.1 +- Revise upgrade logic + * Thu May 25 2017 Charalampos Stratakis - 1.3.6.6-2 - Bump verstion to 1.3.6.6-2 - Ensure the binaries are pointing to the Python 3 interpreter (rhbz#1244234)