Changeset 29582 for main/trunk/greenstone2/perllib

Timestamp:

2014-12-11T15:42:41+13:00 (9 years ago)

Author:

ak19

Message:

util::setup_greenstone_env() needs to handle env vars whose values are multi-line.

File:

• main/trunk/greenstone2/perllib/util.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/util.pm

@@ -1348 +1348 @@
     }
 
+    my $lastkey;
     while (defined (my $perl_output_line = <PIN>)) {
         my($key,$value) = ($perl_output_line =~ m/^([^=]*)[=](.*)$/);
-        #$env_map{$key}=$value;     
-        $ENV{$key}=$value;
+        if(defined $key) {
+            #$env_map{$key}=$value;     
+            $ENV{$key}=$value;
+            $lastkey = $key;
+        } elsif($lastkey && $perl_output_line !~ m/^\s*$/) { 
+            # there was no equals sign in $perl_output_line, so this 
+            # $perl_output_line may be a spillover from the previous
+            $ENV{$lastkey} = $ENV{$lastkey}."\n".$perl_output_line;
+        }
     }
     close (PIN);