59 lines
2.3 KiB
Diff
59 lines
2.3 KiB
Diff
|
From e7723f081cc79088156a986cf940349fec7f00a3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Victor Zhestkov <35733135+vzhestkov@users.noreply.github.com>
|
||
|
|
Date: Wed, 18 Aug 2021 15:05:42 +0300
|
||
|
|
Subject: [PATCH] Add missing aarch64 to rpm package architectures
|
||
|
|
(#405)
|
||
|
|
|
||
|
|
Required to prevent false negative results on using pkg.installed
|
||
|
|
with architecture specification in package name (ex. `bash.aarch64`)
|
||
|
|
---
|
||
|
|
salt/utils/pkg/rpm.py | 2 +-
|
||
|
|
tests/unit/modules/test_zypperpkg.py | 20 ++++++++++++++++++++
|
||
|
|
2 files changed, 21 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/salt/utils/pkg/rpm.py b/salt/utils/pkg/rpm.py
|
||
|
|
index d1b149ea0b..8b8ea2e4b1 100644
|
||
|
|
--- a/salt/utils/pkg/rpm.py
|
||
|
|
+++ b/salt/utils/pkg/rpm.py
|
||
|
|
@@ -33,7 +33,7 @@ ARCHES_ALPHA = (
|
||
|
|
"alphaev68",
|
||
|
|
"alphaev7",
|
||
|
|
)
|
||
|
|
-ARCHES_ARM = ("armv5tel", "armv5tejl", "armv6l", "armv7l")
|
||
|
|
+ARCHES_ARM = ("armv5tel", "armv5tejl", "armv6l", "armv7l", "aarch64")
|
||
|
|
ARCHES_SH = ("sh3", "sh4", "sh4a")
|
||
|
|
|
||
|
|
ARCHES = (
|
||
|
|
diff --git a/tests/unit/modules/test_zypperpkg.py b/tests/unit/modules/test_zypperpkg.py
|
||
|
|
index 5c01bbbfbd..d6a6a6d852 100644
|
||
|
|
--- a/tests/unit/modules/test_zypperpkg.py
|
||
|
|
+++ b/tests/unit/modules/test_zypperpkg.py
|
||
|
|
@@ -2477,3 +2477,23 @@ pattern() = package-c"""
|
||
|
|
with patch("salt.modules.zypperpkg.__zypper__", zypper_mock):
|
||
|
|
assert zypper.services_need_restart() == expected
|
||
|
|
zypper_mock(root=None).nolock.call.assert_called_with("ps", "-sss")
|
||
|
|
+
|
||
|
|
+ def test_normalize_name(self):
|
||
|
|
+ """
|
||
|
|
+ Test that package is normalized only when it should be
|
||
|
|
+ """
|
||
|
|
+ with patch.dict(zypper.__grains__, {"osarch": "x86_64"}):
|
||
|
|
+ result = zypper.normalize_name("foo")
|
||
|
|
+ assert result == "foo", result
|
||
|
|
+ result = zypper.normalize_name("foo.x86_64")
|
||
|
|
+ assert result == "foo", result
|
||
|
|
+ result = zypper.normalize_name("foo.noarch")
|
||
|
|
+ assert result == "foo", result
|
||
|
|
+
|
||
|
|
+ with patch.dict(zypper.__grains__, {"osarch": "aarch64"}):
|
||
|
|
+ result = zypper.normalize_name("foo")
|
||
|
|
+ assert result == "foo", result
|
||
|
|
+ result = zypper.normalize_name("foo.aarch64")
|
||
|
|
+ assert result == "foo", result
|
||
|
|
+ result = zypper.normalize_name("foo.noarch")
|
||
|
|
+ assert result == "foo", result
|
||
|
|
--
|
||
|
|
2.32.0
|
||
|
|
|
||
|
|
|