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

Timestamp:

Aug 28, 2016, 8:03:38 PM (8 years ago)

Author:

Bruno Cornec

Message:

Fix #115

The standard conf file is now under /usr/share/pb and the one under
/etc/pn is modifyable by the sysadmin is contains only comments by
default.

File:

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

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

@@ -33 +33 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_distro_init pb_distro_conffile pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_get_param pb_distro_get_context pb_distro_to_keylist pb_distro_conf_print pb_apply_conf_proxy);
+our @EXPORT = qw(pb_distro_init pb_distro_conffile pb_distro_sysconffile pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_get_param pb_distro_get_context pb_distro_to_keylist pb_distro_conf_print pb_apply_conf_proxy);
 ($VERSION,$REVISION) = pb_version_init();
 
@@ -78 +78 @@
 
 return("CCCC/pb.conf");
+}
+
+=item B<pb_distro_sysconffile>
+
+This function returns the optional configuration file used for local customization
+
+=cut
+
+sub pb_distro_sysconffile {
+
+return("SSSS/pb.conf");
 }
 
@@ -122 +133 @@
 # depending whether we deal with package install or tar file install
 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