Attachment 671691 Details for Bug 832510 – Untested patch

[patch] Untested patch

anaconda-avoid-nonet-crash.patch (text/plain), 2.08 KB, created by David Woodhouse on 2013-01-02 20:57:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Woodhouse

Created: 2013-01-02 20:57:49 UTC

Size: 2.08 KB

patch

obsolete

>diff --git a/pyanaconda/vnc.py b/pyanaconda/vnc.py
>index 833e2b5..04cdf55 100644
>--- a/pyanaconda/vnc.py
>+++ b/pyanaconda/vnc.py
>@@ -79,31 +79,30 @@ class VncServer:
> 
>         self.ip = network.getFirstRealIP()
> 
>-        if not self.ip:
>-            # Raise this here which will be caught higher up
>-            raise Exception("No IP addresses found.")
>-
>-        ipstr = self.ip
>-
>-        try:
>-            hinfo = socket.gethostbyaddr(ipstr)
>-        except Exception as e:
>-            log.debug("Exception caught trying to get host name of %s: %s" %
>-                      (ipstr, e))
>-            self.name = network.getHostname()
>-        else:
>-            if len(hinfo) == 3:
>-                self.name = hinfo[0]
>-
>-        if self.ip.find(':') != -1:
>-            ipstr = "[%s]" % (self.ip,)
>-
>-        if (self.name is not None) and (not self.name.startswith('localhost')) and (ipstr is not None):
>-            self.connxinfo = "%s:%s (%s)" % (socket.getfqdn(name=self.name), self.display, ipstr,)
>-        elif ipstr is not None:
>-            self.connxinfo = "%s:%s" % (ipstr, self.display,)
>+        if self.ip:
>+          ipstr = self.ip
>+
>+          try:
>+              hinfo = socket.gethostbyaddr(ipstr)
>+          except Exception as e:
>+              log.debug("Exception caught trying to get host name of %s: %s" %
>+                        (ipstr, e))
>+              self.name = network.getHostname()
>+          else:
>+              if len(hinfo) == 3:
>+                  self.name = hinfo[0]
>+
>+          if self.ip.find(':') != -1:
>+              ipstr = "[%s]" % (self.ip,)
>+
>+          if (self.name is not None) and (not self.name.startswith('localhost')) and (ipstr is not None):
>+              self.connxinfo = "%s:%s (%s)" % (socket.getfqdn(name=self.name), self.display, ipstr,)
>+          elif ipstr is not None:
>+              self.connxinfo = "%s:%s" % (ipstr, self.display,)
>+          else:
>+              self.connxinfo = None
>         else:
>-            self.connxinfo = None
>+              self.connxinfo = None
> 
>         # figure out product info
>         if self.name is not None:

Actions: View | Diff

Attachments on bug 832510: 671691