Changeset 2257 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder

Timestamp:

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

Author:

Bruno Cornec

Message:

Remove mentions of YAML 1.0 for now as creating incorrect syntax

Location:

devel/pb-modules/lib/ProjectBuilder

Files:

• Conf.pm (modified) (3 diffs)
• Env.pm (modified) (18 diffs)

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

@@ -92 +92 @@
 
   $ cat $HOME/.pbrc.yml
-  --- %YAML 1.0
+  ---
     pbver:
       - pb: 3
@@ -540 +540 @@
 confess "Will not erase existing $dest while transforming $orig" if (-f $dest);
 open(DEST,"> $dest") || confess "Unable to write into $dest";
-print DEST "--- %YAML 1.0\n";
-my $parambkp = "";
+print DEST "---\n";
 my $pbconfverbkp = $PBCONFVER;
 # We force migration from v0 to v1
 $PBCONFVER = 0;
 my $lh0;
+my $lh1;
 $lh0 = pb_conf_cache($orig,$lh0);
+pb_log(2,"lh0:\n",Dumper($lh0),"\n");
 $PBCONFVER = $pbconfverbkp;
 
@@ -554 +555 @@
         # Keep comments
         print DEST $_;
+    } elsif ($_ =~ /^\s*$/) {
+        # Replace empty lines by comments
+        print DEST "#\n";;
     } else {
         if (/^\s*([A-z0-9-_]+)\s+(.+)$/) {
             # Handle parameters
-            my ($param,$var) = ($1, $2);
-            print DEST "  $param:\n" if ($param ne $parambkp);
-            print DEST "    $lh0->{$param} $lh0->{$param}->{$var}\n";
-            $parambkp = $param;
+            my ($param,$void) = ($1, $2);
+            if (not defined $lh1->{$param}) {
+                pb_log(2,"Converting parameter $param\n");
+                print DEST "$param:\n";
+                foreach my $k (keys %{$lh0->{$param}}) {
+                    pb_log(2,"Handling key $k\n");
+                    print DEST "  $k: $lh0->{$param}->{$k}\n";
+                }
+                $lh1->{$param} = 1;
+            }
         } else {
-            pb_log(0,"Unable to handle line $_\n");
+            pb_log(0,"Unable to convert line $_\n");
         }
     }

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

@@ -80 +80 @@
         open(PBRC, "> $ENV{'PBETC'}") || die "Unable to create $ENV{'PBETC'}";
         print PBRC << "EOF";
---- %YAML 1.0
+---
 #
 # Define for each project the URL of its pbconf repository
@@ -451 +451 @@
             open(CONF,"> $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb") || die "Unable to create $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb";
             print CONF << "EOF";
---- YAML 1.0
+---
 #
 # Project Builder configuration file
@@ -650 +650 @@
             open(CONF,"> $ENV{'PBROOTDIR'}/pbfilter/all.yml") || die "Unable to create $ENV{'PBROOTDIR'}/pbfilter/all.yml";
             print CONF << "EOF";
---- YAML 1.0
+---
 #
 # \$Id\$
@@ -722 +722 @@
             open(CONF,"> $ENV{'PBROOTDIR'}/pbfilter/rpm.yml") || die "Unable to create $ENV{'PBROOTDIR'}/pbfilter/rpm.yml";
             print CONF << "EOF";
---- YAML 1.0
+---
 #
 # \$Id\$
@@ -755 +755 @@
             open(CONF,"> $ENV{'PBROOTDIR'}/pbfilter/fedora.yml") || die "Unable to create $ENV{'PBROOTDIR'}/pbfilter/fedora.yml";
             print CONF << "EOF";
---- YAML 1.0
+---
 #
 # \$Id\$
@@ -786 +786 @@
                 open(CONF,"> $ENV{'PBROOTDIR'}/pbfilter/fedora-$i.yml") || die "Unable to create $ENV{'PBROOTDIR'}/pbfilter/fedora-$i.yml";
                 print CONF << "EOF";
