Merge 9d54a9f into 3eeadf8

yast · Oct 2, 2019 · 00c0651 · 00c0651
2 parents 3eeadf8 + 9d54a9f
commit 00c0651
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct  2 05:57:45 UTC 2019 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- boo#1152748:
+  - Fix detection of the network status during installation.
+- 4.1.15
+
 -------------------------------------------------------------------
 Tue Oct  1 14:24:42 UTC 2019 - Knut Anderssen <kanderssen@suse.com>
 

diff --git a/package/yast2-network.spec b/package/yast2-network.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        4.2.14
+Version:        4.2.15
 Release:        0
 Summary:        YaST2 - Network Configuration
 License:        GPL-2.0-only

diff --git a/src/clients/inst_lan.rb b/src/clients/inst_lan.rb
@@ -35,7 +35,7 @@ class InstLanClient < Client
 
     def main
       Yast.import "UI"
-      Yast.import "LanItems"
+      Yast.import "Lan"
       Yast.import "GetInstArgs"
 
       Yast.include self, "network/lan/wizards.rb"
@@ -51,7 +51,8 @@ def main
       # keep network configuration state in @@conf_net to gurantee same
       # behavior when walking :back in installation workflow
       if !defined?(@@network_configured)
-        @@network_configured = LanItems.Items.keys.any? { |i| LanItems.IsItemConfigured(i) }
+        @@network_configured = !Yast::Lan.yast_config.connections.empty?
+
       end
 
       log.info("Configured network found: #{@@network_configured}")

diff --git a/src/lib/y2network/connection_configs_collection.rb b/src/lib/y2network/connection_configs_collection.rb
@@ -37,7 +37,7 @@ class ConnectionConfigsCollection
     alias_method :to_a, :connection_configs
 
     def_delegators :@connection_configs, :each, :find, :push, :<<, :reject!, :map, :flat_map,
-      :any?, :size, :first
+      :any?, :size, :first, :empty?
 
     # Constructor
     #