Changeset 1509


Ignore:
Timestamp:
May 9, 2012, 4:10:30 AM (7 years 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:
3 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/Makefile.PL

    r1503 r1509  
    5050    }
    5151
    52     $etcdir ||= "$prefix/etc/pb";
    53     $mandir ||= "$prefix/share/man";
     52    $etcdir ||= "$prefix/etc/pb" if (defined $prefix);
     53    $mandir ||= "$prefix/share/man" if (defined $prefix);
    5454    $etcdir ||= "/usr/local/etc/pb";
    5555    $mandir ||= "/usr/local/share/man";
  • devel/pb-modules/lib/ProjectBuilder/Conf.pm

    r1507 r1509  
    287287# TODO: test $ptr is a hash pointer
    288288
     289# When called without correct initialization, try to work anyway with default as project
     290pb_conf_init("default") if (not defined $ENV{'PBPROJ'});
     291
    289292my @params = (sort keys %$ptr);
    290293
     
    308311    if (not defined $p2) {
    309312        # exit if no p1 either
    310         next if ((not defined $p1) || (not defined $ENV{'PBPROJ'}));
     313        next if (not defined $p1);
    311314        # No ref in p2 so use p1
    312315        $p1->{$ENV{'PBPROJ'}} = $p1->{'default'} if ((not defined $p1->{$ENV{'PBPROJ'}}) && (defined $p1->{'default'}));
  • devel/pb/bin/pb

    r1495 r1509  
    27952795    print SCRIPT << "EOF";
    27962796pb_temp_init($pbkeep);
     2797pb_conf_init($ENV{'PBPROJ'});
    27972798
    27982799EOF
Note: See TracChangeset for help on using the changeset viewer.