Handle more ipv6 error as an exception #33299 (#33300)

* Handle ipv6 exception in scp_file() * Handle ipv6 exception in sftp_file()
saltstack · May 17, 2016 · 7a181f2 · 7a181f2
1 parent eb47a15
commit 7a181f2
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/salt/utils/cloud.py b/salt/utils/cloud.py
@@ -1836,9 +1836,12 @@ def scp_file(dest_path, contents=None, kwargs=None, local_file=None):
             )
         )
 
-    if socket.inet_pton(socket.AF_INET6, kwargs['hostname']):
-        ipaddr = '[{0}]'.format(kwargs['hostname'])
-    else:
+    try:
+        if socket.inet_pton(socket.AF_INET6, kwargs['hostname']):
+            ipaddr = '[{0}]'.format(kwargs['hostname'])
+        else:
+            ipaddr = kwargs['hostname']
+    except socket.error:
         ipaddr = kwargs['hostname']
 
     cmd = (
@@ -1943,9 +1946,12 @@ def sftp_file(dest_path, contents=None, kwargs=None, local_file=None):
             )
         )
 
-    if socket.inet_pton(socket.AF_INET6, kwargs['hostname']):
-        ipaddr = '[{0}]'.format(kwargs['hostname'])
-    else:
+    try:
+        if socket.inet_pton(socket.AF_INET6, kwargs['hostname']):
+            ipaddr = '[{0}]'.format(kwargs['hostname'])
+        else:
+            ipaddr = kwargs['hostname']
+    except socket.error:
         ipaddr = kwargs['hostname']
 
     cmd = 'echo "put {0} {1} {2}" | sftp {3} {4[username]}@{5}'.format(