saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

aptpkg: Fix installing 32-bit packages on 64-bit OS

Browse source 
This was broken because a normalize_name function was added to aptpkg,
which was incorrectly written. The pkg states use this function, if
present, to figure out whether or not the package architecture needs to
be stripped from the package name. However, this recently-added function
was *always* stripping the architecture, causing 32-bit suffixes to be
stripped.

This commit fixes the incorrect implementation of normalize_name and
adds a unit test.
This commit is contained in:
Erik Johnson 2020-05-04 21:18:13 -05:00 • committed by Daniel Wozniak
parent 1bee7c8a3a
commit eaa96bb59d
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/modules/aptpkg.py
View file

@ -212,10 +212,12 @@ def normalize_name(name):
salt '*' pkg.normalize_name zsh:amd64
"""
try:
name, arch = name.rsplit(PKG_ARCH_SEPARATOR, 1)
pkgname, pkgarch = name.rsplit(PKG_ARCH_SEPARATOR, 1)
except ValueError:
return name
return name
pkgname = name
pkgarch = __grains__["osarch"]
return pkgname if pkgarch in (__grains__["osarch"], "any") else name
def parse_arch(name):

16
tests/unit/modules/test_aptpkg.py
View file

@ -173,7 +173,7 @@ class AptPkgTestCase(TestCase, LoaderModuleMockMixin):
"""
def setup_loader_modules(self):
return {aptpkg: {}}
return {aptpkg: {"__grains__": {}}}
def test_version(self):
"""
@ -644,6 +644,20 @@ class AptPkgTestCase(TestCase, LoaderModuleMockMixin):
ret = aptpkg._skip_source(mock_source)
self.assertFalse(ret)
def test_normalize_name(self):
"""
Test that package is normalized only when it should be
"""
with patch.dict(aptpkg.__grains__, {"osarch": "amd64"}):
result = aptpkg.normalize_name("foo")
assert result == "foo", result
result = aptpkg.normalize_name("foo:amd64")
assert result == "foo", result
result = aptpkg.normalize_name("foo:any")
assert result == "foo", result
result = aptpkg.normalize_name("foo:i386")
assert result == "foo:i386", result
@skipIf(pytest is None, "PyTest is missing")
class AptUtilsTestCase(TestCase, LoaderModuleMockMixin):