dede5bd1d4
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=166
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From 7e9adda8dfd53050756d0ac0cf64570b76ce7365 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
|
|
<psuarezhernandez@suse.com>
|
|
Date: Wed, 13 Mar 2019 16:14:07 +0000
|
|
Subject: [PATCH] Do not report patches as installed when not all the
|
|
related packages are installed (bsc#1128061)
|
|
|
|
Co-authored-by: Mihai Dinca <mdinca@suse.de>
|
|
---
|
|
salt/modules/yumpkg.py | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/salt/modules/yumpkg.py b/salt/modules/yumpkg.py
|
|
index b1257d0de0..3ddf989511 100644
|
|
--- a/salt/modules/yumpkg.py
|
|
+++ b/salt/modules/yumpkg.py
|
|
@@ -3220,7 +3220,11 @@ def _get_patches(installed_only=False):
|
|
for line in salt.utils.itertools.split(ret, os.linesep):
|
|
inst, advisory_id, sev, pkg = re.match(r'([i|\s]) ([^\s]+) +([^\s]+) +([^\s]+)',
|
|
line).groups()
|
|
+<<<<<<< HEAD
|
|
if advisory_id not in patches:
|
|
+=======
|
|
+ if not advisory_id in patches:
|
|
+>>>>>>> Do not report patches as installed when not all the related packages are installed (bsc#1128061)
|
|
patches[advisory_id] = {
|
|
'installed': True if inst == 'i' else False,
|
|
'summary': [pkg]
|
|
--
|
|
2.16.4
|
|
|
|
|