Code cleanup

yast · Jul 11, 2017 · be9825b · be9825b
1 parent 77bfcd8
commit be9825b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/modules/DNS.rb b/src/modules/DNS.rb
@@ -283,7 +283,7 @@ def Read
       return true if @initialized == true
 
       @dhcp_hostname = dhclient_set_hostname
-      @write_hostname = write_hostname_to_hosts
+      @write_hostname = get_write_hostname_to_hosts
 
       @resolv_conf_policy = Convert.to_string(
         SCR.Read(path(".sysconfig.network.config.NETCONFIG_DNS_POLICY"))
@@ -365,7 +365,6 @@ def Write(gui: true)
       # Progress step 3/3
       ProgressNextStage(_("Updating /etc/resolv.conf ...")) if gui
       update_sysconfig_config
-      Builtins.sleep(0) if gui
 
       Progress.NextStage if gui
       @modified = false
@@ -646,7 +645,7 @@ def empty?
 
     # Updates /etc/sysconfig/network/dhcp
     def update_sysconfig_dhcp
-      if dhclient_set_hostname != @dhcp_hostname || write_hostname_to_hosts != @write_hostname
+      if dhclient_set_hostname != @dhcp_hostname || get_write_hostname_to_hosts != @write_hostname
         log.info("dhcp_hostname=#{@dhcp_hostname}")
         log.info("write_hostname=#{@write_hostname}")
 
@@ -659,7 +658,7 @@ def update_sysconfig_dhcp
         SCR.Write(
           path(".sysconfig.network.dhcp.WRITE_HOSTNAME_TO_HOSTS"),
           @write_hostname ? "yes" : "no"
-        ) if !@write_hostname
+        ) if !@write_hostname.nil?
         SCR.Write(path(".sysconfig.network.dhcp"), nil)
       else
         log.info("No update for /etc/sysconfig/network/dhcp")
@@ -724,7 +723,7 @@ def dhclient_set_hostname
     #
     # return {true, false, nil} "yes" => true, "no" => false, otherwise or not
     # present => nil
-    def write_hostname_to_hosts
+    def get_write_hostname_to_hosts
       SYSCFG_TO_BOOL[SCR.Read(path(".sysconfig.network.dhcp.WRITE_HOSTNAME_TO_HOSTS"))]
     end
 

diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb
@@ -693,8 +693,7 @@ def WriteUdevRules
       nil
     end
 
-    # TODO: make subcalls gui dependent where needed
-    def write(gui: false)
+    def write
       renamed_items = @Items.keys.select { |item_id| renamed?(item_id) }
       renamed_items.each do |item_id|
         devmap = GetDeviceMap(item_id)
@@ -708,7 +707,6 @@ def write(gui: false)
       # FIXME: hack: no "netcard" filter as biosdevname names it diferently (bnc#712232)
       NetworkInterfaces.Write("")
     end
-    alias_method :Write, :write
 
     # Exports configuration for use in AY profile
     #