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-registration -> sle12 ## BNC# 885957 : "SCC registration failed via proxy with authentication requried." (ASSIGNED/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes 2014-08-27 16:13:07.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-08-28 17:53:39.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Aug 28 14:06:14 UTC 2014 - lslezak@suse.cz + +- read proxy credentials from .curlrc file (bnc#885957) +- do not ask for network configuration in Autoyast mode +- 3.1.112 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-registration ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-registration (Old) and /mounts/work_src_done/SLE12/yast2-registration (BS:build ID:43232 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-registration-3.1.111.tar.bz2 New: ---- yast2-registration-3.1.112.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.0Zdwkj/_old 2014-08-29 14:26:14.000000000 +0200 +++ /var/tmp/diff_new_pack.0Zdwkj/_new 2014-08-29 14:26:14.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.111 +Version: 3.1.112 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-registration-3.1.111.tar.bz2 -> yast2-registration-3.1.112.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.111/package/yast2-registration.changes new/yast2-registration-3.1.112/package/yast2-registration.changes --- old/yast2-registration-3.1.111/package/yast2-registration.changes 2014-08-27 08:39:31.000000000 +0200 +++ new/yast2-registration-3.1.112/package/yast2-registration.changes 2014-08-28 17:49:32.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Aug 28 14:06:14 UTC 2014 - lslezak@suse.cz + +- read proxy credentials from .curlrc file (bnc#885957) +- do not ask for network configuration in Autoyast mode +- 3.1.112 + +------------------------------------------------------------------- Tue Aug 26 18:34:07 UTC 2014 - ancor@suse.com - Added proper handling for the user clicking the cancel button in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.111/package/yast2-registration.spec new/yast2-registration-3.1.112/package/yast2-registration.spec --- old/yast2-registration-3.1.111/package/yast2-registration.spec 2014-08-27 08:39:31.000000000 +0200 +++ new/yast2-registration-3.1.112/package/yast2-registration.spec 2014-08-28 17:49:32.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.111 +Version: 3.1.112 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.111/src/lib/registration/connect_helpers.rb new/yast2-registration-3.1.112/src/lib/registration/connect_helpers.rb --- old/yast2-registration-3.1.111/src/lib/registration/connect_helpers.rb 2014-08-27 08:39:31.000000000 +0200 +++ new/yast2-registration-3.1.112/src/lib/registration/connect_helpers.rb 2014-08-28 17:49:32.000000000 +0200 @@ -66,9 +66,9 @@ true rescue SocketError, Errno::ENETUNREACH => e log.error "Network error: #{e.class}: #{e.message}" - # Error popup - if Yast::Mode.installation || Yast::Mode.update + if (Yast::Mode.installation || Yast::Mode.update) && !(Yast::Mode.autoinst || Yast::Mode.autoupgrade) if Yast::Popup.YesNo( + # Error popup _("Network is not configured, the registration server cannot be reached.\n" + "Do you want to configure the network now?")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.111/src/lib/registration/downloader.rb new/yast2-registration-3.1.112/src/lib/registration/downloader.rb --- old/yast2-registration-3.1.111/src/lib/registration/downloader.rb 2014-08-27 08:39:31.000000000 +0200 +++ new/yast2-registration-3.1.112/src/lib/registration/downloader.rb 2014-08-28 17:49:32.000000000 +0200 @@ -27,6 +27,7 @@ require "uri" require "openssl" require "registration/exceptions" +require "suse/toolkit/curlrc_dotfile" module Registration @@ -47,6 +48,12 @@ file_url = URI(file_url) unless file_url.is_a?(URI) http = Net::HTTP.new(file_url.host, file_url.port) + if http.proxy? + log.info "Reading proxy credentials..." + http.proxy_user = SUSE::Toolkit::CurlrcDotfile.new.username + http.proxy_pass = SUSE::Toolkit::CurlrcDotfile.new.password + end + # switch to HTTPS connection if needed if file_url.is_a? URI::HTTPS http.use_ssl = true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.111/test/downloader_spec.rb new/yast2-registration-3.1.112/test/downloader_spec.rb --- old/yast2-registration-3.1.111/test/downloader_spec.rb 2014-08-27 08:39:31.000000000 +0200 +++ new/yast2-registration-3.1.112/test/downloader_spec.rb 2014-08-28 17:49:32.000000000 +0200 @@ -19,6 +19,7 @@ expect_any_instance_of(Net::HTTP).to receive(:request). with(an_instance_of(Net::HTTP::Get)).and_return(index) + expect_any_instance_of(Net::HTTP).to receive(:proxy?).and_return(false) expect(Registration::Downloader.download(url)).to eq("response") end @@ -33,6 +34,7 @@ # check for HTTPS setup expect_any_instance_of(Net::HTTP).to receive(:use_ssl=).with(true) expect_any_instance_of(Net::HTTP).to receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER) + expect_any_instance_of(Net::HTTP).to receive(:proxy?).and_return(false) https_url = "https://example.com" expect(Registration::Downloader.download(https_url)).to eq("response") @@ -44,6 +46,7 @@ expect_any_instance_of(Net::HTTP).to receive(:request). with(an_instance_of(Net::HTTP::Get)).and_return(index) + expect_any_instance_of(Net::HTTP).to receive(:proxy?).and_return(false) expect{Registration::Downloader.download(url)}.to raise_error Registration::DownloadError, "Downloading #{url} failed: Not Found" @@ -59,9 +62,27 @@ http = double() expect(Net::HTTP).to receive(:new).twice.and_return(http) expect(http).to receive(:request).twice.and_return(index1, index2) + expect(http).to receive(:proxy?).twice.and_return(false) expect(Registration::Downloader.download(url)).to eq("response") end - end + it "reads proxy credentials when proxy is used" do + user = "proxy_user" + password = "proxy_password" + index = Net::HTTPSuccess.new("1.1", 200, "OK") + expect(index).to receive(:body).and_return("response") + + expect_any_instance_of(Net::HTTP).to receive(:request). + with(an_instance_of(Net::HTTP::Get)).and_return(index) + expect_any_instance_of(Net::HTTP).to receive(:proxy?).and_return(true) + expect_any_instance_of(SUSE::Toolkit::CurlrcDotfile).to receive(:username).and_return(user) + expect_any_instance_of(SUSE::Toolkit::CurlrcDotfile).to receive(:password).and_return(password) + expect_any_instance_of(Net::HTTP).to receive(:proxy_user=).with(user) + expect_any_instance_of(Net::HTTP).to receive(:proxy_pass=).with(password) + + expect(Registration::Downloader.download(url)).to eq("response") + end + + end end continue with "q"... Checked in at Fri Aug 29 14:26:45 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