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

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Tue Dec 31 09:10:01 2002


User:      ramoore
Date:      2002-12-31 14:09:27 GMT
Modified:  lib/Vend Interpolate.pm
Log:
Minor change to sub timed_build in Interpolate.pm to allow auto option
of timed_build to work when NoAbsolute is set.

Revision  Changes    Path
2.140     +3 -3      interchange/lib/Vend/Interpolate.pm


rev 2.140, prev_rev 2.139
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.139
retrieving revision 2.140
diff -u -r2.139 -r2.140
--- Interpolate.pm	24 Dec 2002 16:43:12 -0000	2.139
+++ Interpolate.pm	31 Dec 2002 14:09:26 -0000	2.140
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.139 2002/12/24 16:43:12 mheins Exp $
+# $Id: Interpolate.pm,v 2.140 2002/12/31 14:09:26 ramoore Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -27,7 +27,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = substr(q$Revision: 2.139 $, 10);
+$VERSION = substr(q$Revision: 2.140 $, 10);
 
 @EXPORT = qw (
 
@@ -5903,7 +5903,7 @@
 	}
 
     $file = Vend::Util::escape_chars($file);
-    if($Global::NoAbsolute and (file_name_is_absolute($file) or $file =~ m#\.\./.*\.\.#)) {
+    if(!$opt->{auto} and $Global::NoAbsolute and (file_name_is_absolute($file) or $file =~ m#\.\./.*\.\.#)) {
 	::logError("Can't use file '%s' with NoAbsolute set", $file);
 	::logGlobal({ level => 'auth'}, "Can't use file '%s' with NoAbsolute set", $file);
 	return '';