[interchange-cvs] interchange - jon modified lib/Vend/Interpolate.pm

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Thu Jan 23 14:36:00 2003


User:      jon
Date:      2003-01-23 19:35:46 GMT
Modified:  lib/Vend Tag: STABLE_4_8-branch Interpolate.pm
Log:
Merge from trunk:

Fix bug that, for if-loop-*, prevented regular expressions that contained
spaces from working.

Revision  Changes    Path
No                   revision



No                   revision



2.9.2.25  +3 -3      interchange/lib/Vend/Interpolate.pm


rev 2.9.2.25, prev_rev 2.9.2.24
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.9.2.24
retrieving revision 2.9.2.25
diff -u -u -r2.9.2.24 -r2.9.2.25
--- Interpolate.pm	23 Jan 2003 19:32:15 -0000	2.9.2.24
+++ Interpolate.pm	23 Jan 2003 19:35:45 -0000	2.9.2.25
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.9.2.24 2003/01/23 19:32:15 jon Exp $
+# $Id: Interpolate.pm,v 2.9.2.25 2003/01/23 19:35:45 jon Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. and
 # Interchange Development Group, http://www.icdevgroup.org/
@@ -28,7 +28,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = substr(q$Revision: 2.9.2.24 $, 10);
+$VERSION = substr(q$Revision: 2.9.2.25 $, 10);
 
 @EXPORT = qw (
 
@@ -3775,7 +3775,7 @@
 sub pull_cond {
 	my($string, $reverse, $cond, $lhs) = @_;
 #::logDebug("pull_cond string='$string' rev='$reverse' cond='$cond' lhs='$lhs'");
-	my ($op, $rhs) = split /\s+/, $cond;
+	my ($op, $rhs) = split /\s+/, $cond, 2;
 	$rhs =~ s/^(["'])(.*)\1$/$2/;
 	if(! defined $cond_op{$op} ) {
 		::logError("bad conditional operator %s in if-PREFIX-data", $op);