Changeset 262 in ProjectBuilder for devel/pb/lib

Timestamp:

Oct 27, 2007, 2:18:22 AM (16 years ago)

Author:

Bruno Cornec

Message:

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

File:

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

devel/pb/lib/ProjectBuilder/Base.pm

@@ -233 +233 @@
 my $p2;
 
+#print "DEBUG: param1: ".Dumper(@ptr1)."\n"; # if ($debug >= 1);
+#print "DEBUG: param2: ".Dumper(@ptr2)."\n"; # if ($debug >= 1);
+
 foreach my $i (0..$#param) {
-    die "No $param[$i] defined for $ENV{'PBPROJ'}" if ((not defined $ptr1[$i]) && (not defined $ptr2[$i]));
+    $p1 = $ptr1[$i];
+    $p2 = $ptr2[$i];
+    die "No $param[$i] defined for $ENV{'PBPROJ'}" if ((not defined @ptr1) && (not defined @ptr2));
+    die "No $param[$i] defined for $ENV{'PBPROJ'}" if ((not defined $p1) && (not defined $p2));
     # Always try to take the param from the home dir conf file in priority
     # in order to mask what could be defined under the CMS to allow for overloading
-    $p1 = $ptr1[$i];
-    $p2 = $ptr2[$i];
     if (not defined $p2) {
         # No ref in CMS project conf file so use the home dir one.
@@ -266 +270 @@
     }
     die "No $param[$i] defined for $ENV{'PBPROJ'}" if (not defined $p1->{$ENV{'PBPROJ'}});
-}
-#print "DEBUG: param: ".Dumper(@ptr)."\n" if ($debug >= 1);
+    $ptr1[$i] = $p1;
+    #print "DEBUG: param ptr1: ".Dumper(@ptr1)."\n"; # if ($debug >= 1);
+}
 return(@ptr1);
 }