[interchange-cvs] interchange - jon modified lib/Vend/Interpolate.pm
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Tue Sep 17 20:46:02 2002
User: jon
Date: 2002-09-18 00:45:57 GMT
Modified: lib/Vend Interpolate.pm
Log:
Convert Mac line endings to Unix (as well as DOS).
Revision Changes Path
2.111 +3 -3 interchange/lib/Vend/Interpolate.pm
rev 2.111, prev_rev 2.110
Index: Interpolate.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.110
retrieving revision 2.111
diff -u -u -r2.110 -r2.111
--- Interpolate.pm 16 Sep 2002 23:06:31 -0000 2.110
+++ Interpolate.pm 18 Sep 2002 00:45:56 -0000 2.111
@@ -1,6 +1,6 @@
# Vend::Interpolate - Interpret Interchange tags
#=20
-# $Id: Interpolate.pm,v 2.110 2002/09/16 23:06:31 mheins Exp $
+# $Id: Interpolate.pm,v 2.111 2002/09/18 00:45:56 jon Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -27,7 +27,7 @@
require Exporter;
@ISA =3D qw(Exporter);
=20
-$VERSION =3D substr(q$Revision: 2.110 $, 10);
+$VERSION =3D substr(q$Revision: 2.111 $, 10);
=20
@EXPORT =3D qw (
=20
@@ -1038,7 +1038,7 @@
},
'unix' =3D> sub {
my $val =3D shift;
- $val =3D~ s/\r?\n/\n/g;
+ $val =3D~ s/\r\n|\r/\n/g;
return $val;
},
'dos' =3D> sub {