mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Update pip before pyopenssl in cases where it is needed
This commit is contained in:
parent
1d1b0205c3
commit
f560451d34
2 changed files with 1 additions and 9 deletions
|
@ -50,15 +50,6 @@ def test_pip_install(salt_call_cli, install_salt, shell):
|
|||
repo = "https://github.com/saltstack/salt.git"
|
||||
|
||||
try:
|
||||
if (
|
||||
install_salt.classic
|
||||
and install_salt.distro_id == "debian"
|
||||
and install_salt.distro_version == "10"
|
||||
):
|
||||
pip_upgrade = salt_call_cli.run(
|
||||
"--local", "pip.install", "pip", "upgrade=True"
|
||||
)
|
||||
assert pip_upgrade.returncode == 0
|
||||
install = salt_call_cli.run("--local", "pip.install", dep)
|
||||
assert install.returncode == 0
|
||||
|
||||
|
|
|
@ -347,6 +347,7 @@ class SaltPkgInstall:
|
|||
}
|
||||
else:
|
||||
self.binary_paths["pip"] = [str(pathlib.Path("/usr/bin/pip3"))]
|
||||
self.proc.run(*self.binary_paths["pip"], "install", "-U", "pip")
|
||||
self.proc.run(
|
||||
*self.binary_paths["pip"], "install", "-U", "pyopenssl"
|
||||
)
|
||||
|
|
Loading…
Add table
Reference in a new issue