[PATCH 3/4] Make update_hostname function do just one thing - update ksdata.

Radek Vykydal rvykydal at redhat.com
Wed Jan 23 12:49:46 UTC 2013


---
 pyanaconda/network.py               | 10 +++++-----
 pyanaconda/ui/gui/spokes/network.py | 12 +++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index 5e7f806..b1abf0d 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -966,9 +966,7 @@ def wait_for_connecting_NM():
     log.debug("not connected, waited %d of %d secs" % (i, CONNECTION_TIMEOUT))
     return False
 
-def update_hostname(ksdata, hostname=None):
-    if not hostname:
-        hostname = getHostname()
+def update_hostname_data(ksdata, hostname):
     log.debug("updating hostname %s" % hostname)
     hostname_found = False
     for nd in ksdata.network.network:
@@ -1060,9 +1058,11 @@ def networkInitialize(ksdata):
     setOnboot(ksdata)
 
     if ksdata.network.hostname is None:
-        update_hostname(ksdata)
+        hostname = getHostname()
+        update_hostname_data(ksdata, hostname)
 
 def wait_for_connecting_NM_thread(ksdata):
     # connection (e.g. auto default dhcp) is activated by NM service
     if wait_for_connecting_NM():
-        update_hostname(ksdata)
+        hostname = getHostname()
+        update_hostname_data(ksdata, hostname)
diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py
index e8f2b94..6fd2c9d 100644
--- a/pyanaconda/ui/gui/spokes/network.py
+++ b/pyanaconda/ui/gui/spokes/network.py
@@ -41,7 +41,7 @@ from pyanaconda.ui.gui.categories.software import SoftwareCategory
 from pyanaconda.ui.gui.hubs.summary import SummaryHub
 from pyanaconda.ui.gui.utils import gtk_call_once
 
-from pyanaconda.network import NetworkDevice, netscriptsDir, kickstartNetworkData, getActiveNetDevs, logIfcfgFiles, update_hostname, sanityCheckHostname
+from pyanaconda.network import NetworkDevice, netscriptsDir, kickstartNetworkData, getActiveNetDevs, logIfcfgFiles, update_hostname_data, sanityCheckHostname, getHostname
 
 from gi.repository import GLib, GObject, Pango, Gio, NetworkManager, NMClient
 import dbus
@@ -986,7 +986,7 @@ class NetworkSpoke(NormalSpoke):
             if network_data is not None:
                 self.data.network.network.append(network_data)
         hostname = self.network_control_box.hostname
-        update_hostname(self.data, hostname)
+        update_hostname_data(self.data, hostname)
 
     @property
     def completed(self):
@@ -1063,7 +1063,8 @@ class NetworkSpoke(NormalSpoke):
 
     def _update_hostname(self):
         if self.network_control_box.hostname == "localhost.localdomain":
-            update_hostname(self.data)
+            hostname = getHostname()
+            update_hostname_data(self.data, hostname)
             self.network_control_box.hostname = self.data.network.hostname
 
     def on_back_clicked(self, button):
@@ -1109,7 +1110,7 @@ class NetworkStandaloneSpoke(StandaloneSpoke):
             if network_data is not None:
                 self.data.network.network.append(network_data)
         hostname = self.network_control_box.hostname
-        update_hostname(self.data, hostname)
+        update_hostname_data(self.data, hostname)
 
         self._now_available = self.completed
 
@@ -1155,7 +1156,8 @@ class NetworkStandaloneSpoke(StandaloneSpoke):
 
     def _update_hostname(self):
         if self.network_control_box.hostname == "localhost.localdomain":
-            update_hostname(self.data)
+            hostname = getHostname()
+            update_hostname_data(self.data, hostname)
             self.network_control_box.hostname = self.data.network.hostname
 
 def getKSNetworkData(device):
-- 
1.7.11.7



More information about the anaconda-patches mailing list