Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2018-05-10 15:50:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "salt" Thu May 10 15:50:31 2018 rev:76 rq:605690 version:2018.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2018-04-30 22:59:33.495104654 +0200 +++ /work/SRC/openSUSE:Factory/.salt.new/salt.changes 2018-05-10 15:50:34.214690205 +0200 @@ -1,0 +2,8 @@ +Fri May 4 12:17:07 UTC 2018 - Jochen Breuer <[email protected]> + +- Fixed Python 3 issue with CIDR addresses. + +- Added: + * fixed-usage-of-ipaddress.patch + +------------------------------------------------------------------- New: ---- fixed-usage-of-ipaddress.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.4nlao9/_old 2018-05-10 15:50:35.302650330 +0200 +++ /var/tmp/diff_new_pack.4nlao9/_new 2018-05-10 15:50:35.306650184 +0200 @@ -96,6 +96,8 @@ Patch18: provide-kwargs-to-pkg_resource.parse_targets-require.patch # PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/47270 Patch19: initialize-__context__-retcode-for-functions-handled.patch +# PATCH-FIX_UPSTREAM https://github.com/saltstack/salt/pull/47232 +Patch20: fixed-usage-of-ipaddress.patch # BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -574,6 +576,7 @@ %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 %build %if 0%{?build_py2} ++++++ _lastrevision ++++++ --- /var/tmp/diff_new_pack.4nlao9/_old 2018-05-10 15:50:35.362648132 +0200 +++ /var/tmp/diff_new_pack.4nlao9/_new 2018-05-10 15:50:35.362648132 +0200 @@ -1 +1 @@ -057b96d7f072dc69b61ca9e3b8d04a890003e58f \ No newline at end of file +191f12d1f56ce5b5645ae420da0392941bcb2de4 \ No newline at end of file ++++++ fixed-usage-of-ipaddress.patch ++++++ >From 205e031f6e5552ac860120f7ac852e24c5da73e5 Mon Sep 17 00:00:00 2001 From: Jochen Breuer <[email protected]> Date: Sun, 22 Apr 2018 23:11:11 +0200 Subject: [PATCH] Fixed usage of ipaddress ipaddress is imported either directly or from salt.ext. If we use it, we shouldn't address it with salt.ext.ipaddress. --- salt/modules/network.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/modules/network.py b/salt/modules/network.py index f188fd7954..92893572a6 100644 --- a/salt/modules/network.py +++ b/salt/modules/network.py @@ -1140,7 +1140,7 @@ def convert_cidr(cidr): ret = {'network': None, 'netmask': None} cidr = calc_net(cidr) - network_info = salt.ext.ipaddress.ip_network(cidr) + network_info = ipaddress.ip_network(cidr) ret['network'] = six.text_type(network_info.network_address) ret['netmask'] = six.text_type(network_info.netmask) return ret -- 2.13.6
