c0d7cc4bb8
- Prepend current directory when path is just filename (bsc#1095942) - Integration of MSI authentication for azurearm - Adds fix for SUSE Expanded Support os grain detection - Fixes 509x remote signing - Fix for StringIO import in Python2 - Use Adler32 algorithm to compute string checksums (bsc#1102819) - Only do reverse DNS lookup on IPs for salt-ssh (bsc#1104154) - Add support for Python 3.7 - Fix license macro to build on SLE12SP2 - Decode file contents for python2 (bsc#1102013) - Fix for sorting of multi-version packages (bsc#1097174 and bsc#1097413) - Fix mine.get not returning data - workaround for #48020 (bsc#1100142) - Added: * change-stringio-import-in-python2-to-import-the-clas.patch * integration-of-msi-authentication-with-azurearm-clou.patch * x509-fixes-for-remote-signing-106.patch * fix-for-suse-expanded-support-detection.patch * only-do-reverse-dns-lookup-on-ips-for-salt-ssh.patch * prepend-current-directory-when-path-is-just-filename.patch * add-support-for-python-3.7.patch * decode-file-contents-for-python2-bsc-1102013.patch * fix-mine.get-not-returning-data-workaround-for-48020.patch * x509-fixes-111.patch * use-adler32-algorithm-to-compute-string-checksums.patch - Modified: * fix-for-sorting-of-multi-version-packages-bsc-109717.patch OBS-URL: https://build.opensuse.org/request/show/636187 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=129
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From f0f63dc8dd5979b51db71cf759d4350da1078383 Mon Sep 17 00:00:00 2001
|
|
From: Jochen Breuer <jbreuer@suse.de>
|
|
Date: Wed, 13 Jun 2018 17:51:13 +0200
|
|
Subject: [PATCH] Fix for sorting of multi-version packages (bsc#1097174
|
|
and bsc#1097413)
|
|
|
|
---
|
|
salt/modules/rpm.py | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/salt/modules/rpm.py b/salt/modules/rpm.py
|
|
index 3683234f59..8e71992f81 100644
|
|
--- a/salt/modules/rpm.py
|
|
+++ b/salt/modules/rpm.py
|
|
@@ -9,6 +9,7 @@ import logging
|
|
import os
|
|
import re
|
|
import datetime
|
|
+from distutils.version import LooseVersion
|
|
|
|
# Import Salt libs
|
|
import salt.utils.decorators.path
|
|
@@ -609,7 +610,7 @@ def info(*packages, **kwargs):
|
|
# pick only latest versions
|
|
# (in case multiple packages installed, e.g. kernel)
|
|
ret = dict()
|
|
- for pkg_data in reversed(sorted(_ret, key=lambda x: x['edition'])):
|
|
+ for pkg_data in reversed(sorted(_ret, key=lambda x: LooseVersion(x['edition']))):
|
|
pkg_name = pkg_data.pop('name')
|
|
# Filter out GPG public keys packages
|
|
if pkg_name.startswith('gpg-pubkey'):
|
|
--
|
|
2.17.1
|
|
|
|
|