Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory
checked in at 2016-11-03 12:55:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-network (Old)
and /work/SRC/openSUSE:Factory/.yast2-network.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes
2016-10-31 09:53:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes
2016-11-03 12:55:15.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Oct 27 11:55:10 UTC 2016 - jreidin...@suse.com
+
+- Make network summary consistent with other summaries
+ (bsc#745940)
+- 3.2.9
+
+-------------------------------------------------------------------
Old:
----
yast2-network-3.2.8.tar.bz2
New:
----
yast2-network-3.2.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.AzF4ZR/_old 2016-11-03 12:55:16.000000000 +0100
+++ /var/tmp/diff_new_pack.AzF4ZR/_new 2016-11-03 12:55:16.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 3.2.8
+Version: 3.2.9
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-network-3.2.8.tar.bz2 -> yast2-network-3.2.9.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.2.8/package/yast2-network.changes
new/yast2-network-3.2.9/package/yast2-network.changes
--- old/yast2-network-3.2.8/package/yast2-network.changes 2016-10-25
15:35:00.000000000 +0200
+++ new/yast2-network-3.2.9/package/yast2-network.changes 2016-11-01
13:07:50.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Oct 27 11:55:10 UTC 2016 - jreidin...@suse.com
+
+- Make network summary consistent with other summaries
+ (bsc#745940)
+- 3.2.9
+
+-------------------------------------------------------------------
Tue Oct 25 13:25:53 UTC 2016 - mvid...@suse.com
- Fixed a hardcoded interface name in a CLI test (bsc#1006799)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.2.8/package/yast2-network.spec
new/yast2-network-3.2.9/package/yast2-network.spec
--- old/yast2-network-3.2.8/package/yast2-network.spec 2016-10-25
15:35:00.000000000 +0200
+++ new/yast2-network-3.2.9/package/yast2-network.spec 2016-11-01
13:07:50.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 3.2.8
+Version: 3.2.9
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.2.8/src/modules/Lan.rb
new/yast2-network-3.2.9/src/modules/Lan.rb
--- old/yast2-network-3.2.8/src/modules/Lan.rb 2016-10-25 15:35:00.000000000
+0200
+++ new/yast2-network-3.2.9/src/modules/Lan.rb 2016-11-01 13:07:50.000000000
+0100
@@ -726,30 +726,21 @@
# proposal (NetworkManager + ipv6)
# @return [rich text, links]
def SummaryGeneral
- status_nm = nil
- status_v6 = nil
- status_virt_net = nil
- href_nm = nil
- href_v6 = nil
- href_virt_net = nil
- link_nm = nil
- link_v6 = nil
- link_virt_net = nil
+ # header for network summary list
header_nm = _("Network Mode")
if NetworkService.is_network_manager
href_nm = "lan--nm-disable"
# network mode: the interfaces are controlled by the user
status_nm = _("Interfaces controlled by NetworkManager")
- # disable NetworkManager applet
- link_nm = Hyperlink(href_nm, _("Disable NetworkManager"))
+ # switch from network manager to wicked
+ link_nm = Hyperlink(href_nm, _("switch to Wicked"))
else
href_nm = "lan--nm-enable"
# network mode
- status_nm = _("Traditional network setup with NetControl - ifup")
- # enable NetworkManager applet
- # for virtual network proposal (bridged) don't show hyperlink to
enable networkmanager
- link_nm = Hyperlink(href_nm, _("Enable NetworkManager"))
+ status_nm = _("Traditional network setup with Wicked")
+ # switch from wicked to network manager
+ link_nm = Hyperlink(href_nm, _("switch to NetworkManager"))
end
if @ipv6
@@ -757,13 +748,13 @@
# ipv6 support is enabled
status_v6 = _("Support for IPv6 protocol is enabled")
# disable ipv6 support
- link_v6 = Hyperlink(href_v6, _("Disable IPv6"))
+ link_v6 = Hyperlink(href_v6, _("disable"))
else
href_v6 = "ipv6-enable"
# ipv6 support is disabled
status_v6 = _("Support for IPv6 protocol is disabled")
# enable ipv6 support
- link_v6 = Hyperlink(href_v6, _("Enable IPv6"))
+ link_v6 = Hyperlink(href_v6, _("enable"))
end
descr = Builtins.sformat(
"<ul><li>%1: %2 (%3)</li></ul> \n\t\t\t <ul><li>%4 (%5)</li></ul>",
@@ -773,16 +764,7 @@
status_v6,
link_v6
)
- if !link_virt_net.nil?
- descr = Builtins.sformat(
- "%1\n\t\t\t\t\t\t<ul><li>%2 (%3)</li></ul>",
- descr,
- status_virt_net,
- link_virt_net
- )
- end
links = [href_nm, href_v6]
- links = Builtins.add(links, href_virt_net) if !href_virt_net.nil?
[descr, links]
end
