From 531c0efc1bac0cb6ee66d91856c924430064ab31 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 22 Dec 2005 14:21:34 +0000 Subject: [PATCH] - add force (-f) option to %webapp_unregister Changed files: rpm.macros -> 1.275 --- rpm.macros | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rpm.macros b/rpm.macros index f84de90..f2dc07b 100644 --- a/rpm.macros +++ b/rpm.macros @@ -731,11 +731,11 @@ fi\ # Remove package's config from webserver webapps dir. # Usage: -# %webapp_register WEBSERVER WEBAPP -%webapp_unregister() \ +# %webapp_register [-f] WEBSERVER WEBAPP +%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 [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L /etc/%1/webapps.d/%2.conf ]; then \ +if [ -n "%{-f:1}" ] || [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L /etc/%1/webapps.d/%2.conf ]; then \ /usr/sbin/webapp unregister %1 %2\ if [ -f /var/lock/subsys/%1 ]; then \ /etc/rc.d/init.d/%1 reload 1>&2 \ -- 2.43.0