Changeset 2492 in ProjectBuilder

Timestamp:

Mar 31, 2020, 12:54:28 PM (5 years ago)

Author:

Bruno Cornec

Message:

Fixes for YAML::XS more strict

• quote % chars
• quote : chars
• quote boolean values used as text in pb

Location:

pbconf/devel

Files:

• ProjectBuilder/pbfilter/centos.yml (modified) (1 diff)
• ProjectBuilder/pbfilter/fedora.yml (modified) (1 diff)
• ProjectBuilder/pbfilter/redhat.yml (modified) (1 diff)
• ProjectBuilder/pbfilter/rhel-3.yml (modified) (1 diff)
• ProjectBuilder/pbfilter/rpm.yml (modified) (1 diff)
• ProjectBuilder/pbfilter/suse-10.0.yml (modified) (1 diff)
• pb.yml (modified) (1 diff)
• pbfilter/all.yml (modified) (2 diffs)
• pbfilter/rpm.yml (modified) (1 diff)
• pbmkbm/pbfilter/redhat.yml (modified) (1 diff)
• pbmkbm/pbfilter/rhel-3.yml (modified) (1 diff)
• pbmkbm/pbfilter/rpm.yml (modified) (1 diff)
• pbmkbm/pbfilter/suse-10.0.yml (modified) (1 diff)
• project-builder-server/pbfilter/centos.yml (modified) (1 diff)
• project-builder-server/pbfilter/fedora.yml (modified) (1 diff)
• project-builder-server/pbfilter/redhat.yml (modified) (1 diff)
• project-builder-server/pbfilter/rhel-3.yml (modified) (1 diff)
• project-builder-server/pbfilter/suse-10.0.yml (modified) (1 diff)
• project-builder/pbfilter/centos.yml (modified) (1 diff)
• project-builder/pbfilter/fedora.yml (modified) (1 diff)
• project-builder/pbfilter/redhat.yml (modified) (1 diff)
• project-builder/pbfilter/rhel-3.yml (modified) (1 diff)
• project-builder/pbfilter/suse-10.0.yml (modified) (1 diff)
• rpmbootstrap/pbfilter/redhat.yml (modified) (1 diff)
• rpmbootstrap/pbfilter/rhel-3.yml (modified) (1 diff)
• rpmbootstrap/pbfilter/suse-10.0.yml (modified) (1 diff)

pbconf/devel/ProjectBuilder/pbfilter/centos.yml

@@ -8 +8 @@
 #
 # PBDEP is replaced by the list of dependencies
-  PBBUILDDEP: BuildRequires: perl-Test-Simple
+  PBBUILDDEP: "BuildRequires: perl-Test-Simple"

pbconf/devel/ProjectBuilder/pbfilter/fedora.yml

@@ -8 +8 @@
 #
 # PBDEP is replaced by the list of dependencies
-  PBBUILDDEP: BuildRequires: perl-Test-Simple
+  PBBUILDDEP: "BuildRequires: perl-Test-Simple"

pbconf/devel/ProjectBuilder/pbfilter/redhat.yml

@@ -3 +3 @@
 # Special for pb : MakeMaker has various variable for the dest dir
 filter:
-  PBFINALDIR: %{_prefix}
+  PBFINALDIR: "%{_prefix}"
   PBKEYWORD: PREFIX

pbconf/devel/ProjectBuilder/pbfilter/rhel-3.yml

@@ -4 +4 @@
 filter:
   PBKEYWORD: PREFIX
-  PBFINALDIR: %{_prefix}
+  PBFINALDIR: "%{_prefix}"

pbconf/devel/ProjectBuilder/pbfilter/rpm.yml

@@ -12 +12 @@
 # PBDEP is replaced by the list of dependencies
   PBDEP: perl-YAML
-  PBBUILDDEP: BuildRequires: perl-YAML
+  PBBUILDDEP: "BuildRequires: perl-YAML"
 #
 # Special for pb : MakeMaker has various variable for the dest dir

pbconf/devel/ProjectBuilder/pbfilter/suse-10.0.yml

@@ -3 +3 @@
 # Special for pb : MakeMaker has various variable for the dest dir
 filter:
-  PBFINALDIR: %{_prefix}
+  PBFINALDIR: "%{_prefix}"
   PBBUILDDEP: !!str ""
   PBKEYWORD: PREFIX

pbconf/devel/pb.yml

@@ -62 +62 @@
 # Is it a test version
 testver:
-  pb: true
+  pb: 'true'
 delivery:
   pb: test

pbconf/devel/pbfilter/all.yml

@@ -6 +6 @@
 #
 filter:
-  PBMKTEST: %check$/make test
+  PBMKTEST: "%check$/make test"
   PBLIC: GPLv2
   PBURL: http://trac.project-builder.org
@@ -41 +41 @@
 # PBSRC is replaced by the source package format
 #
-  PBSRC: src/%{srcname}-%{version}$pb->{'extdir'}.tar.gz
+  PBSRC: "src/%{srcname}-%{version}$pb->{'extdir'}.tar.gz"
 #
 # PBDATE is replaced by the date ($pb->{'date'} in code)

pbconf/devel/pbfilter/rpm.yml

@@ -1 +1 @@
 ---
 filter:
