Merge branch 'SLE-15-SP3' into merge-SLE-15-SP3

yast · Nov 10, 2021 · 250c64b · 250c64b
2 parents a9384ee + b63b4e5
commit 250c64b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Nov 10 16:45:32 UTC 2021 - José Iván López González <jlopez@suse.com>
+
+- Replace calls to dropped method InterfacesTable#friendly_name
+  (bsc#1192560).
+- 4.4.30
+
 -------------------------------------------------------------------
 Thu Nov  4 15:02:24 UTC 2021 - 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.4.29
+Version:        4.4.30
 Release:        0
 Summary:        YaST2 - Network Configuration
 License:        GPL-2.0-only

diff --git a/src/lib/y2network/widgets/interfaces_table.rb b/src/lib/y2network/widgets/interfaces_table.rb
@@ -1,4 +1,4 @@
-# Copyright (c) [2019] SUSE LLC
+# Copyright (c) [2019-2021] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -101,7 +101,7 @@ def note(interface, conn)
 
       # Constructs device description for inactive s390 devices
       def device_item(device)
-        [device.id, friendly_name(device), _("Not activated"), device.id, ""]
+        [device.id, description_for(device.interface), _("Not activated"), device.id, ""]
       end
 
       # Generic device description handler