Merge pull request #5322 from KKoukiou/fix-rpms-keys-arch

Use 'os.uname().machine' to get machine architecture instead of 'uname -i'
rhinstaller · Nov 20, 2023 · 97983a6 · 97983a6
2 parents 71b76dd + 26a6ecd
commit 97983a6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pyanaconda/modules/payloads/payload/dnf/installation.py b/pyanaconda/modules/payloads/payload/dnf/installation.py
@@ -360,7 +360,7 @@ def run(self):
 
         # Get substitutions for variables.
         # TODO: replace the interpolation with DNF once possible
-        basearch = util.execWithCapture("uname", ["-i"]).strip().replace("'", "")
+        basearch = os.uname().machine
         releasever = util.get_os_release_value("VERSION_ID", sysroot=self._sysroot) or ""
 
         # Import GPG keys to RPM database.

diff --git a/...t_tests/pyanaconda_tests/modules/payloads/payload/test_module_payload_dnf_installation.py b/...t_tests/pyanaconda_tests/modules/payloads/payload/test_module_payload_dnf_installation.py
@@ -196,11 +196,12 @@ def test_import_keys(self, mock_exec):
                 call("rpm", ["--import", key_2], root=sysroot),
             ])
 
+    @patch("pyanaconda.modules.payloads.payload.dnf.installation.os.uname")
     @patch("pyanaconda.modules.payloads.payload.dnf.installation.util")
-    def test_import_substitution(self, mock_util):
+    def test_import_substitution(self, mock_util, mock_uname):
         """Import GPG keys with variables."""
         mock_util.execWithRedirect.return_value = 0
-        mock_util.execWithCapture.return_value = "s390x"
+        mock_uname.return_value = Mock(machine='s390x')
         mock_util.get_os_release_value.return_value = "34"
 
         key = "/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch"