[yast-devel] [ci_new_pac] JFYI yast2 -> sle12
Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2 -> sle12 ## BNC# 861078 : "pre-Alpha3: network not setup" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2/yast2.changes 2014-01-27 16:07:07.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2/yast2.changes 2014-01-30 13:40:10.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Jan 30 09:27:43 UTC 2014 - mfilka@suse.com + +- bnc#861078 + - detected network service set properly when running in + installation mode +- 3.1.17 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2 - at least 72 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2 (Old) and /mounts/work_src_done/SLE12/yast2 (BS:build ID:31401 MAIL:yast-devel@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2", Maintainer is "yast-devel@opensuse.org" Old: ---- yast2-3.1.16.tar.bz2 New: ---- yast2-3.1.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.tmz6DR/_old 2014-01-30 15:05:36.000000000 +0100 +++ /var/tmp/diff_new_pack.tmz6DR/_new 2014-01-30 15:05:36.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.16 +Version: 3.1.17 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-3.1.16.tar.bz2 -> yast2-3.1.17.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.16/library/network/src/modules/NetworkService.rb new/yast2-3.1.17/library/network/src/modules/NetworkService.rb --- old/yast2-3.1.16/library/network/src/modules/NetworkService.rb 2014-01-27 11:42:09.000000000 +0100 +++ new/yast2-3.1.17/library/network/src/modules/NetworkService.rb 2014-01-30 13:40:46.000000000 +0100 @@ -130,19 +130,19 @@ # @return true when the network is managed by an external tool, # like NetworkManager, false otherwise def network_manager? - cached_name == :network_manager + cached_service?(:network_manager) end alias_method :is_network_manager, :network_manager? def netconfig? - cached_name == :netconfig + cached_service?(:netconfig) end alias_method :is_netconfig, :netconfig? def wicked? - cached_name == :wicked + cached_service?(:wicked) end alias_method :is_wicked, :wicked? @@ -178,8 +178,16 @@ @current_name = :network_manager when "wicked" @current_name = :wicked + else + if Mode.installation || Mode.config + Builtins.y2milestone("Running in installer, use default: wicked") + @current_name = :wicked + else + Builtins.y2error("Cannot determine used network service.") + raise "Cannot detect used network service" + end end - + @cached_name = @current_name Builtins.y2milestone("Current backend: #{@current_name}") @@ -354,6 +362,8 @@ end end + private + # Replies with currently selected network service name # # Currently known backends: @@ -362,12 +372,19 @@ # - :wicked - supported (via its backward compatibility to # ifup) # - private def cached_name Read() return @cached_name end + # Checks if currently cached service is the given one + def cached_service?( service) + cached_name == service + rescue + Builtins.y2error("NetworkService: error when checking cached network service") + false + end + # Restarts wicked backend directly def wicked_restart run_wicked( "ifdown", "all") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.16/library/network/test/network_service_test.rb new/yast2-3.1.17/library/network/test/network_service_test.rb --- old/yast2-3.1.16/library/network/test/network_service_test.rb 2014-01-27 11:42:09.000000000 +0100 +++ new/yast2-3.1.17/library/network/test/network_service_test.rb 2014-01-30 13:40:46.000000000 +0100 @@ -12,7 +12,19 @@ context "smoke test" do describe "#is_network_manager" do it "does not crash" do - expect([true, false].include? Yast::NetworkService.is_network_manager).to be_true + expect{ Yast::NetworkService.is_network_manager }.not_to raise_error + end + end + + describe "#is_wicked" do + it "does not crash" do + expect{ Yast::NetworkService.is_wicked }.not_to raise_error + end + end + + describe "#is_netconfig" do + it "does not crash" do + expect{ Yast::NetworkService.is_netconfig }.not_to raise_error end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.16/package/yast2.changes new/yast2-3.1.17/package/yast2.changes --- old/yast2-3.1.16/package/yast2.changes 2014-01-27 11:42:09.000000000 +0100 +++ new/yast2-3.1.17/package/yast2.changes 2014-01-30 13:40:46.000000000 +0100 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jan 30 09:27:43 UTC 2014 - mfilka@suse.com + +- bnc#861078 + - detected network service set properly when running in + installation mode +- 3.1.17 + +------------------------------------------------------------------- Tue Jan 21 14:57:14 UTC 2014 - jreidinger@suse.com - remove from wizard icons for title as proposed by Ken diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.16/package/yast2.spec new/yast2-3.1.17/package/yast2.spec --- old/yast2-3.1.16/package/yast2.spec 2014-01-27 11:42:09.000000000 +0100 +++ new/yast2-3.1.17/package/yast2.spec 2014-01-30 13:40:46.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.16 +Version: 3.1.17 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build continue with "q"... Checked in at Thu Jan 30 15:05:53 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
participants (1)
-
ro