[rancid] Re: problems with diffs!

[john heasley]

Sun, Sep 17, 2006 at 10:58:56PM +0300, Abdelrahman:
> Dear john,
> 
> I am using this version?!

My mistake, the change I expect to fix your problem is not in 2.3.2a5.  See
the patch below.

> regards,
> Abdekrahman
> 
> On 9/17/06, john heasley <heas at shrubbery.net> wrote:
> >
> >Please try 2.3.2a5.
> >
> >Sat, Sep 16, 2006 at 11:53:58AM +0300, Abdelrahman:
> >> - !VLAN:                          ^
> >
> >> + !VLAN:          ^
> >
> >>   !
> >
> >>   Config-register 0xF
> >
> >>   Version 12.2
> >
> >>   No service pad
> >
> >>
> >
> >> I understand that rancid assumed that there is a difference in the line
> >> because the number of spaces has changed? But this didn't indicate a
> >> difference in the configuration?
> >
> >>
> >
> >> It also happens with "show vlan". I always receive a mail indicating
> >that
> >> there is a difference in the configuration where in fact I find that it
> >is
> >> just that the lines has changed somehow?
> >
> >>
> >
> >> Is there a way I could fix this issue?
> >
> >

Index: rancid.in
===================================================================
RCS file: /home/rancid/.CVS/rancid/bin/rancid.in,v
retrieving revision 1.214
retrieving revision 1.215
diff -d -u -r1.214 -r1.215
--- rancid.in	17 Aug 2006 01:08:26 -0000	1.214
+++ rancid.in	18 Aug 2006 22:54:08 -0000	1.215
@@ -1,6 +1,6 @@
 #! @PERLV_PATH@
 ##
-## $Id: rancid.in,v 1.214 2006/08/17 01:08:26 heas Exp $
+## $Id: rancid.in,v 1.215 2006/08/18 22:54:08 heas Exp $
 ##
 ## Copyright (C) 1997-2006 by Terrapin Communications, Inc.
 ## All rights reserved.
@@ -1369,6 +1369,7 @@
 	tr/\015//d;
 	last if (/^$prompt/);
 	next if (/^(\s*|\s*$cmd\s*)$/);
+	return(1) if /^\s*\^\s*$/;
 	return(1) if /Line has invalid autocommand /;
 	return(1) if /(Invalid input detected|Type help or )/;
 	return(1) if /Ambiguous command/i;