[patch] bug140084.patch

bug140084.patch (text/plain), 952 bytes, created by Christian Hartmann (RETIRED) on 2006-07-12 03:06:02 UTC

--- Config.pm.orig	2006-07-12 12:02:04.088033250 +0200
+++ Config.pm	2006-07-12 12:04:11.624003750 +0200
@@ -137,17 +137,19 @@
 sub getValue {
     my $self     = shift;
     my $confVal  = shift;
-    my $makeconf = getParamFromFile( getFileContents("/etc/make.conf"),
-        "$confVal", "lastseen" );
-    if ( !$makeconf ) {
-        $makeconf = getParamFromFile( getFileContents("/etc/make.globals"),
-            "$confVal", "lastseen" );
-    }
+    my $filedata = getFileContents("/etc/make.globals").getFileContents("/etc/make.conf");
+    my $param    = getParamFromFile($filedata,$confVal,"lastseen");
 
-    if ( !$makeconf ) {
+    while ($param =~m/\$\{(.+)\}/)
+    {
+        my $fetchparam=getParamFromFile($filedata,$1,"lastseen");
+	$param=~s/\$\{$1\}/$fetchparam/;
+    }
+    
+    if ( !$param ) {
         return undef;
     }
-    $self->{ lc($confVal) } = $makeconf;
+    $self->{ lc($confVal) } = $param;
 }
 
 sub DESTROY {