Changeset 2241 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Conf.pm

Timestamp:

Aug 2, 2017, 6:16:44 PM (7 years ago)

Author:

Bruno Cornec

Message:

revert last commit as this is not ready yet for integration in that tree !

File:

• devel/pb-modules/lib/ProjectBuilder/Conf.pm (modified) (8 diffs)

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

@@ -19 +19 @@
 use ProjectBuilder::Base;
 use ProjectBuilder::Version;
+#use YAML;
 
 # Inherit from the "Exporter" module which handles exporting functions.
  
-use vars qw($VERSION $REVISION $PBCONFVER @ISA @EXPORT);
+use vars qw($VERSION $REVISION @ISA @EXPORT);
 use Exporter;
  
@@ -30 +31 @@
 our @ISA = qw(Exporter);
 our @EXPORT = qw(pb_conf_init pb_conf_add pb_conf_read pb_conf_read_if pb_conf_write pb_conf_get pb_conf_get_if pb_conf_get_all pb_conf_get_hash pb_conf_cache);
-($VERSION,$REVISION,$PBCONFVER) = pb_version_init();
+($VERSION,$REVISION) = pb_version_init();
 
 # Global hash of conf files
@@ -69 +70 @@
 to allow for overwrite to work:
 
-1. /usr/share/pb/pb.yml    - the read-only system conf file provided by install
-2. /etc/pb/pb.yml          - the same global conf file given to the sysadmin in order to make system wide modifications
+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
@@ -123 +124 @@
 my $cf = shift;
 my $lh = shift;
-
-my $ldfunc;
-
-eval {
-    require YAML;
-    YAML->import();
-    $ldfunc = \&YAML::LoadFile;
-};
-if ($@) {
-    # No YAML found using a more std but less complete one. Old perl only
-    use Module::Build::YAML;
-    $ldfunc = \&Module::Build::YAML::LoadFile;
-}
+my $confver = "0.14";
 
 # Read the content of the config file and cache it in the %h hash then available for queries
-if ($PBCONFVER < 1) {
+if ($confver < 0.15) {
     open(CONF,$cf) || confess "Unable to open $cf";
     # This is the original conf file format for versions up to 0.14
@@ -150 +139 @@
     close(CONF);
 } else {
-    $lh = $ldfunc->($cf);
+    $lh = LoadFile($cf);
 }
 return($lh);
@@ -262 +251 @@
 my $conffile = shift;
 my $h = shift;
-my $dpfunc;
-
-eval {
-    require YAML;
-    YAML->import();
-    $dpfunc = \&YAML::Dump;
-};
-if ($@) {
-    # No YAML found using a more std but less complete one. Old perl only
-    use Module::Build::YAML;
-    $dpfunc = \&Module::Build::YAML::Dump;
-}
+my $confver = "0.14";
 
 confess "No configuration file defined to write into !" if (not defined $conffile);
@@ -279 +257 @@
 open(CONF,"> $conffile") || confess "Unable to write into $conffile";
 
-if ($PBCONFVER < 1) {
+if ($confver < 0.15) {
     # This is the original conf file format for versions up to 0.14
     foreach my $p (sort keys %$h) {
@@ -289 +267 @@
 } else {
     # This is the new YAML format
-    print CONF $dpfunc->($h);
+    print CONF Dump($h);
 }
 close(CONF);