[interchange] Fix bug in parse_dir_array

David Christensen interchange-cvs at icdevgroup.org
Wed Jun 29 21:05:39 UTC 2011


commit 81cf45687ffc8fca81353faceb3b77a2a9ef78f5
Author: David Christensen <david at endpoint.com>
Date:   Wed Jun 29 16:04:44 2011 -0500

    Fix bug in parse_dir_array
    
    Reported by Bill Carr

 lib/Vend/Config.pm |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/lib/Vend/Config.pm b/lib/Vend/Config.pm
index 02e9c44..cfcc7c8 100644
--- a/lib/Vend/Config.pm
+++ b/lib/Vend/Config.pm
@@ -3932,15 +3932,14 @@ sub parse_dir_array {
 	my @dirs = grep /\S/, Text::ParseWords::shellwords($value);
 
 	foreach my $dir (@dirs) {
-                my $val;
-		unless (allowed_file($dir)) {
+ 		unless (allowed_file($dir)) {
 			config_error('Path %s not allowed in %s directive',
 								$dir, $var);
 		}
-		$val = "$C->{VendRoot}/$dir"
-			unless file_name_is_absolute($val);
-		$val =~ s./+$..;
-		push @$c, $val;
+		$dir = "$C->{VendRoot}/$dir"
+			unless file_name_is_absolute($dir);
+		$dir =~ s./+$..;
+		push @$c, $dir;
 	}
 
 	return $c;



More information about the interchange-cvs mailing list