summaryrefslogtreecommitdiffstats
path: root/network.py
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2006-06-16 02:01:47 +0000
committerJeremy Katz <katzj@redhat.com>2006-06-16 02:01:47 +0000
commit6c1f77752b2253a327767a5c17318f0499998d12 (patch)
tree751aa120c9d099e02cd0d64d771d657afa173558 /network.py
parent5745e33b068525aa090f9ed711427b167498a5f3 (diff)
downloadanaconda-6c1f77752b2253a327767a5c17318f0499998d12.tar.gz
anaconda-6c1f77752b2253a327767a5c17318f0499998d12.tar.xz
anaconda-6c1f77752b2253a327767a5c17318f0499998d12.zip
2006-06-15 Jeremy Katz <katzj@redhat.com>
* network.py (sanityCheckIPString): More s390 inet_pton breakage
Diffstat (limited to 'network.py')
-rw-r--r--network.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/network.py b/network.py
index d6f5d20ee..bf5aa6007 100644
--- a/network.py
+++ b/network.py
@@ -95,6 +95,13 @@ def sanityCheckIPString(ip_string):
family = socket.AF_INET6
errstr = _("'%s' is not a valid IPv6 address.") % ip_string
+ if rhpl.getArch() in ("s390", "s390x"): # inet_pton is busted on s390
+ try:
+ isys.inet_aton(ip_string)
+ except:
+ raise IPError, errstr
+ return
+
try:
socket.inet_pton(family, ip_string)
except socket.error: