dede5bd1d4
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=166
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From 2182f2cbc835fee8a95101ce0c722d582b7456aa Mon Sep 17 00:00:00 2001
|
|
From: Jochen Breuer <jbreuer@suse.de>
|
|
Date: Wed, 1 Apr 2020 16:13:23 +0200
|
|
Subject: [PATCH] Adds explicit type cast for port
|
|
|
|
If a port was passed as a string, the execution logic was broken
|
|
and a wrong set of remotes was returned.
|
|
|
|
The type casting to int solves this issue.
|
|
---
|
|
salt/utils/network.py | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/salt/utils/network.py b/salt/utils/network.py
|
|
index d6543ff160..def997f3dc 100644
|
|
--- a/salt/utils/network.py
|
|
+++ b/salt/utils/network.py
|
|
@@ -1457,9 +1457,9 @@ def _netlink_tool_remote_on(port, which_end):
|
|
local_host, local_port = chunks[3].rsplit(':', 1)
|
|
remote_host, remote_port = chunks[4].rsplit(':', 1)
|
|
|
|
- if which_end == 'remote_port' and int(remote_port) != port:
|
|
+ if which_end == 'remote_port' and int(remote_port) != int(port):
|
|
continue
|
|
- if which_end == 'local_port' and int(local_port) != port:
|
|
+ if which_end == 'local_port' and int(local_port) != int(port):
|
|
continue
|
|
remotes.add(remote_host.strip("[]"))
|
|
|
|
--
|
|
2.16.4
|
|
|
|
|