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

Add salt-pip wrapper script

Browse source
This commit is contained in:
Daniel A. Wozniak 2022-12-21 13:25:00 -07:00 • committed by Pedro Algarvio
parent 16a02fc666
commit a600a8b4c1
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
salt/scripts.py
View file

@ -7,6 +7,7 @@ import functools
import logging import logging
import os import os
import signal import signal
import subprocess
import sys import sys
import threading import threading
import time import time
@ -585,3 +586,22 @@ def salt_unity():
sys.argv.pop(1) sys.argv.pop(1)
s_fun = getattr(sys.modules[__name__], "salt_{}".format(cmd)) s_fun = getattr(sys.modules[__name__], "salt_{}".format(cmd))
s_fun() s_fun()
def salt_pip():
"""
Proxy to current python's pip
"""
command = [
sys.executable,
"-m",
"pip",
] + sys.argv[1:]
proc = subprocess.Popen(command)
ret = None
while ret is None:
try:
ret = proc.wait(0.1)
except subprocess.TimeoutExpired:
pass
sys.exit(ret)

2
setup.py
View file

@ -1201,6 +1201,7 @@ class SaltDistribution(distutils.dist.Distribution):
[ [
"salt-cp = salt.scripts:salt_cp", "salt-cp = salt.scripts:salt_cp",
"salt-minion = salt.scripts:salt_minion", "salt-minion = salt.scripts:salt_minion",
"salt-pip = salt.scripts:salt_pip",
] ]
) )
entrypoints["console_scripts"] = scripts entrypoints["console_scripts"] = scripts
@ -1221,6 +1222,7 @@ class SaltDistribution(distutils.dist.Distribution):
"salt-syndic = salt.scripts:salt_syndic", "salt-syndic = salt.scripts:salt_syndic",
"spm = salt.scripts:salt_spm", "spm = salt.scripts:salt_spm",
"salt-proxy = salt.scripts:salt_proxy", "salt-proxy = salt.scripts:salt_proxy",
"salt-pip = salt.scripts:salt_pip",
] ]
) )
entrypoints["console_scripts"] = scripts entrypoints["console_scripts"] = scripts