File add-environment-variable-to-know-if-yum-is-invoked-f.patch of Package salt.7664
From 1fba2e4e22be5e52af468af701d351723fa6a869 Mon Sep 17 00:00:00 2001
From: Marcelo Chiaradia <mchiaradia@suse.com>
Date: Thu, 7 Jun 2018 10:29:41 +0200
Subject: [PATCH] Add environment variable to know if yum is invoked from
Salt(bsc#1057635)
---
salt/modules/yumpkg.py | 59 +++++++++++++++++++++++++++++++++-----------------
1 file changed, 39 insertions(+), 20 deletions(-)
diff --git a/salt/modules/yumpkg.py b/salt/modules/yumpkg.py
index 42eedca227..84600ea2ec 100644
--- a/salt/modules/yumpkg.py
+++ b/salt/modules/yumpkg.py
@@ -452,7 +452,8 @@ def latest_version(*names, **kwargs):
out = __salt__['cmd.run_all'](cmd,
output_loglevel='trace',
ignore_retcode=True,
- python_shell=False)
+ python_shell=False,
+ env={"SALT_RUNNING": '1'})
if out['retcode'] != 0:
if out['stderr']:
# Check first if this is just a matter of the packages being
@@ -850,7 +851,8 @@ def list_repo_pkgs(*args, **kwargs):
yum_version = None if _yum() != 'yum' else _LooseVersion(
__salt__['cmd.run'](
['yum', '--version'],
- python_shell=False
+ python_shell=False,
+ env={"SALT_RUNNING": '1'}
).splitlines()[0].strip()
)
# Really old version of yum; does not even have --showduplicates option
@@ -865,7 +867,8 @@ def list_repo_pkgs(*args, **kwargs):
cmd_prefix + [pkg_src],
output_loglevel='trace',
ignore_retcode=True,
- python_shell=False
+ python_shell=False,
+ env={"SALT_RUNNING": '1'}
)
if out['retcode'] == 0:
_parse_output(out['stdout'], strict=True)
@@ -882,7 +885,8 @@ def list_repo_pkgs(*args, **kwargs):
cmd_prefix + [pkg_src],
output_loglevel='trace',
ignore_retcode=True,
- python_shell=False
+ python_shell=False,
+ env={"SALT_RUNNING": '1'}
)
if out['retcode'] == 0:
_parse_output(out['stdout'], strict=True)
@@ -898,7 +902,8 @@ def list_repo_pkgs(*args, **kwargs):
out = __salt__['cmd.run_all'](cmd,
output_loglevel='trace',
ignore_retcode=True,
- python_shell=False)
+ python_shell=False,
+ env={"SALT_RUNNING": '1'})
if out['retcode'] != 0 and 'Error:' in out['stdout']:
continue
_parse_output(out['stdout'])
@@ -955,7 +960,8 @@ def list_upgrades(refresh=True, **kwargs):
out = __salt__['cmd.run_all'](cmd,
output_loglevel='trace',
ignore_retcode=True,
- python_shell=False)
+ python_shell=False,
+ env={"SALT_RUNNING": '1'})
if out['retcode'] != 0 and 'Error:' in out:
return {}
@@ -1090,12 +1096,13 @@ def refresh_db(**kwargs):
clean_cmd.extend(options)
update_cmd.extend(options)
- __salt__['cmd.run'](clean_cmd, python_shell=False)
+ __salt__['cmd.run'](clean_cmd, python_shell=False, env={"SALT_RUNNING": '1'})
if check_update_:
result = __salt__['cmd.retcode'](update_cmd,
output_loglevel='trace',
ignore_retcode=True,
- python_shell=False)
+ python_shell=False,
+ env={"SALT_RUNNING": '1'})
return retcodes.get(result, False)
return True
@@ -1634,7 +1641,8 @@ def install(name=None,
cmd,
output_loglevel='trace',
python_shell=False,
- redirect_stderr=True
+ redirect_stderr=True,
+ env={"SALT_RUNNING": '1'}
)
if out['retcode'] != 0:
errors.append(out['stdout'])
@@ -1654,7 +1662,8 @@ def install(name=None,
cmd,
output_loglevel='trace',
python_shell=False,
- redirect_stderr=True
+ redirect_stderr=True,
+ env={"SALT_RUNNING": '1'}
)
if out['retcode'] != 0:
errors.append(out['stdout'])
@@ -1674,7 +1683,8 @@ def install(name=None,
cmd,
output_loglevel='trace',
python_shell=False,
- redirect_stderr=True
+ redirect_stderr=True,
+ env={"SALT_RUNNING": '1'}
)
if out['retcode'] != 0:
errors.append(out['stdout'])
@@ -1866,7 +1876,8 @@ def upgrade(name=None,
result = __salt__['cmd.run_all'](cmd,
output_loglevel='trace',
- python_shell=False)
+ python_shell=False,
+ env={"SALT_RUNNING": '1'})
__context__.pop('pkg.list_pkgs', None)
new = list_pkgs()
ret = salt.utils.data.compare_dicts(old, new)
@@ -1957,7 +1968,8 @@ def remove(name=None, pkgs=None, **kwargs): # pylint: disable=W0613
out = __salt__['cmd.run_all'](
[_yum(), '-y', 'remove'] + targets,
output_loglevel='trace',
- python_shell=False
+ python_shell=False,
+ env={"SALT_RUNNING": '1'}
)
if out['retcode'] != 0 and out['stderr']:
@@ -2094,7 +2106,8 @@ def hold(name=None, pkgs=None, sources=None, normalize=True, **kwargs): # pylin
else:
out = __salt__['cmd.run_all'](
[_yum(), 'versionlock', target],
- python_shell=False
+ python_shell=False,
+ env={"SALT_RUNNING": '1'}
)
if out['retcode'] == 0:
@@ -2203,7 +2216,8 @@ def unhold(name=None, pkgs=None, sources=None, **kwargs): # pylint: disable=W06
else:
out = __salt__['cmd.run_all'](
[_yum(), 'versionlock', 'delete'] + search_locks,
- python_shell=False
+ python_shell=False,
+ env={"SALT_RUNNING": '1'}
)
if out['retcode'] == 0:
@@ -2254,7 +2268,8 @@ def list_holds(pattern=__HOLD_PATTERN, full=True):
_check_versionlock()
out = __salt__['cmd.run']([_yum(), 'versionlock', 'list'],
- python_shell=False)
+ python_shell=False,
+ env={"SALT_RUNNING": '1'})
ret = []
for line in salt.utils.itertools.split(out, '\n'):
match = _get_hold(line, pattern=pattern, full=full)
@@ -2319,7 +2334,8 @@ def group_list():
out = __salt__['cmd.run_stdout'](
[_yum(), 'grouplist', 'hidden'],
output_loglevel='trace',
- python_shell=False
+ python_shell=False,
+ env={"SALT_RUNNING": '1'}
)
key = None
for line in salt.utils.itertools.split(out, '\n'):
@@ -2386,7 +2402,8 @@ def group_info(name, expand=False):
out = __salt__['cmd.run_stdout'](
cmd,
output_loglevel='trace',
- python_shell=False
+ python_shell=False,
+ env={"SALT_RUNNING": '1'}
)
g_info = {}
@@ -3041,7 +3058,8 @@ def download(*packages):
__salt__['cmd.run'](
cmd,
output_loglevel='trace',
- python_shell=False
+ python_shell=False,
+ env={"SALT_RUNNING": '1'}
)
ret = {}
for dld_result in os.listdir(CACHE_DIR):
@@ -3116,7 +3134,8 @@ def _get_patches(installed_only=False):
cmd = [_yum(), '--quiet', 'updateinfo', 'list', 'all']
ret = __salt__['cmd.run_stdout'](
cmd,
- python_shell=False
+ python_shell=False,
+ env={"SALT_RUNNING": '1'}
)
for line in salt.utils.itertools.split(ret, os.linesep):
inst, advisory_id, sev, pkg = re.match(r'([i|\s]) ([^\s]+) +([^\s]+) +([^\s]+)',
--
2.15.1
