Changeset 424 in ProjectBuilder

Timestamp:

May 3, 2008, 1:44:53 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug in Env.pm (forgot a use)
• Fix a bug in pb_conf_get_fromfile_if (using last instead of next) and fix #24

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Conf.pm (modified) (2 diffs)
• pb/lib/ProjectBuilder/Env.pm (modified) (1 diff)

devel/pb-modules/lib/ProjectBuilder/Conf.pm

@@ -209 +209 @@
 pb_log(2,"DEBUG: pb_conf_get $conffile: ".Dumper(@ptr1)."\n");
 pb_log(2,"DEBUG: pb_conf_get input: ".Dumper(@ptr2)."\n");
+pb_log(2,"DEBUG: pb_conf_get param: ".Dumper(@param)."\n");
 
 foreach my $i (0..$#param) {
@@ -217 +218 @@
     if (not defined $p2) {
         # exit if no p1 either
-        last if ((not defined $p1) || (not defined $ENV{'PBPROJ'}));
+        next if ((not defined $p1) || (not defined $ENV{'PBPROJ'}));
         # No ref in p2 so use p1
         $p1->{$ENV{'PBPROJ'}} = $p1->{'default'} if ((not defined $p1->{$ENV{'PBPROJ'}}) && (defined $p1->{'default'}));

devel/pb/lib/ProjectBuilder/Env.pm

@@ -16 +16 @@
 use English;
 use File::Basename;
+use File::stat;
 use POSIX qw(strftime);
 use lib qw (lib);