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

Fix errors with debug pkg

Browse source
This commit is contained in:
Megan Wilhite 2023-10-25 13:35:32 -06:00 • committed by Pedro Algarvio
parent e141799a94
commit c16434074f
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkg/tests/support/helpers.py
View file

@ -87,6 +87,7 @@ class SaltPkgInstall:
# Package (and management) metadata # Package (and management) metadata
pkg_mngr: str = attr.ib(init=False) pkg_mngr: str = attr.ib(init=False)
rm_pkg: str = attr.ib(init=False) rm_pkg: str = attr.ib(init=False)
dbg_pkg: str = attr.ib(init=False)
salt_pkgs: List[str] = attr.ib(init=False) salt_pkgs: List[str] = attr.ib(init=False)
pkgs: List[str] = attr.ib(factory=list) pkgs: List[str] = attr.ib(factory=list)
file_ext: bool = attr.ib(default=None) file_ext: bool = attr.ib(default=None)
@ -134,6 +135,15 @@ class SaltPkgInstall:
elif self.distro_id in ("ubuntu", "debian"): elif self.distro_id in ("ubuntu", "debian"):
return "purge" return "purge"
@dbg_pkg.default
def _default_dbg_pkg(self):
dbg_pkg = None
if self.distro_id in ("centos", "redhat", "amzn", "fedora", "photon"):
dbg_pkg = "salt-debuginfo"
elif self.distro_id in ("ubuntu", "debian"):
dbg_pkg = "salt-dbg"
return dbg_pkg
@salt_pkgs.default @salt_pkgs.default
def _default_salt_pkgs(self): def _default_salt_pkgs(self):
salt_pkgs = [ salt_pkgs = [
@ -146,12 +156,11 @@ class SaltPkgInstall:
] ]
if self.distro_id in ("centos", "redhat", "amzn", "fedora", "photon"): if self.distro_id in ("centos", "redhat", "amzn", "fedora", "photon"):
salt_pkgs.append("salt") salt_pkgs.append("salt")
dbg_pkg = "salt-debuginfo"
elif self.distro_id in ("ubuntu", "debian"): elif self.distro_id in ("ubuntu", "debian"):
salt_pkgs.append("salt-common") salt_pkgs.append("salt-common")
dbg_pkg = "salt-dbg"
if packaging.version.parse(self.version) >= packaging.version.parse("3006.3"): if packaging.version.parse(self.version) >= packaging.version.parse("3006.3"):
salt_pkgs.append(dbg_pkg) if self.dbg_pkg:
salt_pkgs.append(self.dbg_pkg)
return salt_pkgs return salt_pkgs
@install_dir.default @install_dir.default
@ -573,6 +582,11 @@ class SaltPkgInstall:
idx = list_ret.index("Available Packages") idx = list_ret.index("Available Packages")
old_ver = list_ret[idx + 1].split()[1] old_ver = list_ret[idx + 1].split()[1]
pkgs_to_install = [f"{pkg}-{old_ver}" for pkg in pkgs_to_install] pkgs_to_install = [f"{pkg}-{old_ver}" for pkg in pkgs_to_install]
if self.dbg_pkg:
# self.dbg_pkg does not exist on classic packages
dbg_exists = [x for x in pkgs_to_install if self.dbg_pkg in x]
if dbg_exists:
pkgs_to_install.remove(dbg_exists[0])
cmd_action = "install" cmd_action = "install"
ret = self.proc.run( ret = self.proc.run(
self.pkg_mngr, self.pkg_mngr,