[Logcheck-commits] CVS logcheck/src

[CVS User maks-guest]

Update of /cvsroot/logcheck/logcheck/src
In directory haydn:/tmp/cvs-serv27757/src

Modified Files:
	logcheck 
Log Message:

remove duplicate code, 
we want to check the logcheck-package files per default with cleanchecked,
and not wait for the $grepfile = "logcheck" to have an eventual output.


--- /cvsroot/logcheck/logcheck/src/logcheck	2004/05/19 08:16:45	1.32
+++ /cvsroot/logcheck/logcheck/src/logcheck	2004/05/19 08:23:45	1.33
@@ -22,7 +22,7 @@
 # along with Logcheck; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-# $Id: logcheck,v 1.32 2004/05/19 08:16:45 ttroxell Exp $
+# $Id: logcheck,v 1.33 2004/05/19 08:23:45 maks-guest Exp $
 
 
 # Set the umask
@@ -277,28 +277,13 @@
 	    if [ -n "$ignore" -a -f "$ignore/$(basename $grepfile)" ]; then
 		cleanchecked "$ignore/$(basename $grepfile)"
 	    elif [ -n "$ignore" -a -f "$ignore/logcheck-$(basename $grepfile)" ]; then
+		# Now ignore all entries from the logcheck-<package> files
 		cleanchecked "$ignore/logcheck-$(basename $grepfile)"
 	    fi
 	    
 	    # If it's the logcheck file, we do something special
 	    if [ "$(basename $grepfile)" = "logcheck" ]; then 
 
-		# Now ignore all entries from the logcheck-<package> files
-		if [ -n "$ignore" ]; then
-		    debug "Applying Logcheck override files"
-		    for file in $(ls -1 $ignore/ | grep "logcheck-.*") ; do
-		        debug "clean logcheck-<package>: $file"
-		        egrep --text -v -f $ignore/$file $TMPDIR/checked \
-		       	   >> $TMPDIR/checked.1 
-#			   || error "Could not output to $TMPDIR/checked.1" 
-		        mv $TMPDIR/checked.1 $TMPDIR/checked \
-			|| error "Could not move $TMPDIR/checked.1 to \
-			$TMPDIR/checked"
-		    done
-		else
-		    debug "No Logcheck override files" 
-		fi
-
 		debug "Cleaning logcheck"
 		# Remove any  entries already reported
 		for file in $(ls $raise/ | grep -v logcheck) ; do