65598582f5
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=179
59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
From b9ba6875945e1ffafdeb862d8b2ac7fccd9cccf5 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
|
|
<psuarezhernandez@suse.com>
|
|
Date: Mon, 25 Jun 2018 13:06:40 +0100
|
|
Subject: [PATCH] Fix zypper.list_pkgs to be aligned with pkg state
|
|
|
|
Handle packages with multiple version properly with zypper
|
|
|
|
Add unit test coverage for multiple version packages on Zypper
|
|
|
|
Fix '_find_remove_targets' after aligning Zypper with pkg state
|
|
---
|
|
salt/states/pkg.py | 21 ---------------------
|
|
1 file changed, 21 deletions(-)
|
|
|
|
diff --git a/salt/states/pkg.py b/salt/states/pkg.py
|
|
index a1b2a122bb..f7327a33e3 100644
|
|
--- a/salt/states/pkg.py
|
|
+++ b/salt/states/pkg.py
|
|
@@ -477,16 +477,6 @@ def _find_remove_targets(
|
|
|
|
if __grains__["os"] == "FreeBSD" and origin:
|
|
cver = [k for k, v in cur_pkgs.items() if v["origin"] == pkgname]
|
|
- elif __grains__["os_family"] == "Suse":
|
|
- # On SUSE systems. Zypper returns packages without "arch" in name
|
|
- try:
|
|
- namepart, archpart = pkgname.rsplit(".", 1)
|
|
- except ValueError:
|
|
- cver = cur_pkgs.get(pkgname, [])
|
|
- else:
|
|
- if archpart in salt.utils.pkg.rpm.ARCHES + ("noarch",):
|
|
- pkgname = namepart
|
|
- cver = cur_pkgs.get(pkgname, [])
|
|
else:
|
|
cver = cur_pkgs.get(pkgname, [])
|
|
|
|
@@ -930,17 +920,6 @@ def _verify_install(desired, new_pkgs, ignore_epoch=None, new_caps=None):
|
|
cver = new_pkgs.get(pkgname.split("%")[0])
|
|
elif __grains__["os_family"] == "Debian":
|
|
cver = new_pkgs.get(pkgname.split("=")[0])
|
|
- elif __grains__["os_family"] == "Suse":
|
|
- # On SUSE systems. Zypper returns packages without "arch" in name
|
|
- try:
|
|
- namepart, archpart = pkgname.rsplit(".", 1)
|
|
- except ValueError:
|
|
- cver = new_pkgs.get(pkgname)
|
|
- else:
|
|
- if archpart in salt.utils.pkg.rpm.ARCHES + ("noarch",):
|
|
- cver = new_pkgs.get(namepart)
|
|
- else:
|
|
- cver = new_pkgs.get(pkgname)
|
|
else:
|
|
cver = new_pkgs.get(pkgname)
|
|
if not cver and pkgname in new_caps:
|
|
--
|
|
2.29.2
|
|
|
|
|