Changeset 1509

Timestamp:

05/09/12 04:10:30 (13 months ago)

Author:

bruno

Message:

• Fix a build bug with the new prefix variable in pb-module. Only use if it exists !
• pb_conf_init is called at low level on the default project to avoid PBPROJ to be undefined and creatin lots of error msgs. pbdistrocheck works again with it
• Fix sbx2setupvm in order to call pb_conf_init correctly at start of the pbinit script.

Location:

devel

Files:

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

devel/pb-modules/Makefile.PL

@@ -50 +50 @@
     }
 
-    $etcdir ||= "$prefix/etc/pb";
-    $mandir ||= "$prefix/share/man";
+    $etcdir ||= "$prefix/etc/pb" if (defined $prefix);
+    $mandir ||= "$prefix/share/man" if (defined $prefix);
     $etcdir ||= "/usr/local/etc/pb";
     $mandir ||= "/usr/local/share/man";

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

@@ -287 +287 @@
 # TODO: test $ptr is a hash pointer
 
+# When called without correct initialization, try to work anyway with default as project
+pb_conf_init("default") if (not defined $ENV{'PBPROJ'});
+
 my @params = (sort keys %$ptr);
 
@@ -308 +311 @@
     if (not defined $p2) {
         # exit if no p1 either
-        next if ((not defined $p1) || (not defined $ENV{'PBPROJ'}));
+        next if (not defined $p1);
         # No ref in p2 so use p1
         $p1->{$ENV{'PBPROJ'}} = $p1->{'default'} if ((not defined $p1->{$ENV{'PBPROJ'}}) && (defined $p1->{'default'}));

devel/pb/bin/pb

@@ -2795 +2795 @@
     print SCRIPT << "EOF";
 pb_temp_init($pbkeep);
+pb_conf_init($ENV{'PBPROJ'});
 
 EOF