-  PBPERLCMD: %{__perl}
+  PBPERLCMD: "%{__perl}"
   PBBUILDARCH: BuildArch

pbconf/devel/pbmkbm/pbfilter/redhat.yml

@@ -4 +4 @@
 filter:
   PBKEYWORD: PREFIX
-  PBFINALDIR: %{_prefix}
+  PBFINALDIR: "%{_prefix}"

pbconf/devel/pbmkbm/pbfilter/rhel-3.yml

@@ -3 +3 @@
 # Special for pb : MakeMaker has various variable for the dest dir
 filter:
-  PBFINALDIR: %{_prefix}
+  PBFINALDIR: "%{_prefix}"
   PBKEYWORD: PREFIX

pbconf/devel/pbmkbm/pbfilter/rpm.yml

@@ -17 +17 @@
 # PBBUILDDEP is replaced by the list of build dependencies
 #
-  PBBUILDDEP: BuildRequires: 
+  PBBUILDDEP: !!str ""
 #
 # Special for pb : MakeMaker has various variable for the dest dir

pbconf/devel/pbmkbm/pbfilter/suse-10.0.yml

@@ -3 +3 @@
 # Special for pb : MakeMaker has various variable for the dest dir
 filter:
-  PBFINALDIR: %{_prefix}
+  PBFINALDIR: "%{_prefix}"
   PBBUILDDEP: !!str ""
   PBKEYWORD: PREFIX

pbconf/devel/project-builder-server/pbfilter/centos.yml

@@ -8 +8 @@
 #
 # PBDEP is replaced by the list of dependencies
-  PBBUILDDEP: BuildRequires: perl-Test-Simple
+  PBBUILDDEP: "BuildRequires: perl-Test-Simple"

pbconf/devel/project-builder-server/pbfilter/fedora.yml

@@ -8 +8 @@
 #
 # PBDEP is replaced by the list of dependencies
-  PBBUILDDEP: BuildRequires: perl-Test-Simple
+  PBBUILDDEP: "BuildRequires: perl-Test-Simple"

pbconf/devel/project-builder-server/pbfilter/redhat.yml

@@ -3 +3 @@
 # Special for pb : MakeMaker has various variable for the dest dir
 filter:
-  PBFINALDIR: %{_prefix}
+  PBFINALDIR: "%{_prefix}"
   PBKEYWORD: PREFIX

pbconf/devel/project-builder-server/pbfilter/rhel-3.yml

@@ -4 +4 @@
 filter:
   PBKEYWORD: PREFIX
-  PBFINALDIR: %{_prefix}
+  PBFINALDIR: "%{_prefix}"

pbconf/devel/project-builder-server/pbfilter/suse-10.0.yml

@@ -3 +3 @@
 # Special for pb : MakeMaker has various variable for the dest dir
 filter:
-  PBFINALDIR: %{_prefix}
+  PBFINALDIR: "%{_prefix}"
   PBBUILDDEP: !!str ""
   PBKEYWORD: PREFIX

pbconf/devel/project-builder/pbfilter/centos.yml

@@ -9 +9 @@
 # PBBUILDDEP is replaced by the list of build dependencies
 #
-  PBBUILDDEP: BuildRequires: perl-Test-Simple
+  PBBUILDDEP: "BuildRequires: perl-Test-Simple"

pbconf/devel/project-builder/pbfilter/fedora.yml

@@ -9 +9 @@
 # PBBUILDDEP is replaced by the list of build dependencies
 #
-  PBBUILDDEP: BuildRequires: perl-Test-Simple
+  PBBUILDDEP: "BuildRequires: perl-Test-Simple"

pbconf/devel/project-builder/pbfilter/redhat.yml

@@ -3 +3 @@
 # Special for pb : MakeMaker has various variable for the dest dir
 filter:
-  PBFINALDIR: %{_prefix}
+  PBFINALDIR: "%{_prefix}"
   PBKEYWORD: PREFIX

pbconf/devel/project-builder/pbfilter/rhel-3.yml

@@ -4 +4 @@
 filter:
   PBKEYWORD: PREFIX
-  PBFINALDIR: %{_prefix}
+  PBFINALDIR: "%{_prefix}"

pbconf/devel/project-builder/pbfilter/suse-10.0.yml

@@ -6 +6 @@
   PBBUILDDEP: !!str ""
   PBKEYWORD: PREFIX
-  PBFINALDIR: %{_prefix}
+  PBFINALDIR: "%{_prefix}"

pbconf/devel/rpmbootstrap/pbfilter/redhat.yml

@@ -3 +3 @@
 # Special for pb : MakeMaker has various variable for the dest dir
 filter:
-  PBFINALDIR: %{_prefix}
+  PBFINALDIR: "%{_prefix}"
   PBKEYWORD: PREFIX

pbconf/devel/rpmbootstrap/pbfilter/rhel-3.yml

@@ -4 +4 @@
 filter:
   PBKEYWORD: PREFIX
-  PBFINALDIR: %{_prefix}
+  PBFINALDIR: "%{_prefix}"

pbconf/devel/rpmbootstrap/pbfilter/suse-10.0.yml

@@ -5 +5 @@
   PBBUILDDEP: !!str ""
   PBKEYWORD: PREFIX
-  PBFINALDIR: %{_prefix}
+  PBFINALDIR: "%{_prefix}"