[rancid] Re: jerancid show version parsing

[john heasley]

Thu, Jun 11, 2009 at 08:13:37AM -0300, Gino Doucet:
> Hi John,
> Actually, I'm using 2.3.2a7 version of rancid but verified jerancid in the
> final 2.3.2 release to be the same for this segment of code as far as I can
> tell.

Sorry, it didnt make it into 2.3.2.  here it is:

Index: bin/jerancid.in
===================================================================
RCS file: /home/rancid/.CVS/rancid/bin/jerancid.in,v
retrieving revision 1.47
retrieving revision 1.48
diff -d -u -r1.47 -r1.48
--- bin/jerancid.in	4 Mar 2009 19:11:55 -0000	1.47
+++ bin/jerancid.in	15 May 2009 23:12:12 -0000	1.48
@@ -1,6 +1,6 @@
 #! @PERLV_PATH@
 ##
-## $Id: jerancid.in,v 1.47 2009/03/04 19:11:55 heas Exp $
+## $Id: jerancid.in,v 1.48 2009/05/15 23:12:12 heas Exp $
 ##
 ## @PACKAGE@ @VERSION@
 ## Copyright (c) 1997-2008 by Terrapin Communications, Inc.
@@ -193,9 +193,9 @@
 	}
 	/^(--.*) --+$/ && $slots &&
 		ProcessHistory("COMMENTS","keysort","B2", "! $1\n") && next;
-	if (/^(\d+ +\S+ +(\S+).*) \S+$/ && $slots) {
+	if (/^(\d+\s+(\S+)\s+\S+\s+.*) \S+/ && $slots) {
 	    my($line) = $1;
-	    if ($2 != /--+/) {
+	    if (! ($2 =~ /--+/)) {
 		ProcessHistory("COMMENTS","keysort","B3", "! $line\n");
 	    }
 	    next;