commit ee3bbe4c7c47837a5f852f1280e0706608ba2e28
Author: Elan Ruusamäe <[email protected]>
Date: Tue Mar 20 11:40:18 2018 +0200
1.731: fixed %webapp_register -f to work in triggerpostun
$ if true || false && false; then echo MATCH; else echo NO MATCH; fi
NO MATCH
rpm-build-macros.spec | 2 +-
rpm.macros | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index a7a50e7..ca0da9f 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define rpm_macros_rev 1.730
+%define rpm_macros_rev 1.731
%define find_lang_rev 1.40
Summary: PLD Linux RPM build macros
Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
diff --git a/rpm.macros b/rpm.macros
index f146434..95c28d6 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -1463,7 +1463,7 @@ fi;
#
%webapp_register(f) \
%{?debug:set -x; echo "webapp_register: %{name}-%{version}-%{release} 1:[$1];
2:[$2]"} \
-if [ -n "%{-f:1}" ] || [ "$1" = "1" ] && [ "$2" = "1" ]; then\
+if [ -n "%{-f:1}" ] || ([ "$1" = "1" ] && [ "$2" = "1" ]); then\
/usr/sbin/webapp register %1 %2\
fi\
# reload webserver if the config symlink is there and skip reload if webserver
is upgraded\
@@ -1478,7 +1478,7 @@ fi\
%webapp_unregister(f) \
%{?debug:set -x; echo "webapp_unregister: %{name}-%{version}-%{release}:
1:[$1]; 2:[$2]"} \
# remove link if either of the packages are gone \
-if [ -n "%{-f:1}" ] || [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L
/etc/%1/webapps.d/%(echo "%2" | tr '/' '-').conf ]; then \
+if [ -n "%{-f:1}" ] || ([ "$1" = "0" ] || [ "$2" = "0" ] && [ -L
/etc/%1/webapps.d/%(echo "%2" | tr '/' '-').conf ]); then \
/usr/sbin/webapp unregister %1 %2\
%{expand:%service -q %%1 reload}\
fi \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/ee3bbe4c7c47837a5f852f1280e0706608ba2e28
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
