Changeset 2152 in ProjectBuilder for devel

Timestamp:

Dec 23, 2016, 2:21:42 AM (7 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:

• Conf.pm (modified) (1 diff)
• Distribution.pm (modified) (2 diffs)

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

@@ -65 +65 @@
 
 =head1 USAGE
+
+The configuration files are loaded in a specific order from most generic to the most specific 
+to allow for overwrite to work:
+
+1. /usr/share/pb/pb.conf    - the read-only system conf file provided by install
+2. /etc/pb/pb.conf          - the same global conf file given to the sysadmin in order to make system wide modifications
+3. /path/to/project.pb      - Configuration file for the project we're building for
+4. /(vm|ve|rm)path/to/.pbrc - configuration file for VM, VE or RM specific parameters. Cumulative should be orthogonal
+5. $HOME/.pbrc              - user's configuration file
 
 =over 4

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

@@ -132 +132 @@
 # the location of the conf file is finalyzed at install time
 # depending whether we deal with package install or tar file install
+
+pb_conf_add(pb_distro_sysconffile());
+
+# Similarly for the local file available for sysadmin. After the previous one to allow overwrite to work
 pb_conf_add(pb_distro_conffile());
-
-# Similarly for the local file available for sysadmin. After the previous one to allow overwrite to work
-pb_conf_add(pb_distro_sysconffile());
 
 # If we don't know which distribution we're on, then guess it
@@ -739 +740 @@
 =item B<pb_distro_conf_print>
 
-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.
+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. If parameters are passed, restrict again the display to these values only.
 
 =cut