rpms/zabbix/devel zabbix.spec,1.38,1.39

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/zabbix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25682

Modified Files:
	zabbix.spec 
Log Message:
Ensure zero exit status from scriptlets.


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- zabbix.spec	16 Apr 2009 16:21:00 -0000	1.38
+++ zabbix.spec	16 Apr 2009 16:22:29 -0000	1.39
@@ -386,9 +386,10 @@
   chmod 0640 %{_sysconfdir}/zabbix/zabbix_server.conf
   chown root:zabbix %{_sysconfdir}/zabbix/zabbix_server.conf
 fi
+:
 
 %post agent
-/sbin/chkconfig --add zabbix-agent
+/sbin/chkconfig --add zabbix-agent || :
 
 %post proxy
 /sbin/chkconfig --add zabbix-proxy
@@ -398,27 +399,31 @@
   chmod 0640 %{_sysconfdir}/zabbix/zabbix_proxy.conf
   chown root:zabbix %{_sysconfdir}/zabbix/zabbix_proxy.conf
 fi
+:
 
 %preun server
 if [ "$1" = 0 ]
 then
-  /sbin/service zabbix-server stop >/dev/null 2>&1 || :
+  /sbin/service zabbix-server stop >/dev/null 2>&1
   /sbin/chkconfig --del zabbix-server
 fi
+:
 
 %preun agent
 if [ "$1" = 0 ]
 then
-  /sbin/service zabbix-agent stop >/dev/null 2>&1 || :
+  /sbin/service zabbix-agent stop >/dev/null 2>&1
   /sbin/chkconfig --del zabbix-agent
 fi
+:
 
 %preun proxy
 if [ "$1" = 0 ]
 then
-  /sbin/service zabbix-proxy stop >/dev/null 2>&1 || :
+  /sbin/service zabbix-proxy stop >/dev/null 2>&1
   /sbin/chkconfig --del zabbix-proxy
 fi
+:
 
 %post web
 # move existing config file on update
@@ -430,6 +435,7 @@
         chown apache:apache %{_sysconfdir}/zabbix/web/zabbix.conf.php
     fi
 fi
+:
 
 
 %files
@@ -513,6 +519,7 @@
 %changelog
 * Thu Apr  9 2009 Ville Skyttä <ville.skytta at iki.fi>
 - Tighten configuration file permissions.
+- Ensure zero exit status from scriptlets.
 
 * Thu Apr  9 2009 Dan Horák <dan[at]danny.cz> - 1.6.4-2
 - make the -docs subpackage noarch