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-network -> sle12 ## BNC# 885957 : "SCC registration failed via proxy with authentication requried." (ASSIGNED/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes 2014-08-13 13:05:43.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes 2014-08-13 14:10:17.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Aug 13 11:09:05 UTC 2014 - lslezak@suse.cz + +- properly convert proxy configuration from install.inf during + installation (bnc#885957) +- 3.1.80 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-network - at least 14 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-network (Old) and /mounts/work_src_done/SLE12/yast2-network (BS:build ID:42583 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-network-3.1.79.tar.bz2 New: ---- yast2-network-3.1.80.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.laIqRV/_old 2014-08-13 15:33:21.000000000 +0200 +++ /var/tmp/diff_new_pack.laIqRV/_new 2014-08-13 15:33:21.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.79 +Version: 3.1.80 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.79.tar.bz2 -> yast2-network-3.1.80.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.79/package/yast2-network.changes new/yast2-network-3.1.80/package/yast2-network.changes --- old/yast2-network-3.1.79/package/yast2-network.changes 2014-08-13 11:19:55.000000000 +0200 +++ new/yast2-network-3.1.80/package/yast2-network.changes 2014-08-13 14:04:52.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Aug 13 11:09:05 UTC 2014 - lslezak@suse.cz + +- properly convert proxy configuration from install.inf during + installation (bnc#885957) +- 3.1.80 + +------------------------------------------------------------------- Wed Aug 13 08:40:28 UTC 2014 - mvidner@suse.com - Fixed network_autoconfiguration_test stubbing on s390 (bnc#883836). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.79/package/yast2-network.spec new/yast2-network-3.1.80/package/yast2-network.spec --- old/yast2-network-3.1.79/package/yast2-network.spec 2014-08-13 11:19:55.000000000 +0200 +++ new/yast2-network-3.1.80/package/yast2-network.spec 2014-08-13 14:04:52.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.79 +Version: 3.1.80 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.79/src/lib/network/install_inf_convertor.rb new/yast2-network-3.1.80/src/lib/network/install_inf_convertor.rb --- old/yast2-network-3.1.79/src/lib/network/install_inf_convertor.rb 2014-08-13 11:19:55.000000000 +0200 +++ new/yast2-network-3.1.80/src/lib/network/install_inf_convertor.rb 2014-08-13 14:04:52.000000000 +0200 @@ -1,5 +1,5 @@ require "yast" - +require "uri" module Yast @@ -196,7 +196,7 @@ return false if nameserver.empty? # hostname is supposed to be FQDN (http://en.opensuse.org/Linuxrc) - # remember domain, use it as fallback below, if there is no DNS search + # remember domain, use it as fallback below, if there is no DNS search # domain (#476208) split = Hostname.SplitFQ(hostname) if !hostname.empty? && !IP.Check(hostname) fqdomain = "" @@ -245,9 +245,13 @@ return false if proxyUrl.empty? - proxyProto = proxyUrl.sub(/:.*/, "") + proxy = URI(proxyUrl) + proxyProto = proxy.scheme - log.info("Writing proxy settings: #{proxyProto}_proxy = '#{proxyUrl}'") + # 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 @@ -255,7 +259,8 @@ # 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 if ex + ex["#{proxyProto}_proxy"] = proxyUrl + ex["enabled"] = true log.debug("Written proxy settings: #{ex}") Proxy.Import(ex) @@ -371,7 +376,7 @@ # authoritative sources of device name are: # - hwinfo - # - install.inf + # - install.inf # nobody else was able to edit device name so far (so ifcfg["NAME"]) # is empty hw_name = HardwareName(hardware, device_name) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.79/test/install_inf_convertor_test.rb new/yast2-network-3.1.80/test/install_inf_convertor_test.rb --- old/yast2-network-3.1.79/test/install_inf_convertor_test.rb 2014-08-13 11:19:55.000000000 +0200 +++ new/yast2-network-3.1.80/test/install_inf_convertor_test.rb 2014-08-13 14:04:52.000000000 +0200 @@ -200,4 +200,41 @@ end + describe "#write_proxy" do + let(:proxy_url) { "http://example.com:3128" } + + it "writes proxy configuration if defined in install.inf" do + expect(Yast::InstallInfConvertor::InstallInf).to receive(:[]) + .with("ProxyURL").and_return(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 is set + expect(config).to include("enabled" => true, "http_proxy" => proxy_url) + end + expect(Yast::Proxy).to receive(:Write).and_return(true) + + expect(Yast::InstallInfConvertor.instance.send(:write_proxy)).to be_true + end + + it "does not write proxy configuration if not defined in install.inf" do + expect(Yast::InstallInfConvertor::InstallInf).to receive(:[]) + .with("ProxyURL").and_return("") + + expect(Yast::Proxy).to receive(:Read).never + expect(Yast::Proxy).to receive(:Write).never + + expect(Yast::InstallInfConvertor.instance.send(:write_proxy)).to be_false + end + end + end continue with "q"... Checked in at Wed Aug 13 15:33:32 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org