Ignore:
Timestamp:
Oct 27, 2007, 2:18:22 AM (12 years ago)
Author:
bruno
Message:

Fix bug #7 where .pbrc nearly empty wasn't working

File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/lib/ProjectBuilder/Base.pm

    r259 r262  
    233233my $p2;
    234234
     235#print "DEBUG: param1: ".Dumper(@ptr1)."\n"; # if ($debug >= 1);
     236#print "DEBUG: param2: ".Dumper(@ptr2)."\n"; # if ($debug >= 1);
     237
    235238foreach my $i (0..$#param) {
    236     die "No $param[$i] defined for $ENV{'PBPROJ'}" if ((not defined $ptr1[$i]) && (not defined $ptr2[$i]));
     239    $p1 = $ptr1[$i];
     240    $p2 = $ptr2[$i];
     241    die "No $param[$i] defined for $ENV{'PBPROJ'}" if ((not defined @ptr1) && (not defined @ptr2));
     242    die "No $param[$i] defined for $ENV{'PBPROJ'}" if ((not defined $p1) && (not defined $p2));
    237243    # Always try to take the param from the home dir conf file in priority
    238244    # in order to mask what could be defined under the CMS to allow for overloading
    239     $p1 = $ptr1[$i];
    240     $p2 = $ptr2[$i];
    241245    if (not defined $p2) {
    242246        # No ref in CMS project conf file so use the home dir one.
     
    266270    }
    267271    die "No $param[$i] defined for $ENV{'PBPROJ'}" if (not defined $p1->{$ENV{'PBPROJ'}});
    268 }
    269 #print "DEBUG: param: ".Dumper(@ptr)."\n" if ($debug >= 1);
     272    $ptr1[$i] = $p1;
     273    #print "DEBUG: param ptr1: ".Dumper(@ptr1)."\n"; # if ($debug >= 1);
     274}
    270275return(@ptr1);
    271276}
Note: See TracChangeset for help on using the changeset viewer.