34c4e47c9b
- Allow NamedLoaderContexts to be returned from loader - Revert the change making reactor less blocking (bsc#1230322) - Use --cachedir for extension_modules in salt-call (bsc#1226141) - Prevent using SyncWrapper with no reason - Added: * avoid-explicit-reading-of-etc-salt-minion-bsc-122035.patch * allow-namedloadercontexts-to-be-returned-from-loader.patch * revert-the-change-making-reactor-less-blocking-bsc-1.patch * use-cachedir-for-extension_modules-in-salt-call-bsc-.patch * prevent-using-syncwrapper-with-no-reason.patch OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=259
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
From c61da0bef8d4d8394592db2f9995cdf4820c02af Mon Sep 17 00:00:00 2001
|
|
From: Alexander Graul <agraul@suse.com>
|
|
Date: Mon, 27 Feb 2023 11:35:41 +0100
|
|
Subject: [PATCH] Skip package names without colon (bsc#1208691) (#578)
|
|
|
|
Fixes a problem in `_find_ptf_packages()` when passing multiple packages to `zypperpkg.remove` / `zypperpkg.purge`. The problem occurs when a passed package is not installed, in that case the output of the `rpm` subprocess is not parsed correctly.
|
|
---
|
|
salt/modules/zypperpkg.py | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/salt/modules/zypperpkg.py b/salt/modules/zypperpkg.py
|
|
index 44f2cdbd3a..cdec397d69 100644
|
|
--- a/salt/modules/zypperpkg.py
|
|
+++ b/salt/modules/zypperpkg.py
|
|
@@ -2688,6 +2688,8 @@ def _find_ptf_packages(pkgs, root=None):
|
|
for line in output.splitlines():
|
|
if not line.strip():
|
|
continue
|
|
+ if ":" not in line:
|
|
+ continue
|
|
pkg, provides = line.split(":", 1)
|
|
if "ptf()" in provides:
|
|
ptfs.append(pkg)
|
|
--
|
|
2.39.2
|
|
|
|
|