File rancid-2.3.8.p2 of Package rancid-stable

File rancid-2.3.8.p2 of Package rancid-stable (Revision 5be15658a810c23ece1a557f69783e0d)

Currently displaying revision 5be15658a810c23ece1a557f69783e0d, show latest

Index: bin/xrrancid.in
===================================================================
--- bin/xrrancid.in	(revision 2396)
+++ bin/xrrancid.in	(working copy)
@@ -580,10 +580,16 @@
 	return(-1) if (/\%Error opening \S+:\S+ $Device or resource busy$/i);
 	return(-1) if (/command authorization failed/i);
 	return(1) if (/(Open device \S+ failed|Error opening \S+:)/);
-	# filter frequently changing files from IOX bootflash
-	if ($dev =~ /bootflash/) {
-	    next if (/temp_cont\s*$/);
-	    next if (/uptime_cont\s*$/);
+	# filter frequently changing files from IOX bootflash / hardiska
+	if ($dev =~ /(bootflash|harddiska)/) {
+	    if (/(temp_cont|uptime_cont|volt_cont)\s*$/) {
+		if (/(\s*\d+\s+\S+\s+)(\d+)(\s+)(\w+ \w+\s+\d+ \d+:\d+:\d+ \d+)/) {
+		    my($a, $sz, $c, $dt, $rem) = ($1, $2, $3, $4, $');
+		    my($szl, $dtl) = (length($sz), length($dt));
+		    my($fmt) = "%s%-". $szl ."s%s%-". $dtl ."s%s";
+		    $_ = sprintf($fmt, $a, "", $c, "", $rem);
+		}
+	    }
 	}
 	# Filter dhcp database
 	if (/dhcp_[^. ]*\.txt/) {
Index: CHANGES
===================================================================
--- CHANGES	(revision 2396)
+++ CHANGES	(working copy)
@@ -1,4 +1,6 @@
 2.3.9
+	xrrancid: additional file filters for 4.2
+
 	hpuifilter: dont use memcpy for overlapping regions - David Byers
 
 2.3.8