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 2022-10-18 12:44:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-network (Old)
and /work/SRC/openSUSE:Factory/.yast2-network.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network"
Tue Oct 18 12:44:23 2022 rev:488 rq:1012036 version:4.5.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes
2022-10-03 13:44:06.145262369 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-network.new.2275/yast2-network.changes
2022-10-18 12:44:38.177674068 +0200
@@ -1,0 +2,8 @@
+Mon Oct 3 08:31:33 UTC 2022 - Knut Anderssen <kanders...@suse.com>
+
+- Do not assume wicked will be installed by default anymore and
+ return the needed packages by the selected backend when them
+ are not installed (bsc#1201235, bsc#1201435)
+- 4.5.9
+
+-------------------------------------------------------------------
Old:
----
yast2-network-4.5.8.tar.bz2
New:
----
yast2-network-4.5.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.yrSz9t/_old 2022-10-18 12:44:39.473677019 +0200
+++ /var/tmp/diff_new_pack.yrSz9t/_new 2022-10-18 12:44:39.481677037 +0200
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 4.5.8
+Version: 4.5.9
Release: 0
Summary: YaST2 - Network Configuration
License: GPL-2.0-only
++++++ yast2-network-4.5.8.tar.bz2 -> yast2-network-4.5.9.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-4.5.8/package/yast2-network.changes
new/yast2-network-4.5.9/package/yast2-network.changes
--- old/yast2-network-4.5.8/package/yast2-network.changes 2022-09-29
16:39:27.000000000 +0200
+++ new/yast2-network-4.5.9/package/yast2-network.changes 2022-10-17
11:09:33.000000000 +0200
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Mon Oct 3 08:31:33 UTC 2022 - Knut Anderssen <kanders...@suse.com>
+
+- Do not assume wicked will be installed by default anymore and
+ return the needed packages by the selected backend when them
+ are not installed (bsc#1201235, bsc#1201435)
+- 4.5.9
+
+-------------------------------------------------------------------
Thu Sep 29 09:15:47 UTC 2022 - Knut Anderssen <kanders...@suse.com>
- Fixed issue when writing the NetworkManager config without a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-4.5.8/package/yast2-network.spec
new/yast2-network-4.5.9/package/yast2-network.spec
--- old/yast2-network-4.5.8/package/yast2-network.spec 2022-09-29
16:39:27.000000000 +0200
+++ new/yast2-network-4.5.9/package/yast2-network.spec 2022-10-17
11:09:33.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 4.5.8
+Version: 4.5.9
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.5.8/src/lib/y2network/backend.rb
new/yast2-network-4.5.9/src/lib/y2network/backend.rb
--- old/yast2-network-4.5.8/src/lib/y2network/backend.rb 2022-09-29
16:39:27.000000000 +0200
+++ new/yast2-network-4.5.9/src/lib/y2network/backend.rb 2022-10-17
11:09:33.000000000 +0200
@@ -87,5 +87,12 @@
def available?
Yast::NetworkService.is_backend_available(id)
end
+
+ # Return a list of the required packages for this backend
+ #
+ # @return [Array<String>] list of packages required by the backend
+ def packages
+ []
+ end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-4.5.8/src/lib/y2network/backends/netconfig.rb
new/yast2-network-4.5.9/src/lib/y2network/backends/netconfig.rb
--- old/yast2-network-4.5.8/src/lib/y2network/backends/netconfig.rb
2022-09-29 16:39:27.000000000 +0200
+++ new/yast2-network-4.5.9/src/lib/y2network/backends/netconfig.rb
2022-10-17 11:09:33.000000000 +0200
@@ -31,6 +31,10 @@
def label
_("Traditional ifup")
end
+
+ def packages
+ ["sysconfig-netconfig"]
+ end
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-4.5.8/src/lib/y2network/backends/network_manager.rb
new/yast2-network-4.5.9/src/lib/y2network/backends/network_manager.rb
--- old/yast2-network-4.5.8/src/lib/y2network/backends/network_manager.rb
2022-09-29 16:39:27.000000000 +0200
+++ new/yast2-network-4.5.9/src/lib/y2network/backends/network_manager.rb
2022-10-17 11:09:33.000000000 +0200
@@ -31,6 +31,10 @@
def label
_("Network Manager")
end
+
+ def packages
+ ["NetworkManager"]
+ end
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-4.5.8/src/lib/y2network/backends/wicked.rb
new/yast2-network-4.5.9/src/lib/y2network/backends/wicked.rb
--- old/yast2-network-4.5.8/src/lib/y2network/backends/wicked.rb
2022-09-29 16:39:27.000000000 +0200
+++ new/yast2-network-4.5.9/src/lib/y2network/backends/wicked.rb
2022-10-17 11:09:33.000000000 +0200
@@ -31,6 +31,10 @@
def label
_("Wicked Service")
end
+
+ def packages
+ ["wicked"]
+ end
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-4.5.8/src/modules/Lan.rb
new/yast2-network-4.5.9/src/modules/Lan.rb
--- old/yast2-network-4.5.8/src/modules/Lan.rb 2022-09-29 16:39:27.000000000
+0200
+++ new/yast2-network-4.5.9/src/modules/Lan.rb 2022-10-17 11:09:33.000000000
+0200
@@ -652,10 +652,13 @@
# @return [Array] of packages needed when writing the config
def Packages
pkgs = []
+ backend = yast_config&.backend
- if yast_config&.backend?(:network_manager)
- pkgs << "NetworkManager" if !Package.Installed("NetworkManager")
- elsif !Package.Installed("wpa_supplicant")
+ return pkgs unless backend
+
+ backend.packages.each { |p| pkgs << p if !Package.Installed(p) }
+
+ if (backend.id == :wicked) && !Package.Installed("wpa_supplicant")
# we have to add wpa_supplicant when wlan is in game, wicked relies on
it
wlan_present = yast_config.interfaces.any? do |iface|
iface.type == Y2Network::InterfaceType::WIRELESS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-4.5.8/test/lan_test.rb
new/yast2-network-4.5.9/test/lan_test.rb
--- old/yast2-network-4.5.8/test/lan_test.rb 2022-09-29 16:39:27.000000000
+0200
+++ new/yast2-network-4.5.9/test/lan_test.rb 2022-10-17 11:09:33.000000000
+0200
@@ -22,6 +22,8 @@
require_relative "test_helper"
require "yast"
+require "y2network/backend"
+require "y2network/config"
require "y2network/config"
require "y2network/routing"
require "y2network/interface_config_builder"
@@ -33,64 +35,63 @@
subject { Yast::Lan }
let(:system_config) { Y2Network::Config.new(interfaces: [], source: :wicked)
}
- let(:backend) { :wicked }
+ let(:backend_id) { :wicked }
+ let(:backend) { Y2Network::Backend.by_id(backend_id) }
describe "#Packages" do
+ let(:backend_installed) { false }
+
let(:yast_config) do
Y2Network::Config.new(source: :autoinst).tap do |config|
- config.backend = backend
+ config.backend = backend_id
end
end
before(:each) do
Yast::Lan.add_config(:yast, yast_config)
+ allow(Yast::Package).to receive(:Installed).and_return(backend_installed)
end
- context "When NetworkManager is not going to be installed" do
+ context "When wicked is going to be installed" do
let(:wlan0) { Y2Network::Interface.new("wlan0", type:
Y2Network::InterfaceType::WIRELESS) }
let(:interfaces) { Y2Network::InterfacesCollection.new([wlan0]) }
- let(:config) { double(interfaces: interfaces, backend: backend) }
+ let(:yast_config) { double(interfaces: interfaces, backend: backend) }
+
+ context "and a wlan0 interface is present but wpa_supplicant is not
installed" do
+ before do
+ allow(Yast::Package)
+ .to receive(:Installed)
+ .with("wpa_supplicant")
+ .at_least(:once)
+ .and_return(false)
+
+ allow(yast_config)
+ .to receive(:backend?)
+ .and_return(false)
+ allow(yast_config)
+ .to receive(:backend?)
+ .with(backend_id)
+ .and_return(true)
+ end
- before(:each) do
- allow(Yast::Package)
- .to receive(:Installed)
- .with("wpa_supplicant")
- .at_least(:once)
- .and_return(false)
-
- allow(config)
- .to receive(:backend?)
- .and_return(false)
- allow(config)
- .to receive(:backend?)
- .with(backend)
- .and_return(true)
- allow(Yast::Lan)
- .to receive(:yast_config)
- .and_return(config)
- end
-
- it "always proposes wpa_supplicant" do
- allow(Yast::Package)
- .to receive(:Installed)
- .with("wpa_supplicant")
- .and_return(false)
+ it "proposes wpa_supplicant to be installed" do
+ allow(Yast::Package)
+ .to receive(:Installed)
+ .with("wpa_supplicant")
+ .and_return(false)
- expect(Yast::Lan.Packages).to include "wpa_supplicant"
+ expect(Yast::Lan.Packages).to include "wpa_supplicant"
+ end
end
end
context "When NetworkManager is selected for the target" do
- let(:backend) { :network_manager }
+ let(:backend_id) { :network_manager }
- it "lists NetworkManager package" do
- expect(yast_config).to
receive(:backend?).with(:network_manager).and_call_original
- expect(Yast::Package)
- .to receive(:Installed)
- .with("NetworkManager")
- .at_least(:once)
- .and_return(false)
- expect(Yast::Lan.Packages).to include "NetworkManager"
+ context "and the NetworkManager package is not installed" do
+ it "lists NetworkManager package" do
+ expect(Yast::Lan.Packages).to include "NetworkManager"
+ end
end
end
end
@@ -486,12 +487,12 @@
end
describe "#Export" do
- let(:backend) { :wicked }
+ let(:backend_id) { :wicked }
let(:yast_config) do
Y2Network::Config.new(source: :autoinst).tap do |config|
config.hostname.static = "yasties"
config.hostname.dhcp_hostname = :any
- config.backend = backend
+ config.backend = backend_id
end
end
@@ -509,7 +510,7 @@
end
context "when NetworkManager is the network service" do
- let(:backend) { :network_manager }
+ let(:backend_id) { :network_manager }
it "exports the managed attribute as true" do
expect(subject.Export).to include("managed" => true)
