Script 'mail_helper' called by bg Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: bg. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-network -> sle12 ## BNC# 891517 : "[upgrade] after upgrade from sled11 sp3, network function in sled12 system does not work properly" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes 2014-08-25 15:38:30.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes 2014-08-26 09:49:51.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Aug 25 10:46:44 UTC 2014 - mfilka@suse.com + +- bnc#891517 + - do not require ifplugd package for devices with + STARTMODE='ifplugd' in ifcfg +- 3.1.87 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-network - at least 15 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-network (Old) and /mounts/work_src_done/SLE12/yast2-network (BS:build ID:43118 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-network-3.1.86.tar.bz2 New: ---- yast2-network-3.1.87.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.h6B32I/_old 2014-08-26 15:44:42.000000000 +0200 +++ /var/tmp/diff_new_pack.h6B32I/_new 2014-08-26 15:44:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.86 +Version: 3.1.87 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.86.tar.bz2 -> yast2-network-3.1.87.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.86/package/yast2-network.changes new/yast2-network-3.1.87/package/yast2-network.changes --- old/yast2-network-3.1.86/package/yast2-network.changes 2014-08-22 17:04:36.000000000 +0200 +++ new/yast2-network-3.1.87/package/yast2-network.changes 2014-08-26 09:44:38.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Aug 25 10:46:44 UTC 2014 - mfilka@suse.com + +- bnc#891517 + - do not require ifplugd package for devices with + STARTMODE='ifplugd' in ifcfg +- 3.1.87 + +------------------------------------------------------------------- Fri Aug 22 16:43:24 CEST 2014 - locilka@suse.com - Fixed requesting sshd/firewall packages in case of the default diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.86/package/yast2-network.spec new/yast2-network-3.1.87/package/yast2-network.spec --- old/yast2-network-3.1.86/package/yast2-network.spec 2014-08-22 17:04:36.000000000 +0200 +++ new/yast2-network-3.1.87/package/yast2-network.spec 2014-08-26 09:44:38.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.86 +Version: 3.1.87 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.86/src/modules/Lan.rb new/yast2-network-3.1.87/src/modules/Lan.rb --- old/yast2-network-3.1.86/src/modules/Lan.rb 2014-08-22 17:04:36.000000000 +0200 +++ new/yast2-network-3.1.87/src/modules/Lan.rb 2014-08-26 09:44:38.000000000 +0200 @@ -1071,81 +1071,50 @@ # @return [Array] of packages needed when writing the config def Packages - pkgs = [] - required = { - "types" => { - #for wlan require iw instead of wireless-tools (bnc#539669) - "wlan" => "iw", - "vlan" => "vlan", - "br" => "bridge-utils", - "tun" => "tunctl", - "tap" => "tunctl" - }, - "options" => { - "STARTMODE" => { "ifplugd" => "ifplugd" }, - "WIRELESS_AUTH_MODE" => { - "psk" => "wpa_supplicant", - "eap" => "wpa_supplicant" - } + # various device types require some special packages ... + type_requires = { + # for wlan require iw instead of wireless-tools (bnc#539669) + "wlan" => "iw", + "vlan" => "vlan", + "br" => "bridge-utils", + "tun" => "tunctl", + "tap" => "tunctl" + } + # ... and some options require special packages as well + option_requires = { + "WIRELESS_AUTH_MODE" => { + "psk" => "wpa_supplicant", + "eap" => "wpa_supplicant" } } - Builtins.foreach( - Convert.convert( - Map.Keys(Ops.get_map(required, "types", {})), - :from => "list", - :to => "list <string>" - ) - ) do |type| - package = Ops.get_string(required, ["types", type], "") - if Ops.greater_than(Builtins.size(NetworkInterfaces.List(type)), 0) + pkgs = [] + type_requires.each do |type, package| + ifaces = NetworkInterfaces.List(type) + if !ifaces.empty? Builtins.y2milestone( - "Network interface type %1 requires package %2", - type, - package + "Network interface type #{type} requires package #{package}" ) - if !PackageSystem.Installed(package) - pkgs = Builtins.add(pkgs, package) - end + pkgs << package if !PackageSystem.Installed(package) end end - - Builtins.foreach( - Convert.convert( - Map.Keys(Ops.get_map(required, "options", {})), - :from => "list", - :to => "list <string>" - ) - ) do |type| - Builtins.foreach( - Convert.convert( - Map.Keys(Ops.get_map(required, ["options", type], {})), - :from => "list", - :to => "list <string>" - ) - ) do |option| - package = Ops.get_string(required, ["options", type, option], "") - if NetworkInterfaces.Locate(type, option) != [] + option_requires.each do |option, option_values| + option_values.each do |value, package| + if NetworkInterfaces.Locate(option, value) != [] Builtins.y2milestone( - "Network interface with options %1, %2 requires package %3", - type, - option, - package + "Network interface with option #{option}=#{value} requires package #{package}", ) - if !PackageSystem.Installed(package) - pkgs = Builtins.add(pkgs, package) - end + pkgs << package if !PackageSystem.Installed(package) end end end if NetworkService.is_network_manager - if !PackageSystem.Installed("NetworkManager") - pkgs = Builtins.add(pkgs, "NetworkManager") - end + pkgs << "NetworkManager" if !PackageSystem.Installed("NetworkManager") end - deep_copy(pkgs) + + pkgs end # @return [Array] of packages needed when writing the config in autoinst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.86/test/lan_test.rb new/yast2-network-3.1.87/test/lan_test.rb --- old/yast2-network-3.1.86/test/lan_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-3.1.87/test/lan_test.rb 2014-08-26 09:44:38.000000000 +0200 @@ -0,0 +1,86 @@ +#!/usr/bin/env rspec + +require_relative "test_helper" + +require "yast" + +Yast.import "Lan" + +describe "LanClass#Packages" do + + packages = { + "iw" => "wlan", + "vlan" => "vlan", + "bridge-utils" => "br", + "tunctl" => "tun" + } + + + packages.each do |pkg, type| + it "lists '#{pkg}' package for #{type} device" do + allow(Yast::NetworkInterfaces) + .to receive(:List) + .and_return([]) + allow(Yast::NetworkInterfaces) + .to receive(:List) + .with(type) + .and_return(["place_holder"]) + allow(Yast::NetworkInterfaces) + .to receive(:Locate) + .and_return([]) + allow(Yast::NetworkService) + .to receive(:is_network_manager) + .and_return(false) + + expect(Yast::PackageSystem) + .to receive(:Installed) + .with(pkg) + .at_least(:once) + .and_return(false) + expect(Yast::Lan.Packages).to include pkg + end + end + + it "lists wpa_supplicant package when WIRELESS_AUTH_MODE is psk or eap" do + allow(Yast::NetworkInterfaces) + .to receive(:List) + .and_return([]) + allow(Yast::NetworkService) + .to receive(:is_network_manager) + .and_return(false) + + # when checking options, LanClass#Packages currently cares only if + # WIRELESS_AUTH_MODE={psk, eap} is present + expect(Yast::NetworkInterfaces) + .to receive(:Locate) + .with("WIRELESS_AUTH_MODE", /(psk|eap)/) + .at_least(:once) + .and_return(["place_holder"]) + expect(Yast::PackageSystem) + .to receive(:Installed) + .with("wpa_supplicant") + .at_least(:once) + .and_return(false) + expect(Yast::Lan.Packages).to include "wpa_supplicant" + end + + it "lists NetworkManager package when NetworkManager service is selected" do + allow(Yast::NetworkInterfaces) + .to receive(:List) + .and_return([]) + allow(Yast::NetworkInterfaces) + .to receive(:Locate) + .and_return([]) + + expect(Yast::NetworkService) + .to receive(:is_network_manager) + .and_return(true) + expect(Yast::PackageSystem) + .to receive(:Installed) + .with("NetworkManager") + .at_least(:once) + .and_return(false) + expect(Yast::Lan.Packages).to include "NetworkManager" + end + +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.86/test/Makefile.am new/yast2-network-3.1.87/test/Makefile.am --- old/yast2-network-3.1.86/test/Makefile.am 2014-08-22 17:04:37.000000000 +0200 +++ new/yast2-network-3.1.87/test/Makefile.am 2014-08-26 09:44:38.000000000 +0200 @@ -3,6 +3,7 @@ edit_nic_name_test.rb \ install_inf_convertor_test.rb \ lan_items_helpers_test.rb \ + lan_test.rb \ lan_udev_auto_test.rb \ link_handlers_test.rb \ netcard_test.rb \ continue with "q"... Checked in at Tue Aug 26 15:45:01 CEST 2014 by bg Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org