From 93c0630b84b9da89acaf549a5c79e5d834c70a65 Mon Sep 17 00:00:00 2001 From: Jochen Breuer Date: Thu, 5 Mar 2020 21:01:31 +0100 Subject: [PATCH] Removes unresolved merge conflict in yumpkg module --- salt/modules/yumpkg.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/salt/modules/yumpkg.py b/salt/modules/yumpkg.py index 88d74020b3..04ab240cd4 100644 --- a/salt/modules/yumpkg.py +++ b/salt/modules/yumpkg.py @@ -3220,11 +3220,7 @@ 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