aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Privoznik <mprivozn@redhat.com>2024-02-26 16:01:40 +0100
committerMichal Privoznik <mprivozn@redhat.com>2024-02-26 16:02:16 +0100
commit063937f80cea1050d8494f9d1ff7a57fd86f534c (patch)
tree6bae7cd87eadff7c7717153d8e116c786e80e52d
parent15e8abc7db981aee9703e9e143f8a6236c2f67f7 (diff)
downloadlibvirt-ci-063937f80cea1050d8494f9d1ff7a57fd86f534c.zip
libvirt-ci-063937f80cea1050d8494f9d1ff7a57fd86f534c.tar.gz
libvirt-ci-063937f80cea1050d8494f9d1ff7a57fd86f534c.tar.bz2
mappings: Switch the bash-completion to bash-completion-devel
While it may seem that bash-completion was split into two only in Fedora rawhide, that's not the entire truth. Firstly, this change was done in OpenSUSE distros ages years ago [1][2], but because of the default we're still installing just bash-completion. This results in Libvirt not detecting the corresponding pkg file (rightfully though) [3]. But instead of listing overrides for Fedora rawhide and OpenSUSE Leap and Tumbleweed let's switch the default and explicitly list 'older' distros (like CentOS, AlmaLinux, older Fedora) as these overrides will be removed progressively as we drop those distros. 1: https://build.opensuse.org/package/view_file/openSUSE:Leap:15.0/bash-completion/bash-completion.spec?expand=1 2: https://build.opensuse.org/package/view_file/openSUSE:Factory/bash-completion/bash-completion.spec?expand=1 3: https://gitlab.com/libvirt/libvirt/-/jobs/6258062679#L806 Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-rw-r--r--lcitool/facts/mappings.yml8
-rw-r--r--tests/data/packages/out/opensuse-leap-15.yml2
-rw-r--r--tests/data/packages/out/opensuse-tumbleweed.yml2
3 files changed, 9 insertions, 3 deletions
diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml
index 645437e..0a2db98 100644
--- a/lcitool/facts/mappings.yml
+++ b/lcitool/facts/mappings.yml
@@ -160,7 +160,13 @@ mappings:
bash-completion:
default: bash-completion
- FedoraRawhide: bash-completion-devel
+ rpm: bash-completion-devel
+ AlmaLinux8: bash-completion
+ AlmaLinux9: bash-completion
+ CentOSStream8: bash-completion
+ CentOSStream9: bash-completion
+ Fedora38: bash-completion
+ Fedora39: bash-completion
bc:
default: bc
diff --git a/tests/data/packages/out/opensuse-leap-15.yml b/tests/data/packages/out/opensuse-leap-15.yml
index b1f0a4c..54331e0 100644
--- a/tests/data/packages/out/opensuse-leap-15.yml
+++ b/tests/data/packages/out/opensuse-leap-15.yml
@@ -18,7 +18,7 @@ native:
- automake
- awk
- bash
-- bash-completion
+- bash-completion-devel
- bc
- bison
- brlapi-devel
diff --git a/tests/data/packages/out/opensuse-tumbleweed.yml b/tests/data/packages/out/opensuse-tumbleweed.yml
index 0995cdb..8f4665d 100644
--- a/tests/data/packages/out/opensuse-tumbleweed.yml
+++ b/tests/data/packages/out/opensuse-tumbleweed.yml
@@ -18,7 +18,7 @@ native:
- automake
- awk
- bash
-- bash-completion
+- bash-completion-devel
- bc
- bison
- brlapi-devel