---- YAML 1.0
+---
 #
 # \$Id\$
@@ -800 +800 @@
             open(CONF,"> $ENV{'PBROOTDIR'}/pbfilter/deb.yml") || die "Unable to create $ENV{'PBROOTDIR'}/pbfilter/deb.yml";
             print CONF << "EOF";
---- YAML 1.0
+---
 #
 # \$Id\$
@@ -829 +829 @@
             open(CONF,"> $ENV{'PBROOTDIR'}/pbfilter/debian-3.1.yml") || die "Unable to create $ENV{'PBROOTDIR'}/pbfilter/debian-3.1.yml";
             print CONF << "EOF";
---- YAML 1.0
+---
 #
 # \$Id\$
@@ -845 +845 @@
             open(CONF,"> $ENV{'PBROOTDIR'}/pbfilter/debian-4.0.yml") || die "Unable to create $ENV{'PBROOTDIR'}/pbfilter/debian-4.0.yml";
             print CONF << "EOF";
---- YAML 1.0
+---
 #
 # \$Id\$
@@ -861 +861 @@
             open(CONF,"> $ENV{'PBROOTDIR'}/pbfilter/debian-5.0.yml") || die "Unable to create $ENV{'PBROOTDIR'}/pbfilter/debian-5.0.yml";
             print CONF << "EOF";
---- YAML 1.0
+---
 #
 # \$Id\$
@@ -877 +877 @@
             open(CONF,"> $ENV{'PBROOTDIR'}/pbfilter/debian-6.0.yml") || die "Unable to create $ENV{'PBROOTDIR'}/pbfilter/debian-6.0.yml";
             print CONF << "EOF";
---- YAML 1.0
+---
 #
 # \$Id\$
@@ -893 +893 @@
             open(CONF,"> $ENV{'PBROOTDIR'}/pbfilter/debian.yml") || die "Unable to create $ENV{'PBROOTDIR'}/pbfilter/debian.yml";
             print CONF << "EOF";
---- YAML 1.0
+---
 #
 # \$Id\$
@@ -910 +910 @@
                 open(CONF,"> $ENV{'PBROOTDIR'}/pbfilter/$ubv") || die "Unable to create $ENV{'PBROOTDIR'}/pbfilter/$ubv";
                 print CONF << "EOF";
---- YAML 1.0
+---
 #
 # \$Id\$
@@ -928 +928 @@
                 open(CONF,"> $ENV{'PBROOTDIR'}/pbfilter/$ubv") || die "Unable to create $ENV{'PBROOTDIR'}/pbfilter/$ubv";
                 print CONF << "EOF";
---- YAML 1.0
+---
 #
 # \$Id\$
@@ -946 +946 @@
                 open(CONF,"> $ENV{'PBROOTDIR'}/pbfilter/$ubv") || die "Unable to create $ENV{'PBROOTDIR'}/pbfilter/$ubv";
                 print CONF << "EOF";
---- YAML 1.0
+---
 #
 # \$Id\$
@@ -965 +965 @@
                 open(CONF,"> $ENV{'PBROOTDIR'}/pbfilter/$ubv") || die "Unable to create $ENV{'PBROOTDIR'}/pbfilter/$ubv";
                 print CONF << "EOF";
---- YAML 1.0
+---
 #
 # \$Id\$
@@ -982 +982 @@
             open(CONF,"> $ENV{'PBROOTDIR'}/pbfilter/md.yml") || die "Unable to create $ENV{'PBROOTDIR'}/pbfilter/md.yml";
             print CONF << "EOF";
---- YAML 1.0
+---
 #
 # \$Id\$
@@ -999 +999 @@
             open(CONF,"> $ENV{'PBROOTDIR'}/pbfilter/novell.yml") || die "Unable to create $ENV{'PBROOTDIR'}/pbfilter/novell.yml";
             print CONF << "EOF";
---- YAML 1.0
+---
 #
 # \$Id\$