packages: nfs-utils/nfs-utils.spec - rel 7 - don't exit from trigger

[baggins]

Author: baggins                      Date: Wed Feb  8 11:39:40 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 7
- don't exit from trigger

---- Files affected:
packages/nfs-utils:
   nfs-utils.spec (1.228 -> 1.229) 

---- Diffs:

================================================================
Index: packages/nfs-utils/nfs-utils.spec
diff -u packages/nfs-utils/nfs-utils.spec:1.228 packages/nfs-utils/nfs-utils.spec:1.229
--- packages/nfs-utils/nfs-utils.spec:1.228	Sun Feb  5 18:38:05 2012
+++ packages/nfs-utils/nfs-utils.spec	Wed Feb  8 12:39:35 2012
@@ -11,7 +11,7 @@
 Summary(uk.UTF-8):	Утиліти для NFS та демони підтримки для NFS-сервера ядра
 Name:		nfs-utils
 Version:	1.2.5
-Release:	6
+Release:	7
 License:	GPL v2
 Group:		Networking/Daemons
 #Source0:	http://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2
@@ -362,7 +362,7 @@
 fi
 %systemd_reload
 
-%triggerpostun -- %{name} < 1.2.5-5
+%triggerpostun -- %{name} < 1.2.5-7
 if [ -f /etc/sysconfig/nfsd ]; then
 	. /etc/sysconfig/nfsd
 	__RPCMOUNTDOPTIONS=
@@ -372,15 +372,16 @@
 		[ -n "$__var" -a "$__var" != "yes" ] && \
 			__RPCMOUNTDOPTIONS="$__RPCMOUNTDOPTIONS --no-nfs-version $vers"
 	done
-	[ -z "$__RPCMOUNTDOPTIONS" ] && exit 0
-	cp -f /etc/sysconfig/nfsd{,.rpmsave}
-	echo >>/etc/sysconfig/nfsd
-	echo "# Added by rpm trigger" >>/etc/sysconfig/nfsd
-	echo "RPCMOUNTDOPTIONS=\"$RPCMOUNTOPTIONS $__RPCMOUNTDOPTIONS\"" >>/etc/sysconfig/nfsd
+	if [ -n "$__RPCMOUNTDOPTIONS" ]; then
+		cp -f /etc/sysconfig/nfsd{,.rpmsave}
+		echo >>/etc/sysconfig/nfsd
+		echo "# Added by rpm trigger" >>/etc/sysconfig/nfsd
+		echo "RPCMOUNTDOPTIONS=\"$RPCMOUNTOPTIONS $__RPCMOUNTDOPTIONS\"" >>/etc/sysconfig/nfsd
+	fi
 fi
 %systemd_trigger nfsd.service nfsd-exportfs.service nfsd-mountd.service svcgssd.service
 
-%triggerpostun clients -- %{name}-clients < 1.2.5-5
+%triggerpostun clients -- %{name}-clients < 1.2.5-7
 %systemd_trigger blkmapd.service gssd.service
 
 %triggerpostun common -- %{name}-lock < 1.2.5-3
@@ -389,16 +390,17 @@
 	mv -f /etc/sysconfig/nfslock.rpmsave /etc/sysconfig/nfslock
 fi
 
-%triggerpostun common -- %{name}-common < 1.2.5-5
+%triggerpostun common -- %{name}-common < 1.2.5-7
 if [ -f /etc/sysconfig/nfslock ]; then
 	. /etc/sysconfig/nfslock
 	[ -n "$STATD_PORT" ] && STATDOPTS="$STATDOPTS -p $STATD_PORT"
 	[ -n "$STATD_OUTPORT" ] && STATDOPTS="$STATDOPTS -o $STATD_OUTPORT"
-	[ -z "$STATDOPTS" ] && exit 0
-	cp -f /etc/sysconfig/nfslock{,.rpmsave}
-	echo >>/etc/sysconfig/nfslock
-	echo "# Added by rpm trigger" >>/etc/sysconfig/nfslock
-	echo "STATDOPTIONS=\"$STATDOPTS\"" >>/etc/sysconfig/nfslock
+	if [ -n "$STATDOPTS" ]; then
+		cp -f /etc/sysconfig/nfslock{,.rpmsave}
+		echo >>/etc/sysconfig/nfslock
+		echo "# Added by rpm trigger" >>/etc/sysconfig/nfslock
+		echo "STATDOPTIONS=\"$STATDOPTS\"" >>/etc/sysconfig/nfslock
+	fi
 fi
 %systemd_trigger idmapd.service nfslock.service
 
@@ -515,6 +517,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.229  2012/02/08 11:39:35  baggins
+- rel 7
+- don't exit from trigger
+
 Revision 1.228  2012/02/05 17:38:05  baggins
 - rel 6
 - added O:*-systemd
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils.spec?r1=1.228&r2=1.229&f=u