Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory
checked in at 2021-06-19 23:02:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-network (Old)
and /work/SRC/openSUSE:Factory/.yast2-network.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network"
Sat Jun 19 23:02:02 2021 rev:457 rq:900626 version:4.4.18
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes
2021-06-15 16:37:21.545695781 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-network.new.2625/yast2-network.changes
2021-06-19 23:02:04.147598466 +0200
@@ -1,0 +2,21 @@
+Thu Jun 17 16:20:44 UTC 2021 - Knut Anderssen <kanders...@suse.com>
+
+- Support 'boot' and 'on' as aliases for the 'auto' startmode
+ (bsc#1186910)
+- 4.4.18
+
+-------------------------------------------------------------------
+Thu Jun 17 15:42:01 UTC 2021 - Knut Anderssen <kanders...@suse.com>
+
+- Fallback to NetworkManager if wicked is the backend selected but
+ it is not installed at the end of the installation (bsc#1187423)
+- 4.4.17
+
+-------------------------------------------------------------------
+Tue Jun 15 09:17:24 UTC 2021 - Imobach Gonzalez Sosa <igonzalezs...@suse.com>
+
+- Fix the Comment entry in the desktop file so the tooltip
+ in the control center is properly translated (bsc#1187270).
+- 4.4.16
+
+-------------------------------------------------------------------
Old:
----
yast2-network-4.4.15.tar.bz2
New:
----
yast2-network-4.4.18.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.kZjiG1/_old 2021-06-19 23:02:04.919599454 +0200
+++ /var/tmp/diff_new_pack.kZjiG1/_new 2021-06-19 23:02:04.919599454 +0200
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 4.4.15
+Version: 4.4.18
Release: 0
Summary: YaST2 - Network Configuration
License: GPL-2.0-only
++++++ yast2-network-4.4.15.tar.bz2 -> yast2-network-4.4.18.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-4.4.15/package/yast2-network.changes
new/yast2-network-4.4.18/package/yast2-network.changes
--- old/yast2-network-4.4.15/package/yast2-network.changes 2021-06-10
17:13:21.000000000 +0200
+++ new/yast2-network-4.4.18/package/yast2-network.changes 2021-06-17
18:34:19.000000000 +0200
@@ -1,4 +1,25 @@
-------------------------------------------------------------------
+Thu Jun 17 16:20:44 UTC 2021 - Knut Anderssen <kanders...@suse.com>
+
+- Support 'boot' and 'on' as aliases for the 'auto' startmode
+ (bsc#1186910)
+- 4.4.18
+
+-------------------------------------------------------------------
+Thu Jun 17 15:42:01 UTC 2021 - Knut Anderssen <kanders...@suse.com>
+
+- Fallback to NetworkManager if wicked is the backend selected but
+ it is not installed at the end of the installation (bsc#1187423)
+- 4.4.17
+
+-------------------------------------------------------------------
+Tue Jun 15 09:17:24 UTC 2021 - Imobach Gonzalez Sosa <igonzalezs...@suse.com>
+
+- Fix the Comment entry in the desktop file so the tooltip
+ in the control center is properly translated (bsc#1187270).
+- 4.4.16
+
+-------------------------------------------------------------------
Tue Jun 8 08:44:23 UTC 2021 - Knut Anderssen <kanders...@suse.com>
- Use the linuxrc proxy settings for the HTTPS and FTP proxies
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-4.4.15/package/yast2-network.spec
new/yast2-network-4.4.18/package/yast2-network.spec
--- old/yast2-network-4.4.15/package/yast2-network.spec 2021-06-10
17:13:21.000000000 +0200
+++ new/yast2-network-4.4.18/package/yast2-network.spec 2021-06-17
18:34:19.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 4.4.15
+Version: 4.4.18
Release: 0
Summary: YaST2 - Network Configuration
License: GPL-2.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-4.4.15/src/desktop/org.opensuse.yast.LAN.desktop
new/yast2-network-4.4.18/src/desktop/org.opensuse.yast.LAN.desktop
--- old/yast2-network-4.4.15/src/desktop/org.opensuse.yast.LAN.desktop
2021-06-10 17:13:21.000000000 +0200
+++ new/yast2-network-4.4.18/src/desktop/org.opensuse.yast.LAN.desktop
2021-06-17 18:34:19.000000000 +0200
@@ -22,6 +22,6 @@
Name=YaST Network
GenericName=Network Settings
-Comment=Configure network cards, hostname and routing
+Comment="Configure network cards, hostname and routing"
StartupNotify=true
X-SuSE-YaST-Keywords=network,lan,dns,routing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-4.4.15/src/lib/y2network/proposal_settings.rb
new/yast2-network-4.4.18/src/lib/y2network/proposal_settings.rb
--- old/yast2-network-4.4.15/src/lib/y2network/proposal_settings.rb
2021-06-10 17:13:21.000000000 +0200
+++ new/yast2-network-4.4.18/src/lib/y2network/proposal_settings.rb
2021-06-17 18:34:19.000000000 +0200
@@ -160,13 +160,22 @@
# depending on the backend selected during the proposal and the packages
# installed
def network_service
- if current_backend == :network_manager
+ case current_backend
+ when :network_manager
return :network_manager if network_manager_installed?
log.info("NetworkManager is the selected service but it is not
installed")
log.info("- using wicked")
return :wicked
+ when :wicked
+ return :wicked if wicked_installed?
+
+ return :none unless network_manager_installed?
+
+ log.info("Wicked is the selected service but it is not installed -
using Network Manager")
+
+ return :network_manager
end
current_backend
@@ -258,6 +267,13 @@
Yast::Package.Installed("NetworkManager")
end
+ # Convenience method to determine if the NM package is installed or not
+ #
+ # @return [Boolean] true if wickedis installed; false otherwise
+ def wicked_installed?
+ Yast::Package.Installed("wicked")
+ end
+
# Determine whether NetworkManager should be selected by default according
# to the product control file
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-4.4.15/src/lib/y2network/startmode.rb
new/yast2-network-4.4.18/src/lib/y2network/startmode.rb
--- old/yast2-network-4.4.15/src/lib/y2network/startmode.rb 2021-06-10
17:13:21.000000000 +0200
+++ new/yast2-network-4.4.18/src/lib/y2network/startmode.rb 2021-06-17
18:34:19.000000000 +0200
@@ -29,21 +29,35 @@
include Yast2::Equatable
include Yast::Logger
+ # To be backward compliant 'boot', 'on' and 'onboot' are aliases
+ # for 'auto' (bsc#1186910)
+ ALIASES = {
+ "boot" => "auto",
+ "onboot" => "auto",
+ "on" => "auto"
+ }.freeze
+
attr_reader :name
+ attr_reader :alias_name
+
alias_method :to_s, :name
- eql_attr :name
+ eql_attr :name, :alias_name
- def initialize(name)
+ def initialize(name, alias_name: nil)
@name = name
+ @alias_name = alias_name
end
# gets new instance of startmode for given type and its params
- def self.create(name)
- name = "auto" if name == "onboot" # onboot is alias for auto
+ def self.create(mode)
+ name = ALIASES[mode] || mode
+ alias_name = ALIASES[mode] ? mode : nil
+
# avoid circular dependencies
require "y2network/startmodes"
- Startmodes.const_get(name.capitalize).new
+ const = Startmodes.const_get(name.capitalize)
+ alias_name ? const.new(alias_name: alias_name) : const.new
rescue NameError => e
log.error "Invalid startmode #{e.inspect}"
nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-4.4.15/src/lib/y2network/startmodes/auto.rb
new/yast2-network-4.4.18/src/lib/y2network/startmodes/auto.rb
--- old/yast2-network-4.4.15/src/lib/y2network/startmodes/auto.rb
2021-06-10 17:13:21.000000000 +0200
+++ new/yast2-network-4.4.18/src/lib/y2network/startmodes/auto.rb
2021-06-17 18:34:19.000000000 +0200
@@ -31,10 +31,10 @@
class Auto < Startmode
include Yast::I18n
- def initialize
+ def initialize(alias_name: nil)
textdomain "network"
- super("auto")
+ super("auto", alias_name: alias_name)
end
def to_human_string
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-4.4.15/src/lib/y2network/wicked/connection_config_writers/base.rb
new/yast2-network-4.4.18/src/lib/y2network/wicked/connection_config_writers/base.rb
---
old/yast2-network-4.4.15/src/lib/y2network/wicked/connection_config_writers/base.rb
2021-06-10 17:13:21.000000000 +0200
+++
new/yast2-network-4.4.18/src/lib/y2network/wicked/connection_config_writers/base.rb
2021-06-17 18:34:19.000000000 +0200
@@ -44,7 +44,7 @@
file.bootproto = value_as_string(conn.bootproto.to_s)
file.name = value_as_string(conn.description)
file.lladdr = value_as_string(conn.lladdress)
- file.startmode = value_as_string(conn.startmode.to_s)
+ file.startmode = value_as_string(startmode_for(conn))
file.dhclient_set_hostname =
value_as_string(dhclient_set_hostname(conn))
file.ifplugd_priority = conn.startmode.priority if
conn.startmode.to_s == "ifplugd"
file.ethtool_options = value_as_string(conn.ethtool_options)
@@ -124,6 +124,16 @@
def value_as_string(value)
(value.nil? || value.empty?) ? nil : value
end
+
+ # Obtains the startmode to be used for the connection given
+ #
+ # @param conn [Y2Network::ConnectionConfig::Base] Connection to take
settings from
+ # @return [String] startmode be written
+ def startmode_for(conn)
+ return "" unless conn.startmode
+
+ conn.startmode.alias_name || conn.startmode.name
+ end
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-4.4.15/test/y2network/autoinst/interfaces_reader_test.rb
new/yast2-network-4.4.18/test/y2network/autoinst/interfaces_reader_test.rb
--- old/yast2-network-4.4.15/test/y2network/autoinst/interfaces_reader_test.rb
2021-06-10 17:13:21.000000000 +0200
+++ new/yast2-network-4.4.18/test/y2network/autoinst/interfaces_reader_test.rb
2021-06-17 18:34:19.000000000 +0200
@@ -46,7 +46,7 @@
{
"bootproto" => "dhcp",
"name" => "eth0",
- "startmode" => "auto",
+ "startmode" => "boot",
"dhclient_set_hostname" => "yes",
"lladdr" => "02:0b:0c:0d:0e:02",
"aliases" => {
@@ -87,7 +87,8 @@
it "assign properly all values in profile" do
eth0_config = subject.config.by_name("eth0")
- expect(eth0_config.startmode).to eq Y2Network::Startmode.create("auto")
+ expect(eth0_config.startmode.name).to eq("auto")
+ expect(eth0_config.startmode.alias_name).to eq("boot")
expect(eth0_config.bootproto).to eq
Y2Network::BootProtocol.from_name("dhcp")
expect(eth0_config.ip_aliases.size).to eq 3
expect(eth0_config.dhclient_set_hostname).to eq true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-4.4.15/test/y2network/proposal_settings_test.rb
new/yast2-network-4.4.18/test/y2network/proposal_settings_test.rb
--- old/yast2-network-4.4.15/test/y2network/proposal_settings_test.rb
2021-06-10 17:13:21.000000000 +0200
+++ new/yast2-network-4.4.18/test/y2network/proposal_settings_test.rb
2021-06-17 18:34:19.000000000 +0200
@@ -332,16 +332,38 @@
let(:settings) { described_class.instance }
let(:backend) { :wicked }
let(:nm_installed) { true }
+ let(:wicked_installed) { true }
before do
allow(settings).to receive(:current_backend).and_return(backend)
- allow(Yast::Package).to receive(:Installed)
- .with("NetworkManager").and_return(nm_installed)
+ allow(settings).to
receive(:network_manager_installed?).and_return(nm_installed)
+ allow(settings).to
receive(:wicked_installed?).and_return(wicked_installed)
end
context "when the backend selected is wicked" do
- it "returns :wicked" do
- expect(settings.network_service).to eql(:wicked)
+ context "and wicked is installed" do
+ it "returns :wicked" do
+ expect(settings.network_service).to eql(:wicked)
+ end
+ end
+
+ context "and wicked is not installed" do
+ let(:wicked_installed) { false }
+
+ context "but NetworkManager is" do
+ it "returns :network_manager as the fallback network service" do
+ expect(settings.network_service).to eql(:network_manager)
+ end
+ end
+
+ context "and NetworkManager is not installed either" do
+ let(:wicked_installed) { false }
+ let(:nm_installed) { false }
+
+ it "returns :none" do
+ expect(settings.network_service).to eql(:none)
+ end
+ end
end
end
@@ -357,7 +379,7 @@
context "and the NetworkManager package is not installed" do
let(:nm_installed) { false }
- it "returns :wicked" do
+ it "returns :wicked as the fallback network service" do
expect(settings.network_service).to eql(:wicked)
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-4.4.15/test/y2network/wicked/connection_config_writers/bridge_test.rb
new/yast2-network-4.4.18/test/y2network/wicked/connection_config_writers/bridge_test.rb
---
old/yast2-network-4.4.15/test/y2network/wicked/connection_config_writers/bridge_test.rb
2021-06-10 17:13:21.000000000 +0200
+++
new/yast2-network-4.4.18/test/y2network/wicked/connection_config_writers/bridge_test.rb
2021-06-17 18:34:19.000000000 +0200
@@ -33,7 +33,7 @@
c.name = "br1"
c.interface = "br1"
c.description = ""
- c.startmode = Y2Network::Startmode.create("auto")
+ c.startmode = Y2Network::Startmode.create("on")
c.bootproto = Y2Network::BootProtocol::DHCP
c.ports = ["eth0", "eth1"]
c.stp = false
@@ -48,7 +48,7 @@
handler.write(conn)
expect(file).to have_attributes(
name: nil,
- startmode: "auto",
+ startmode: "on",
bootproto: "dhcp"
)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-4.4.15/test/y2network/wicked/connection_config_writers/ethernet_test.rb
new/yast2-network-4.4.18/test/y2network/wicked/connection_config_writers/ethernet_test.rb
---
old/yast2-network-4.4.15/test/y2network/wicked/connection_config_writers/ethernet_test.rb
2021-06-10 17:13:21.000000000 +0200
+++
new/yast2-network-4.4.18/test/y2network/wicked/connection_config_writers/ethernet_test.rb
2021-06-17 18:34:19.000000000 +0200
@@ -64,7 +64,7 @@
c.bootproto = Y2Network::BootProtocol::STATIC
c.ip = ip
c.ip_aliases = [ip_alias]
- c.startmode = Y2Network::Startmode.create("auto")
+ c.startmode = Y2Network::Startmode.create("boot")
c.hostname = "foo"
c.dhclient_set_hostname = true
end
@@ -78,7 +78,7 @@
expect(file).to have_attributes(
name: conn.description,
bootproto: "static",
- startmode: "auto",
+ startmode: "boot",
dhclient_set_hostname: "yes",
mtu: nil
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-4.4.15/test/y2network/wicked/connection_config_writers/wireless_test.rb
new/yast2-network-4.4.18/test/y2network/wicked/connection_config_writers/wireless_test.rb
---
old/yast2-network-4.4.15/test/y2network/wicked/connection_config_writers/wireless_test.rb
2021-06-10 17:13:21.000000000 +0200
+++
new/yast2-network-4.4.18/test/y2network/wicked/connection_config_writers/wireless_test.rb
2021-06-17 18:34:19.000000000 +0200
@@ -33,7 +33,7 @@
Y2Network::ConnectionConfig::Wireless.new.tap do |c|
c.interface = "wlan0"
c.description = "Wireless Card 0"
- c.startmode = Y2Network::Startmode.create("auto")
+ c.startmode = Y2Network::Startmode.create("onboot")
c.bootproto = Y2Network::BootProtocol::STATIC
c.ip = ip
c.ip_aliases = [ip_alias]
@@ -62,7 +62,7 @@
it "sets relevant attributes" do
handler.write(conn)
expect(file).to have_attributes(
- startmode: "auto",
+ startmode: "onboot",
bootproto: "static",
wireless_mode: conn.mode,
wireless_essid: conn.essid,
