[libvirt] [jenkins-ci PATCH] guests: Fix locale handling

Andrea Bolognani posted 1 patch 4 years, 4 months ago
Failed in applying to current master (apply log)
guests/vars/mappings.yml      | 9 ++-------
guests/vars/projects/base.yml | 1 -
2 files changed, 2 insertions(+), 8 deletions(-)
[libvirt] [jenkins-ci PATCH] guests: Fix locale handling
Posted by Andrea Bolognani 4 years, 4 months ago
Commit 3ce973f2fb38 introduced a new glibc-langpack-en mapping in
order to make en_US.UTF-8 available on CentOS 8, but as it turns
out we already had a mapping for that and we just needed to tweak
it a bit.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 guests/vars/mappings.yml      | 9 ++-------
 guests/vars/projects/base.yml | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml
index 68664a0..d32ecf3 100644
--- a/guests/vars/mappings.yml
+++ b/guests/vars/mappings.yml
@@ -189,11 +189,6 @@ mappings:
     rpm: glibc-devel
     cross-policy-deb: foreign
 
-  glibc-langpack-en:
-    rpm: glibc-langpack-en
-    CentOS7:
-    OpenSUSE:
-
   glibc-static:
     deb: libc6-dev
     rpm: glibc-static
@@ -451,9 +446,9 @@ mappings:
     cross-policy-deb: foreign
 
   locales:
-    CentOS7: glibc-common
     deb: locales
-    Fedora: glibc-langpack-en
+    rpm: glibc-langpack-en
+    CentOS7: glibc-common
     FreeBSD:
     OpenSUSE: glibc-locale
 
diff --git a/guests/vars/projects/base.yml b/guests/vars/projects/base.yml
index 9ebf249..29c10b4 100644
--- a/guests/vars/projects/base.yml
+++ b/guests/vars/projects/base.yml
@@ -14,7 +14,6 @@ packages:
   - gettext
   - git
   - glibc
-  - glibc-langpack-en
   - libtool
   - libtoolize
   - locales
-- 
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [jenkins-ci PATCH] guests: Fix locale handling
Posted by Fabiano Fidêncio 4 years, 4 months ago
On Thu, Dec 12, 2019 at 12:35 PM Andrea Bolognani <abologna@redhat.com> wrote:
>
> Commit 3ce973f2fb38 introduced a new glibc-langpack-en mapping in
> order to make en_US.UTF-8 available on CentOS 8, but as it turns
> out we already had a mapping for that and we just needed to tweak
> it a bit.

Andrea, that was *my* bad. Sorry.

>
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>

Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>


--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [jenkins-ci PATCH] guests: Fix locale handling
Posted by Andrea Bolognani 4 years, 4 months ago
On Thu, 2019-12-12 at 12:52 +0100, Fabiano Fidêncio wrote:
> On Thu, Dec 12, 2019 at 12:35 PM Andrea Bolognani <abologna@redhat.com> wrote:
> > Commit 3ce973f2fb38 introduced a new glibc-langpack-en mapping in
> > order to make en_US.UTF-8 available on CentOS 8, but as it turns
> > out we already had a mapping for that and we just needed to tweak
> > it a bit.
> 
> Andrea, that was *my* bad. Sorry.

No worries, it's just as much my bad for not catching it during
review. What matters is that we fixed it :)

-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list