Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2020-07-01 14:25:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Wed Jul 1 14:25:51 2020 rev:486 rq:817856 version:4.3.12 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2020-06-27 23:21:58.157701754 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new.3060/yast2.changes 2020-07-01 14:26:02.202645082 +0200 @@ -1,0 +2,20 @@ +Mon Jun 29 15:26:44 UTC 2020 - sch...@suse.de +- Products: Do not solve dependencies while checking libzypp + connection (bsc#1170322). +- 4.3.12 + +------------------------------------------------------------------- +Mon Jun 29 14:26:44 UTC 2020 - José Iván López González <jlo...@suse.com> + +- Avoid failure when downloading release notes from an inoperative + proxy (bsc#1173447). +- 4.3.11 + +------------------------------------------------------------------- +Fri Jun 26 15:00:17 UTC 2020 - Imobach Gonzalez Sosa <igonzalezs...@suse.com> + +- AutoClient#export method can receive a hash as an argument + (bsc#1171356). +- 4.3.10 + +------------------------------------------------------------------- Old: ---- yast2-4.3.9.tar.bz2 New: ---- yast2-4.3.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.gWMUJt/_old 2020-07-01 14:26:02.942647377 +0200 +++ /var/tmp/diff_new_pack.gWMUJt/_new 2020-07-01 14:26:02.946647389 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2 # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,17 +12,17 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: yast2 -Version: 4.3.9 +Version: 4.3.12 Release: 0 Summary: YaST2 Main Package License: GPL-2.0-only Group: System/YaST -URL: https://github.com/yast/yast-yast2 +Url: https://github.com/yast/yast-yast2 Source0: %{name}-%{version}.tar.bz2 Source1: yast2-rpmlintrc ++++++ yast2-4.3.9.tar.bz2 -> yast2-4.3.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.3.9/library/general/src/lib/installation/auto_client.rb new/yast2-4.3.12/library/general/src/lib/installation/auto_client.rb --- old/yast2-4.3.9/library/general/src/lib/installation/auto_client.rb 2020-06-22 09:07:29.000000000 +0200 +++ new/yast2-4.3.12/library/general/src/lib/installation/auto_client.rb 2020-06-30 13:01:18.000000000 +0200 @@ -61,7 +61,10 @@ when "Import" import(param) when "Export" - export + target = param["target"] if param.is_a?(Hash) + target ||= "default" + m = method(:export) + m.arity.zero? ? export : export(target: target.to_sym) when "Summary" summary when "Reset" @@ -99,9 +102,11 @@ # # The profile is a Hash or an Array according to the configuration item # `X-SuSE-YaST-AutoInstDataType` + # @param target [Symbol] Control how much information should be exported + # (e.g., :default or :compact). # @return [Hash, Array] profile data - def export - raise NotImplementedError, "Calling abstract method 'export'" + def export(target:) + raise NotImplementedError, "Calling abstract method 'export' with target '#{target}'" end # Provide a brief summary of configuration. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.3.9/library/general/test/auto_client_test.rb new/yast2-4.3.12/library/general/test/auto_client_test.rb --- old/yast2-4.3.9/library/general/test/auto_client_test.rb 2020-06-22 09:07:29.000000000 +0200 +++ new/yast2-4.3.12/library/general/test/auto_client_test.rb 2020-06-30 13:01:18.000000000 +0200 @@ -9,11 +9,21 @@ args.empty? ? "import" : args end - ["export", "summary", "reset", "change", "write", "packages", "read", "modified?", "modified"].each do |m| + def export(target:) + target + end + + ["summary", "reset", "change", "write", "packages", "read", "modified?", "modified"].each do |m| define_method(m.to_sym) { m } end end +class ExportTestAuto < ::Installation::AutoClient + def export + "export" + end +end + describe ::Installation::AutoClient do subject { ::TestAuto } describe ".run" do @@ -45,11 +55,29 @@ context "first client argument is Export" do before do - allow(Yast::WFM).to receive(:Args).and_return(["Export", {}]) + allow(Yast::WFM).to receive(:Args).and_return(["Export"]) end it "dispatch call to abstract method export" do - expect(subject.run).to eq "export" + expect(subject.run).to eq(:default) + end + + context "when 'target' argument is given an accepted by export method" do + before do + allow(Yast::WFM).to receive(:Args).and_return(["Export", { "target" => "compact" }]) + end + + it "dispatch call to abstract method export with 'target' argument" do + expect(subject.run).to eq(:compact) + end + end + + context "when #export does not receive any argument" do + subject { ::ExportTestAuto } + + it "dispatch call to abstract method export with no arguments" do + expect(subject.run).to eq "export" + end end it "raise NotImplementedError exception if abstract method not defined" do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.3.9/library/packages/src/lib/y2packager/release_notes_fetchers/url.rb new/yast2-4.3.12/library/packages/src/lib/y2packager/release_notes_fetchers/url.rb --- old/yast2-4.3.9/library/packages/src/lib/y2packager/release_notes_fetchers/url.rb 2020-06-22 09:07:29.000000000 +0200 +++ new/yast2-4.3.12/library/packages/src/lib/y2packager/release_notes_fetchers/url.rb 2020-06-30 13:01:18.000000000 +0200 @@ -256,13 +256,15 @@ return @curl_proxy_args if @curl_proxy_args @curl_proxy_args = "" - # proxy should be set by inst_install_inf if set via Linuxrc + + # Proxy should be set by inst_install_inf if set via Linuxrc Yast::Proxy.Read - # Test if proxy works return @curl_proxy_args unless Yast::Proxy.enabled - # it is enough to test http proxy, release notes are downloaded via http + # Test if proxy works + # + # It is enough to test http proxy, release notes are downloaded via http proxy_ret = Yast::Proxy.RunTestProxy( Yast::Proxy.http, "", @@ -272,13 +274,15 @@ ) http_ret = proxy_ret.fetch("HTTP", {}) - if http_ret.fetch("tested", true) == true && http_ret.fetch("exit", 1) == 0 - user_pass = (Yast::Proxy.user != "") ? "#{Yast::Proxy.user}:#{Yast::Proxy.pass}" : "" - proxy = "--proxy #{Yast::Proxy.http}" - proxy << " --proxy-user '#{user_pass}'" unless user_pass.empty? - end + proxy_ok = http_ret.fetch("tested", true) == true && http_ret.fetch("exit", 1) == 0 + + return @curl_proxy_args unless proxy_ok + + user_pass = (Yast::Proxy.user != "") ? "#{Yast::Proxy.user}:#{Yast::Proxy.pass}" : "" + @curl_proxy_args = "--proxy #{Yast::Proxy.http}" + @curl_proxy_args << " --proxy-user '#{user_pass}'" unless user_pass.empty? - @curl_proxy_args = proxy + @curl_proxy_args end # Release notes index for the given product diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.3.9/library/packages/src/modules/Product.rb new/yast2-4.3.12/library/packages/src/modules/Product.rb --- old/yast2-4.3.9/library/packages/src/modules/Product.rb 2020-06-22 09:07:29.000000000 +0200 +++ new/yast2-4.3.12/library/packages/src/modules/Product.rb 2020-06-30 13:01:18.000000000 +0200 @@ -188,7 +188,6 @@ # Ensures that we can load data from libzypp # @return [Boolean] false if libzypp lock cannot be obtained, otherwise true - # (solver errors are ignored, see bnc#886588) def load_zypp if !PackageLock.Check Builtins.y2error("Packager is locked, can't read product info!") @@ -201,9 +200,6 @@ PackageSystem.EnsureSourceInit unless Stage.initial end - Pkg.PkgSolve(true) - - # ignore solver errors true end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.3.9/library/packages/test/y2packager/release_notes_fetchers/url_test.rb new/yast2-4.3.12/library/packages/test/y2packager/release_notes_fetchers/url_test.rb --- old/yast2-4.3.9/library/packages/test/y2packager/release_notes_fetchers/url_test.rb 2020-06-22 09:07:29.000000000 +0200 +++ new/yast2-4.3.12/library/packages/test/y2packager/release_notes_fetchers/url_test.rb 2020-06-30 13:01:18.000000000 +0200 @@ -226,36 +226,57 @@ allow(Yast::Proxy).to receive(:http).twice.and_return("http://proxy.example.com";) allow(Yast::Proxy).to receive(:user).and_return(proxy_user) allow(Yast::Proxy).to receive(:pass).and_return(proxy_pass) - test = { - "HTTP" => { - "tested" => true, - "exit" => 0 - } - } - allow(Yast::Proxy).to receive(:RunTestProxy).and_return(test) + allow(Yast::Proxy).to receive(:RunTestProxy).and_return(test_result) end - context "and no user or password are specified" do - let(:proxy_user) { "" } - let(:proxy_pass) { "" } + let(:proxy_user) { "" } + let(:proxy_pass) { "" } - it "uses an unauthenticated proxy" do - expect(Yast::SCR).to receive(:Execute) do |_path, cmd| - expect(cmd).to include("--proxy http://proxy.example.com";) - expect(cmd).to_not include("--proxy-user") + context "and the proxy is working" do + let(:test_result) do + { + "HTTP" => { + "tested" => true, + "exit" => 0 + } + } + end + + context "and no user or password are specified" do + let(:proxy_user) { "" } + let(:proxy_pass) { "" } + + it "uses an unauthenticated proxy" do + expect(Yast::SCR).to receive(:Execute) do |_path, cmd| + expect(cmd).to include("--proxy http://proxy.example.com";) + expect(cmd).to_not include("--proxy-user") + end + + fetcher.release_notes(prefs) end + end - fetcher.release_notes(prefs) + context "and user and password are specified" do + let(:proxy_user) { "baggins" } + let(:proxy_pass) { "thief" } + + it "uses an authenticated proxy" do + expect(Yast::SCR).to receive(:Execute) do |_path, cmd| + expect(cmd).to include("--proxy http://proxy.example.com --proxy-user 'baggins:thief'") + end + + fetcher.release_notes(prefs) + end end end - context "and user and password are specified" do - let(:proxy_user) { "baggins" } - let(:proxy_pass) { "thief" } + context "when the proxy is not working" do + let(:test_result) { {} } - it "uses an authenticated proxy" do + it "does not use any specific proxy" do expect(Yast::SCR).to receive(:Execute) do |_path, cmd| - expect(cmd).to include("--proxy http://proxy.example.com --proxy-user 'baggins:thief'") + expect(cmd).to_not match(/--proxy/) + expect(cmd).to_not match(/--proxy-user/) end fetcher.release_notes(prefs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.3.9/package/yast2.changes new/yast2-4.3.12/package/yast2.changes --- old/yast2-4.3.9/package/yast2.changes 2020-06-22 09:07:29.000000000 +0200 +++ new/yast2-4.3.12/package/yast2.changes 2020-06-30 13:01:18.000000000 +0200 @@ -1,4 +1,24 @@ ------------------------------------------------------------------- +Mon Jun 29 15:26:44 UTC 2020 - sch...@suse.de +- Products: Do not solve dependencies while checking libzypp + connection (bsc#1170322). +- 4.3.12 + +------------------------------------------------------------------- +Mon Jun 29 14:26:44 UTC 2020 - José Iván López González <jlo...@suse.com> + +- Avoid failure when downloading release notes from an inoperative + proxy (bsc#1173447). +- 4.3.11 + +------------------------------------------------------------------- +Fri Jun 26 15:00:17 UTC 2020 - Imobach Gonzalez Sosa <igonzalezs...@suse.com> + +- AutoClient#export method can receive a hash as an argument + (bsc#1171356). +- 4.3.10 + +------------------------------------------------------------------- Sun Jun 21 20:01:42 UTC 2020 - Knut Anderssen <kander...@suse.com> - Add a method to change the selection of the network backend to be diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.3.9/package/yast2.spec new/yast2-4.3.12/package/yast2.spec --- old/yast2-4.3.9/package/yast2.spec 2020-06-22 09:07:29.000000000 +0200 +++ new/yast2-4.3.12/package/yast2.spec 2020-06-30 13:01:18.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 4.3.9 +Version: 4.3.12 Release: 0 Summary: YaST2 Main Package License: GPL-2.0-only
