diff options
| author | Chris Lumens <clumens@redhat.com> | 2008-09-30 10:00:07 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2008-09-30 10:00:07 -0400 |
| commit | f3b5c379217dba06222d7a1bf88e847c8fa8f4e9 (patch) | |
| tree | c0e57ea7a6a0e3cd5204989d03ef6fffad1bb174 /network.py | |
| parent | c1be94e64170cd8d964de1945696ca9a386588f3 (diff) | |
| download | anaconda-f3b5c379217dba06222d7a1bf88e847c8fa8f4e9.tar.gz anaconda-f3b5c379217dba06222d7a1bf88e847c8fa8f4e9.tar.xz anaconda-f3b5c379217dba06222d7a1bf88e847c8fa8f4e9.zip | |
Update FQDN patch to fix a couple tracebacks (#464191).
Patch from Thomas Woerner <twoerner AT redhat DOT com>.
Diffstat (limited to 'network.py')
| -rw-r--r-- | network.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/network.py b/network.py index d3ab6345e..126c5a5cf 100644 --- a/network.py +++ b/network.py @@ -545,19 +545,24 @@ class Network: ip = None # fqdn and hostname - if "." in hostname: + if "." in self.hostname: fqdn = self.hostname - hostname = hostname.split('.', 1)[0] + hostname = self.hostname.split('.', 1)[0] else: fqdn = socket.getfqdn(self.hostname) hostname = self.hostname + if fqdn in [ "localhost.localdomain", "localhost", - "localhost6.localdomain6", "localhost6" ]: + "localhost6.localdomain6", "localhost6", hostname ] \ + or "." not in fqdn: fqdn = None # domainname - domainname = fqdn[(fqdn.find('.') + 1):] - if domainname in [ "localdomain", "localdomain6" ]: + if fqdn: + domainname = fqdn.split('.', 1)[1] + if domainname in [ "localdomain", "localdomain6" ]: + domainname = None + else: domainname = None localline = "localhost.localdomain localhost" |