valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix parse_host_port() parse error on hostname only arg

Browse Source
This commit is contained in:
Jeremy McMillan 2019-01-01 15:30:47 -06:00 committed by Pedro Algarvio
parent 571603c4ce
commit 080ab702c1
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/utils/network.py
View File

@ -236,8 +236,13 @@ def get_fqhostname():
"""
Returns the fully qualified hostname
"""
<<<<<<< HEAD
fqdn = []
fqdn.append(socket.getfqdn())
=======
l = []
l.append(socket.getfqdn())
>>>>>>> fix parse_host_port() parse error on hostname only arg
# try socket.getaddrinfo
try: