[Logcheck-commits] CVS logcheck/src

CVS User maks-guest logcheck-devel@lists.alioth.debian.org
Tue, 08 Jun 2004 00:47:12 -0600


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

Modified Files:
	logcheck 
Log Message:

revert my bogus change in greplogoutput,
that code is not equivalent to cleanchecked,
aboves change yes, but not that one!


--- /cvsroot/logcheck/logcheck/src/logcheck	2004/06/07 16:09:51	1.56
+++ /cvsroot/logcheck/logcheck/src/logcheck	2004/06/08 06:47:11	1.57
@@ -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.56 2004/06/07 16:09:51 maks-guest Exp $
+# $Id: logcheck,v 1.57 2004/06/08 06:47:11 maks-guest Exp $
 
 
 # Set the umask
@@ -304,9 +304,12 @@
 		# Remove any  entries already reported
 		for file in $(ls $raise/ | grep -v '^logcheck') ; do
 		    debug "Cleaning logcheck: $file"
-		    if [ -f "$ignore/$file" ]; then
-	                cleanchecked "$ignore/$file"
-		    fi
+		    egrep --text -v -f $raise/$file $TMPDIR/checked |cat \
+			>> $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
 	    fi