From e1c36d138fb38cfe46cb236b87f092810075ef20 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 9 Feb 2023 16:15:11 +0300
Subject: Improve system_package_manager_fedora::pkg_install() and add some
 notes

---
 bpkg/system-package-manager-fedora.test.testscript | 46 ++++------------------
 1 file changed, 7 insertions(+), 39 deletions(-)

(limited to 'bpkg/system-package-manager-fedora.test.testscript')

diff --git a/bpkg/system-package-manager-fedora.test.testscript b/bpkg/system-package-manager-fedora.test.testscript
index b023673..ef37f07 100644
--- a/bpkg/system-package-manager-fedora.test.testscript
+++ b/bpkg/system-package-manager-fedora.test.testscript
@@ -301,9 +301,7 @@
       LC_ALL=C dnf list --all --cacheonly --quiet libpq-devel pq-devel rpm <libpq-devel+pq-devel.info
       LC_ALL=C dnf repoquery --requires --quiet --cacheonly --resolve --qf "%{name} %{arch} %{epoch}:%{version}-%{release}" libpq-devel-13.4-1.fc35.x86_64 <libpq-devel.requires
       LC_ALL=C dnf list --all --cacheonly --quiet libpq rpm <libpq.info
-      sudo dnf install --quiet --assumeno libpq-13.4-1.fc35 libpq-devel-13.4-1.fc35
-      sudo dnf mark --quiet --assumeno install --cacheonly libpq-13.4-1.fc35 libpq-devel-13.4-1.fc35
-      LC_ALL=C dnf list --all --cacheonly --quiet libpq rpm <libpq.info
+      sudo dnf mark --quiet --assumeno install --cacheonly libpq-13.4-1.fc35.x86_64 libpq-devel-13.4-1.fc35.x86_64
       EOE
       libpq 13.4 (libpq 13.4-1.fc35) installed
       EOO
@@ -645,9 +643,7 @@
       LC_ALL=C dnf list --all --cacheonly --quiet libsqlite3-devel sqlite-devel rpm <libsqlite3-devel+sqlite-devel.info
       LC_ALL=C dnf repoquery --requires --quiet --cacheonly --resolve --qf "%{name} %{arch} %{epoch}:%{version}-%{release}" sqlite-devel-3.36.0-3.fc35.x86_64 <sqlite-devel.requires
       LC_ALL=C dnf list --all --cacheonly --quiet sqlite-libs rpm <sqlite-libs.info
-      sudo dnf install --quiet --assumeno sqlite-libs-3.36.0-3.fc35 sqlite-devel-3.36.0-3.fc35
-      sudo dnf mark --quiet --assumeno install --cacheonly sqlite-libs-3.36.0-3.fc35 sqlite-devel-3.36.0-3.fc35
-      LC_ALL=C dnf list --all --cacheonly --quiet sqlite-libs rpm <sqlite-libs.info
+      sudo dnf mark --quiet --assumeno install --cacheonly sqlite-libs-3.36.0-3.fc35.x86_64 sqlite-devel-3.36.0-3.fc35.x86_64
       EOE
       libsqlite3 3.36.0 (sqlite-libs 3.36.0-3.fc35) installed
       EOO
@@ -763,17 +759,13 @@
       rpm.x86_64                                                                                                                      4.17.1-3.fc35                                                                                                                   updates
       sqlite.i686                                                                                                                     3.36.0-3.fc35                                                                                                                   fedora
       EOI
-    ln -s sqlite3+sqlite.info sqlite.info;
     $* sqlite3 --install sqlite3 <<EOI 2>>EOE >>EOO
       manifest: sqlite3 sqlite3.manifest
 
       dnf-list: sqlite3 sqlite sqlite3+sqlite.info
-      dnf-list: sqlite         sqlite.info
       EOI
       LC_ALL=C dnf list --all --cacheonly --quiet sqlite3 sqlite rpm <sqlite3+sqlite.info
-      sudo dnf install --quiet --assumeno sqlite-3.36.0-3.fc35
-      sudo dnf mark --quiet --assumeno install --cacheonly sqlite-3.36.0-3.fc35
-      LC_ALL=C dnf list --all --cacheonly --quiet sqlite rpm <sqlite.info
+      sudo dnf mark --quiet --assumeno install --cacheonly sqlite-3.36.0-3.fc35.x86_64
       EOE
       sqlite3 3.36.0 (sqlite 3.36.0-3.fc35) installed
       EOO
@@ -890,16 +882,6 @@
       ncurses-c++-libs.i686                                                                                     6.2-8.20210508.fc35                                                                              fedora
       ncurses-devel.i686                                                                                        6.2-8.20210508.fc35                                                                              fedora
       EOI
-    cat <<EOI >=ncurses-libs+ncurses-c++-libs.info-installed;
-      Installed Packages
-      rpm.x86_64                                                                                                4.17.1-2.fc35                                                                                    @updates
-      ncurses-c++-libs.x86_64                                                                                   6.2-8.20210508.fc35                                                                              @fedora
-      ncurses-libs.i686                                                                                         6.2-8.20210508.fc35                                                                              @fedora
-      ncurses-libs.x86_64                                                                                       6.2-8.20210508.fc35                                                                              @fedora
-      Available Packages
-      rpm.x86_64                                                                                                4.17.1-3.fc35                                                                                    updates
-      ncurses-c++-libs.i686                                                                                     6.2-8.20210508.fc35                                                                               fedora
-      EOI
     $* libncurses libncurses-c++ --install libncurses libncurses-c++ <<EOI 2>>EOE >>EOO
       manifest: libncurses     libncurses.manifest
       manifest: libncurses-c++ libncurses-c++.manifest
