Changeset 2152 in ProjectBuilder


Ignore:
Timestamp:
Dec 23, 2016, 2:21:42 AM (4 years ago)
Author:
Bruno Cornec
Message:
  • Fix a bug in the loading order of the 2 generic conf files files which were reversed
  • Document in Conf.pm the order in which all conf files are loaded
Location:
devel/pb-modules/lib/ProjectBuilder
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/lib/ProjectBuilder/Conf.pm

    r2077 r2152  
    6565
    6666=head1 USAGE
     67
     68The configuration files are loaded in a specific order from most generic to the most specific
     69to allow for overwrite to work:
     70
     711. /usr/share/pb/pb.conf    - the read-only system conf file provided by install
     722. /etc/pb/pb.conf          - the same global conf file given to the sysadmin in order to make system wide modifications
     733. /path/to/project.pb      - Configuration file for the project we're building for
     744. /(vm|ve|rm)path/to/.pbrc - configuration file for VM, VE or RM specific parameters. Cumulative should be orthogonal
     755. $HOME/.pbrc              - user's configuration file
    6776
    6877=over 4
  • devel/pb-modules/lib/ProjectBuilder/Distribution.pm

    r2136 r2152  
    132132# the location of the conf file is finalyzed at install time
    133133# depending whether we deal with package install or tar file install
     134
     135pb_conf_add(pb_distro_sysconffile());
     136
     137# Similarly for the local file available for sysadmin. After the previous one to allow overwrite to work
    134138pb_conf_add(pb_distro_conffile());
    135 
    136 # Similarly for the local file available for sysadmin. After the previous one to allow overwrite to work
    137 pb_conf_add(pb_distro_sysconffile());
    138139
    139140# If we don't know which distribution we're on, then guess it
     
    739740=item B<pb_distro_conf_print>
    740741
    741 This function prints every configuration parameter in order to help debug stacking issues with conf files. If a VM/VE/RM is given restrict display to this distribution. Ifparameters are passed, restrict again the display to these values only.
     742This function prints every configuration parameter in order to help debug stacking issues with conf files. If a VM/VE/RM is given, restrict display to this distribution. If parameters are passed, restrict again the display to these values only.
    742743
    743744=cut
Note: See TracChangeset for help on using the changeset viewer.