- cleanup %pre script so amd.conf won't get stat()ed if it doesn't exist

(#126656)

am-utils.spec

@@ -1,7 +1,7 @@
 Summary: Automount utilities including an updated version of Amd.
 Name: am-utils
 Version: 6.0.9
-Release: 9
+Release: 10
 License: BSD
 Epoch: 5
 Group: System Environment/Daemons
@@ -87,24 +87,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre
 # Check if we have an old fashioned amd.conf and rename if to amd.net
-if [ "$1" -ne 0 ] ; then
-    if ! test -r /etc/amd.conf ; then
-	# this is okay
-	exit 0
-    elif grep -q "auto_dir" /etc/amd.conf 2>/dev/null ; then
-	# this is okay
-	exit 0
-    else
-	# this needs to be renamed. Still, if /etc/amd.net exists, then
-	# don't bother renaming it. RPM will handle it better than us here.
-	if [ -e /etc/amd.net ] ; then
-	    exit 0
-	else
-	    mv -f /etc/amd.conf /etc/amd.net
-	fi
-    fi
+if test "$1" -ne 0
+then if test -r /etc/amd.conf
+     then if grep -v -q "auto_dir" /etc/amd.conf
+          then if test ! -e /etc/amd.net
+	       then mv -f /etc/amd.conf /etc/amd.net
+	       fi
+          fi
+     fi
 fi
-exit 0
 
 %post
 /sbin/ldconfig
@@ -142,6 +133,10 @@ fi
 %{_libdir}/libamu.so.*
 
 %changelog
+* Tue Oct 12 2004 Adrian Havill <havill@redhat.com> 6.0.9-10
+- cleanup %pre script so amd.conf won't get stat()ed if it doesn't
+  exist (#126656)
+
 * Wed Sep  1 2004 Nalin Dahyabhai <nalin@redhat.com> 6.0.9-9
 - really fix %%preun this time