@@ -908,15 +890,12 @@
       dnf-repoquery-requires: ncurses-devel 6.2-8.20210508.fc35 x86_64 ncurses-devel.requires
       dnf-list:               ncurses-libs                             ncurses-libs.info
       dnf-list:               ncurses-c++-libs ncurses-devel           ncurses-c++-libs+ncurses-devel.info
-      dnf-list-installed:     ncurses-libs ncurses-c++-libs            ncurses-libs+ncurses-c++-libs.info-installed
       EOI
       LC_ALL=C dnf list --all --cacheonly --quiet libncurses-devel ncurses-devel rpm <libncurses-devel+ncurses-devel.info
       LC_ALL=C dnf repoquery --requires --quiet --cacheonly --resolve --qf "%{name} %{arch} %{epoch}:%{version}-%{release}" ncurses-devel-6.2-8.20210508.fc35.x86_64 <ncurses-devel.requires
       LC_ALL=C dnf list --all --cacheonly --quiet ncurses-libs rpm <ncurses-libs.info
       LC_ALL=C dnf list --all --cacheonly --quiet ncurses-c++-libs ncurses-devel rpm <ncurses-c++-libs+ncurses-devel.info
-      sudo dnf install --quiet --assumeno ncurses-libs-6.2-8.20210508.fc35 ncurses-devel-6.2-8.20210508.fc35 ncurses-c++-libs-6.2-8.20210508.fc35
-      sudo dnf mark --quiet --assumeno install --cacheonly ncurses-libs-6.2-8.20210508.fc35 ncurses-devel-6.2-8.20210508.fc35 ncurses-c++-libs-6.2-8.20210508.fc35
-      LC_ALL=C dnf list --all --cacheonly --quiet ncurses-libs ncurses-c++-libs rpm <ncurses-libs+ncurses-c++-libs.info-installed
+      sudo dnf mark --quiet --assumeno install --cacheonly ncurses-libs-6.2-8.20210508.fc35.x86_64 ncurses-devel-6.2-8.20210508.fc35.x86_64 ncurses-c++-libs-6.2-8.20210508.fc35.x86_64
       EOE
       libncurses 6.2.0 (ncurses-libs 6.2-8.20210508.fc35) installed
       libncurses-c++ 6.2.0 (ncurses-c++-libs 6.2-8.20210508.fc35) installed
@@ -1119,26 +1098,15 @@
       libsigc++20.i686                                                                                            2.10.7-3.fc35                                                                                    fedora
       libsigc++20-devel.i686                                                                                      2.10.7-3.fc35                                                                                    fedora
       EOI
-    cat <<EOI >=libsigc++20.info-installed;
-      Installed Packages
-      rpm.x86_64                                                                                                4.17.1-2.fc35                                                                                    @updates
-      libsigc++20.x86_64                                                                                        2.10.7-3.fc35                                                                                    @fedora
-      Available Packages
-      rpm.x86_64                                                                                                4.17.1-3.fc35                                                                                    updates
-      libsigc++20.i686                                                                                          2.10.7-3.fc35                                                                                    fedora
-      EOI
     $* libsigc++ --install libsigc++ <<EOI 2>>EOE >>EOO
       manifest: libsigc++ libsigc++.manifest
 
-      dnf-list:           libsigc++30 libsigc++30-devel libsigc++30+libsigc++30-devel.info
-      dnf-list:           libsigc++20 libsigc++20-devel libsigc++20+libsigc++20-devel.info
-      dnf-list-installed: libsigc++20                   libsigc++20.info-installed
+      dnf-list: libsigc++30 libsigc++30-devel libsigc++30+libsigc++30-devel.info
+      dnf-list: libsigc++20 libsigc++20-devel libsigc++20+libsigc++20-devel.info
       EOI
       LC_ALL=C dnf list --all --cacheonly --quiet libsigc++30 libsigc++30-devel rpm <libsigc++30+libsigc++30-devel.info
       LC_ALL=C dnf list --all --cacheonly --quiet libsigc++20 libsigc++20-devel rpm <libsigc++20+libsigc++20-devel.info
-      sudo dnf install --quiet --assumeno libsigc++20-2.10.7-3.fc35 libsigc++20-devel-2.10.7-3.fc35
-      sudo dnf mark --quiet --assumeno install --cacheonly libsigc++20-2.10.7-3.fc35 libsigc++20-devel-2.10.7-3.fc35
-      LC_ALL=C dnf list --all --cacheonly --quiet libsigc++20 rpm <libsigc++20.info-installed
+      sudo dnf mark --quiet --assumeno install --cacheonly libsigc++20-2.10.7-3.fc35.x86_64 libsigc++20-devel-2.10.7-3.fc35.x86_64
       EOE
       libsigc++ 2.10.7 (libsigc++20 2.10.7-3.fc35) installed
       EOO
-- 
cgit v1.1