SPECS: logwatch.spec - don't fail on trigger errors.

[blues]

Author: blues                        Date: Wed Nov 16 20:19:50 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- don't fail on trigger errors.

---- Files affected:
SPECS:
   logwatch.spec (1.162 -> 1.163) 

---- Diffs:

================================================================
Index: SPECS/logwatch.spec
diff -u SPECS/logwatch.spec:1.162 SPECS/logwatch.spec:1.163
--- SPECS/logwatch.spec:1.162	Mon Nov 14 09:58:34 2005
+++ SPECS/logwatch.spec	Wed Nov 16 21:19:42 2005
@@ -4,7 +4,7 @@
 Summary(pl):	Logwatch - analizator logów systemowych
 Name:		logwatch
 Version:	7.1
-Release:	1
+Release:	1.1
 License:	MIT
 Group:		Applications/System
 # Path for stable versions:
@@ -82,18 +82,20 @@
 %pre
 # needed for smooth upgrade from < 4.3.2 package
 if [ -d /etc/log.d/conf ]; then
-	mv -f /etc/log.d/conf/logwatch.conf* /etc/log.d/
-	mv -f /etc/log.d/conf/services /etc/log.d/
-	mv -f /etc/log.d/conf/logfiles /etc/log.d/
+	mv -f /etc/log.d/conf/logwatch.conf* /etc/log.d/ || :
+	mv -f /etc/log.d/conf/services /etc/log.d/ || :
+	mv -f /etc/log.d/conf/logfiles /etc/log.d/ || :
 # needed for smooth upgrade from < 7.0 package:
 elif [ -d /etc/log.d ]; then
 	echo "Moving configuration from /etc/log.d to /etc/logwatch/conf..."
-	mkdir -p /etc/logwatch/conf
+	if [ ! -d /etc/logwatch/conf ]; then
+		mkdir -p /etc/logwatch/conf
+	fi
 #	mkdir /etc/logwatch/conf/logfiles
 #	mkdir /etc/logwatch/conf/services
-	mv -f /etc/log.d/logwatch.conf* /etc/logwatch/conf/
-	mv -f /etc/log.d/services /etc/logwatch/conf/
-	mv -f /etc/log.d/logfiles /etc/logwatch/conf/
+	mv -f /etc/log.d/logwatch.conf* /etc/logwatch/conf/ || :
+	mv -f /etc/log.d/services /etc/logwatch/conf/ || :
+	mv -f /etc/log.d/logfiles /etc/logwatch/conf/ || :
 fi
 
 %files
@@ -120,6 +122,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.163  2005/11/16 20:19:42  blues
+- don't fail on trigger errors.
+
 Revision 1.162  2005/11/14 08:58:34  blues
 - 7.1 - added gawk patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/logwatch.spec?r1=1.162&r2=1.163&f=u