Changeset 79 in ProjectBuilder for devel/pb/lib/ProjectBuilder/Base.pm

Timestamp:

Sep 3, 2007, 4:09:00 AM (17 years ago)

Author:

Bruno Cornec

Message:

Use more nv variables to deal with filters easily even outside ou pb

File:

• devel/pb/lib/ProjectBuilder/Base.pm (modified) (6 diffs)

devel/pb/lib/ProjectBuilder/Base.pm

@@ -314 +314 @@
 my $dver = shift || die "No dver specified";
 my $ptr; # returned value pointer on the hash of filters
+my %ptr;
 
 if (-d "$ENV{'PBCONF'}/$pbpkg/pbfilter") {
@@ -326 +327 @@
     push @ffiles,$ffile3 if (defined $ffile3);
 }
-my $config = AppConfig->new({
-    # Auto Create variables mentioned in Conf file
-    CREATE => 1,
-    DEBUG => 0,
-    GLOBAL => {
-        # Each conf item is a hash
-        ARGCOUNT => AppConfig::ARGCOUNT_HASH
-    }
-});
-
 if (@ffiles) {
     print $LOG "DEBUG ffiles: ".Dumper(\@ffiles)."\n" if ($debug >= 1);
+
+    my $config = AppConfig->new({
+        # Auto Create variables mentioned in Conf file
+        CREATE => 1,
+        DEBUG => 0,
+        GLOBAL => {
+            # Each conf item is a hash
+            ARGCOUNT => AppConfig::ARGCOUNT_HASH
+        }
+    });
+
     $config->file(@ffiles);
     $ptr = $config->get("filter");
@@ -344 +346 @@
     $ptr = { };
 }
-return($ptr);
+%ptr = %$ptr;
+return(\%ptr);
 }
 
@@ -354 +357 @@
 my %filter=%$ptr;
 my $destfile=shift;
-my $pbpkg=shift;
-my $pbtag=shift;
 my $dtype=shift;
 my $dsuf=shift;
@@ -367 +368 @@
     foreach my $s (keys %filter) {
         # Process single variables
-        print $LOG "DEBUG filter{$s}: $filter{$s}\n" if ($debug > 1);
+        print $LOG "DEBUG filter{$s}: $filter{$s}\n" if ($debug >= 1);
         my $tmp = $filter{$s};
         next if (not defined $tmp);
         # Expand variables if any single one found
+        print $LOG "DEBUG tmp: $tmp\n" if ($debug >= 1);
         if ($tmp =~ /\$/) {
             eval { $tmp =~ s/(\$\w+)/$1/eeg };
@@ -376 +378 @@
         } elsif (($tmp =~ /^yes$/) && ($s =~ /^PBLOG$/) && ($line =~ /^PBLOG$/)) {
             $tmp = "";
-            my $p = $defpkgdir{$pbpkg};
-            $p = $extpkgdir{$pbpkg} if (not defined $p);
-            pb_changelog($dtype, $pbpkg, $pbtag, $dsuf, $p, \*DEST);
+            my $p = $defpkgdir{$ENV{'PBPKG'}};
+            $p = $extpkgdir{$ENV{'PBPKG'}} if (not defined $p);
+            pb_changelog($dtype, $ENV{'PBPKG'}, $ENV{'PBTAG'}, $dsuf, $p, \*DEST);
         }
         $line =~ s|$s|$tmp|;