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

Timestamp:

Aug 30, 2017, 5:07:28 PM (7 years ago)

Author:

Bruno Cornec

Message:

pbdistrocheck + YAML works

• Fix for yml main conf file to avoid duplicates
• Fix for require analysis for YAML module
• pbdistrocheck works with the main pb.yml file.
• Need to convert all other configuration files into YAML format

File:

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

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

@@ -124 +124 @@
 my $cf = shift;
 my $lh = shift;
-my $confver = "0.14";
+
+my $ldfunc;
 
 # Read the content of the config file and cache it in the %h hash then available for queries
@@ -139 +140 @@
     close(CONF);
 } else {
-    $lh = LoadFile($cf);
+    eval {
+        require YAML;
+        YAML->import();
+    };
+    if ($@) {
+        eval {
+            # No YAML found using a more std but less complete one. Old perl only
+            require Module::Build::YAML;
+            Module::Build::YAML->import();
+        };
+        if ($@) {
+            die "Unable to handle YAML configuration files without a YAML.pm module\n";
+        } else {
+            $ldfunc = \&Module::Build::YAML::LoadFile;
+        }
+    } else {
+        $ldfunc = \&YAML::LoadFile;
+    }
+
+    $lh = $ldfunc->($cf);
 }
 return($lh);
@@ -251 +271 @@
 my $conffile = shift;
 my $h = shift;
-my $confver = "0.14";
+my $dpfunc;
 
 confess "No configuration file defined to write into !" if (not defined $conffile);
@@ -267 +287 @@
 } else {
     # This is the new YAML format
-    print CONF Dump($h);
+    eval {
+        require YAML;
+        YAML->import();
+    };
+    if ($@) {
+        eval {
+            # No YAML found using a more std but less complete one. Old perl only
+            require Module::Build::YAML;
+            Module::Build::YAML->import();
+        };
+        if ($@) {
+            die "Unable to handle YAML configuration files without a YAML.pm module\n";
+        } else {
+            $dpfunc = \&Module::Build::YAML::Dump;
+        }
+    } else {
+        $dpfunc = \&YAML::Dump;
+    }
+
+    print CONF $dpfunc->($h);
 }
 close(CONF);