Changeset 2152 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Distribution.pm

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

File:

• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)

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