commit ed9e6b2216e9b701461ecb12e9c5fadce8c92abb
Author: Elan Ruusamäe <[email protected]>
Date:   Sat May 2 22:53:02 2015 +0300

    handle trigger if no matching glob

 apache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/apache.spec b/apache.spec
index b9e9565..4f959fd 100644
--- a/apache.spec
+++ b/apache.spec
@@ -2997,7 +2997,7 @@ sed -i -e '
        s,^LockFile /var/run/httpd/accept.lock,Mutex file:/var/run/httpd/,g
 ' /etc/httpd/conf.d/10_mpm.conf
 
-%triggerpostun base -- %{name}-base < 2.4.12-3.15
+%triggerpostun base -- %{name}-base < 2.4.12-3.28
 # skip *this* trigger on downgrade
 if [ $1 -le 1 ]; then
        exit 0
@@ -3010,6 +3010,9 @@ fi
 od=%{_sysconfdir}/conf.d
 nd=%{_sysconfdir}/conf.modules.d
 for of in $od/??_*.conf.rpmsave; do
+       # skip if glob did not expand
+       test -f "$of" || continue
+
        # first check matching conf.d file
        bn=${of##*/??_}
        bn=${bn%.rpmsave}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/apache.git/commitdiff/ed9e6b2216e9b701461ecb12e9c5fadce8c92abb

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to