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# 885957 : "SCC registration failed via proxy with authentication requried." (ASSIGNED/) ## BNC# 893638 : "[HP HPS Bug] "Abort" button on "Network Settings" aborts the installation without confirmation" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes 2014-08-26 15:44:59.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes 2014-08-28 16:25:04.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Aug 28 11:16:20 UTC 2014 - lslezak@suse.cz + +- write the proxy credentials from install.inf separately, make it + compatible with the proxy module used at installed system + (bnc#885957) +- 3.1.89 + +------------------------------------------------------------------- +Wed Aug 27 14:39:13 UTC 2014 - mfilka@suse.com + +- bnc#893638 + - handle abort button correctly during installation +- 3.1.88 + +------------------------------------------------------------------- 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:43228 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-network-3.1.87.tar.bz2 New: ---- yast2-network-3.1.89.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.Y2boy9/_old 2014-08-28 16:58:10.000000000 +0200 +++ /var/tmp/diff_new_pack.Y2boy9/_new 2014-08-28 16:58:10.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.87 +Version: 3.1.89 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.87.tar.bz2 -> yast2-network-3.1.89.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.87/package/yast2-network.changes new/yast2-network-3.1.89/package/yast2-network.changes --- old/yast2-network-3.1.87/package/yast2-network.changes 2014-08-26 09:44:38.000000000 +0200 +++ new/yast2-network-3.1.89/package/yast2-network.changes 2014-08-28 16:19:30.000000000 +0200 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Thu Aug 28 11:16:20 UTC 2014 - lslezak@suse.cz + +- write the proxy credentials from install.inf separately, make it + compatible with the proxy module used at installed system + (bnc#885957) +- 3.1.89 + +------------------------------------------------------------------- +Wed Aug 27 14:39:13 UTC 2014 - mfilka@suse.com + +- bnc#893638 + - handle abort button correctly during installation +- 3.1.88 + +------------------------------------------------------------------- Mon Aug 25 10:46:44 UTC 2014 - mfilka@suse.com - bnc#891517 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.87/package/yast2-network.spec new/yast2-network-3.1.89/package/yast2-network.spec --- old/yast2-network-3.1.87/package/yast2-network.spec 2014-08-26 09:44:38.000000000 +0200 +++ new/yast2-network-3.1.89/package/yast2-network.spec 2014-08-28 16:19:30.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.87 +Version: 3.1.89 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.87/src/include/network/lan/complex.rb new/yast2-network-3.1.89/src/include/network/lan/complex.rb --- old/yast2-network-3.1.87/src/include/network/lan/complex.rb 2014-08-26 09:44:38.000000000 +0200 +++ new/yast2-network-3.1.89/src/include/network/lan/complex.rb 2014-08-28 16:19:30.000000000 +0200 @@ -512,9 +512,12 @@ # changes already. Calling this function may results in confirmation # popup. def input_done?(ret) - if ret == :abort && LanItems.modified - return ReallyAbort() + return true if ret != :abort + + if Stage.initial + return Popup.ConfirmAbort(:painless) else + return ReallyAbort() if LanItems.modified return true end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.87/src/lib/network/install_inf_convertor.rb new/yast2-network-3.1.89/src/lib/network/install_inf_convertor.rb --- old/yast2-network-3.1.87/src/lib/network/install_inf_convertor.rb 2014-08-26 09:44:38.000000000 +0200 +++ new/yast2-network-3.1.89/src/lib/network/install_inf_convertor.rb 2014-08-28 16:19:31.000000000 +0200 @@ -245,23 +245,21 @@ return false if proxyUrl.empty? - proxy = URI(proxyUrl) - proxyProto = proxy.scheme - - # do not log the password - log_proxy = proxy.dup - log_proxy.password = "********" if log_proxy.password - log.info("Writing proxy settings: #{proxyProto}_proxy = '#{log_proxy}'") - Proxy.Read ex = Proxy.Export - # bnc#693640 - update Proxy module's configuration - # username and password is stored in url because it is handled by linuxrc this way and it is impossible - # to distinguish how the user inserted it (separate or as a part of url?) - ex["#{proxyProto}_proxy"] = proxyUrl + proxy = URI(proxyUrl) + proxyProto = proxy.scheme + + # save user name and password separately + ex["proxy_user"] = proxy.user + proxy.user = nil + ex["proxy_password"] = proxy.password + proxy.password = nil + ex["#{proxyProto}_proxy"] = proxy.to_s ex["enabled"] = true - log.debug("Written proxy settings: #{ex}") + log.info "Writing proxy settings: #{proxyProto}_proxy = '#{proxy}'" + log.debug "Writing proxy settings: #{ex}" Proxy.Import(ex) Proxy.Write diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.87/test/complex_test.rb new/yast2-network-3.1.89/test/complex_test.rb --- old/yast2-network-3.1.87/test/complex_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-3.1.89/test/complex_test.rb 2014-08-28 16:19:31.000000000 +0200 @@ -0,0 +1,74 @@ +#!/usr/bin/env rspec + +require_relative "test_helper" + +require "yast" + +include Yast::UIShortcuts +include Yast::I18n + +Yast.import "LanItems" +Yast.import "Stage" + +# creating a wrapper for Yast's 'header' file +$LOAD_PATH.unshift File.expand_path('../../src', __FILE__) +require "include/network/lan/complex" + +class NetworkLanComplexInclude + extend Yast::NetworkLanComplexInclude +end + +describe "NetworkLanComplexInclude::input_done?" do + + BOOLEAN_PLACEHOLDER = "placeholder (true or false)" + + context "when not running in installer" do + + before(:each) do + allow(Yast::Stage) + .to receive(:initial) + .and_return(false) + end + + it "returns true for input different than :abort" do + expect(NetworkLanComplexInclude.input_done?(:no_abort)).to eql true + end + + it "returns true for input equal to :abort in case of no user modifications" do + allow(Yast::LanItems) + .to receive(:modified) + .and_return(false) + + expect(NetworkLanComplexInclude.input_done?(:abort)).to eql true + end + + it "asks user for abort confirmation for input equal to :abort and user did modifications" do + allow(Yast::LanItems) + .to receive(:modified) + .and_return(true) + + expect(NetworkLanComplexInclude) + .to receive(:ReallyAbort) + .and_return(BOOLEAN_PLACEHOLDER) + + expect(NetworkLanComplexInclude.input_done?(:abort)).to eql BOOLEAN_PLACEHOLDER + end + end + + context "when running in installer" do + + before(:each) do + allow(Yast::Stage) + .to receive(:initial) + .and_return(true) + end + + it "asks user for installation abort confirmation for input equal to :abort" do + expect(Yast::Popup) + .to receive(:ConfirmAbort) + .and_return(BOOLEAN_PLACEHOLDER) + + expect(NetworkLanComplexInclude.input_done?(:abort)).to eql BOOLEAN_PLACEHOLDER + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.87/test/install_inf_convertor_test.rb new/yast2-network-3.1.89/test/install_inf_convertor_test.rb --- old/yast2-network-3.1.87/test/install_inf_convertor_test.rb 2014-08-26 09:44:38.000000000 +0200 +++ new/yast2-network-3.1.89/test/install_inf_convertor_test.rb 2014-08-28 16:19:31.000000000 +0200 @@ -202,6 +202,7 @@ describe "#write_proxy" do let(:proxy_url) { "http://example.com:3128" } + let(:auth_proxy_url) { "http://user:passwd@example.com:3128" } it "writes proxy configuration if defined in install.inf" do expect(Yast::InstallInfConvertor::InstallInf).to receive(:[]) @@ -223,6 +224,31 @@ end expect(Yast::Proxy).to receive(:Write).and_return(true) + expect(Yast::InstallInfConvertor.instance.send(:write_proxy)).to be_true + end + + it "writes proxy credentials separately" do + expect(Yast::InstallInfConvertor::InstallInf).to receive(:[]) + .with("ProxyURL").and_return(auth_proxy_url) + + expect(Yast::Proxy).to receive(:Read).and_return(true) + expect(Yast::Proxy).to receive(:Export).and_return( + "enabled" => false, + "http_proxy" => "", + "https_proxy" => "", + "ftp_proxy" => "", + "no_proxy" => "localhost, 127.0.0.1", + "proxy_user" => "", + "proxy_password" => "" + ) + expect(Yast::Proxy).to receive(:Import) do |config| + # proxy is enabled and the URL without credentials is set + expect(config).to include("enabled" => true, "http_proxy" => proxy_url, + "proxy_user" => "user", "proxy_password" => "passwd" + ) + end + expect(Yast::Proxy).to receive(:Write).and_return(true) + expect(Yast::InstallInfConvertor.instance.send(:write_proxy)).to be_true end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.87/test/Makefile.am new/yast2-network-3.1.89/test/Makefile.am --- old/yast2-network-3.1.87/test/Makefile.am 2014-08-26 09:44:38.000000000 +0200 +++ new/yast2-network-3.1.89/test/Makefile.am 2014-08-28 16:19:31.000000000 +0200 @@ -12,6 +12,7 @@ routing_test.rb \ suse_firewall_4_network_test.rb \ widgets_test.rb \ + complex_test.rb \ read_hardware_test.rb TEST_EXTENSIONS = .rb continue with "q"... Checked in at Thu Aug 28 16:58:21 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