Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2020-07-21 15:47:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation" Tue Jul 21 15:47:28 2020 rev:449 rq:821823 version:4.3.9 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2020-06-27 23:22:11.649746113 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new.3592/yast2-installation.changes 2020-07-21 15:49:01.712194645 +0200 @@ -1,0 +2,13 @@ +Thu Jul 16 11:01:42 CEST 2020 - [email protected] + +- Moving <files> section handling from second installation stage + to first installation stage. (bsc#1174194) +- 4.3.9 + +------------------------------------------------------------------- +Wed Jul 15 15:09:07 UTC 2020 - Josef Reidinger <[email protected]> + +- Do not use Profile.current unless necessary (bsc#1174173) +- 4.3.8 + +------------------------------------------------------------------- Old: ---- yast2-installation-4.3.7.tar.bz2 New: ---- yast2-installation-4.3.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.Azi0SE/_old 2020-07-21 15:49:03.064196317 +0200 +++ /var/tmp/diff_new_pack.Azi0SE/_new 2020-07-21 15:49:03.064196317 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 4.3.7 +Version: 4.3.9 Release: 0 Summary: YaST2 - Installation Parts License: GPL-2.0-only @@ -110,6 +110,8 @@ Conflicts: yast2-registration < 3.2.3 # Mouse-related scripts moved to yast2-mouse Conflicts: yast2-mouse < 2.18.0 +# new autoinst_files_finish call +Conflicts: autoyast2 < 4.3.26 Obsoletes: yast2-installation-devel-doc ++++++ yast2-installation-4.3.7.tar.bz2 -> yast2-installation-4.3.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.7/package/yast2-installation.changes new/yast2-installation-4.3.9/package/yast2-installation.changes --- old/yast2-installation-4.3.7/package/yast2-installation.changes 2020-06-25 16:08:05.000000000 +0200 +++ new/yast2-installation-4.3.9/package/yast2-installation.changes 2020-07-20 09:55:37.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Thu Jul 16 11:01:42 CEST 2020 - [email protected] + +- Moving <files> section handling from second installation stage + to first installation stage. (bsc#1174194) +- 4.3.9 + +------------------------------------------------------------------- +Wed Jul 15 15:09:07 UTC 2020 - Josef Reidinger <[email protected]> + +- Do not use Profile.current unless necessary (bsc#1174173) +- 4.3.8 + +------------------------------------------------------------------- Thu Jun 25 13:24:45 UTC 2020 - Martin Vidner <[email protected]> - Fix "Cmdline: parameter not set" for virt-install (bsc#1172139) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.7/package/yast2-installation.spec new/yast2-installation-4.3.9/package/yast2-installation.spec --- old/yast2-installation-4.3.7/package/yast2-installation.spec 2020-06-25 16:08:05.000000000 +0200 +++ new/yast2-installation-4.3.9/package/yast2-installation.spec 2020-07-20 09:55:37.000000000 +0200 @@ -16,7 +16,7 @@ # Name: yast2-installation -Version: 4.3.7 +Version: 4.3.9 Release: 0 Group: System/YaST License: GPL-2.0-only @@ -110,6 +110,8 @@ Conflicts: yast2-registration < 3.2.3 # Mouse-related scripts moved to yast2-mouse Conflicts: yast2-mouse < 2.18.0 +# new autoinst_files_finish call +Conflicts: autoyast2 < 4.3.26 Obsoletes: yast2-installation-devel-doc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.7/src/lib/installation/clients/inst_finish.rb new/yast2-installation-4.3.9/src/lib/installation/clients/inst_finish.rb --- old/yast2-installation-4.3.7/src/lib/installation/clients/inst_finish.rb 2020-06-25 16:08:05.000000000 +0200 +++ new/yast2-installation-4.3.9/src/lib/installation/clients/inst_finish.rb 2020-07-20 09:55:37.000000000 +0200 @@ -342,6 +342,7 @@ "ldconfig", "save_config", "live_save_config", + "autoinst_files", "security", "default_target", "desktop", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.7/src/lib/installation/clients/inst_update_installer.rb new/yast2-installation-4.3.9/src/lib/installation/clients/inst_update_installer.rb --- old/yast2-installation-4.3.7/src/lib/installation/clients/inst_update_installer.rb 2020-06-25 16:08:05.000000000 +0200 +++ new/yast2-installation-4.3.9/src/lib/installation/clients/inst_update_installer.rb 2020-07-20 09:55:37.000000000 +0200 @@ -172,8 +172,7 @@ # # @return [Boolean] true if self update has been disabled by AutoYaST profile def disabled_in_profile? - profile = Yast::Profile.current - !profile.fetch("general", {}).fetch("self_update", true) + AutoinstGeneral.self_update == false end # Return the self-update URLs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.7/src/lib/installation/minimal_installation.rb new/yast2-installation-4.3.9/src/lib/installation/minimal_installation.rb --- old/yast2-installation-4.3.7/src/lib/installation/minimal_installation.rb 2020-06-25 16:08:05.000000000 +0200 +++ new/yast2-installation-4.3.9/src/lib/installation/minimal_installation.rb 2020-07-20 09:55:37.000000000 +0200 @@ -14,9 +14,8 @@ Yast.import "Mode" if Yast::Mode.autoinst - Yast.import "Profile" - profile = Yast::Profile.current - @enabled = if profile["general"] && profile["general"]["minimal-configuration"] + Yast.import "AutoinstGeneral" + @enabled = if Yast::AutoinstGeneral.minimal_configuration? true else false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.7/src/lib/installation/update_repositories_finder.rb new/yast2-installation-4.3.9/src/lib/installation/update_repositories_finder.rb --- old/yast2-installation-4.3.7/src/lib/installation/update_repositories_finder.rb 2020-06-25 16:08:05.000000000 +0200 +++ new/yast2-installation-4.3.9/src/lib/installation/update_repositories_finder.rb 2020-07-20 09:55:37.000000000 +0200 @@ -105,8 +105,8 @@ def update_url_from_profile return nil unless Yast::Mode.auto - profile = Yast::Profile.current - profile_url = profile.fetch("general", {})["self_update_url"] + Yast.import "AutoinstGeneral" + profile_url = Yast::AutoinstGeneral.self_update_url get_url_from(profile_url) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.7/src/modules/InstFunctions.rb new/yast2-installation-4.3.9/src/modules/InstFunctions.rb --- old/yast2-installation-4.3.7/src/modules/InstFunctions.rb 2020-06-25 16:08:05.000000000 +0200 +++ new/yast2-installation-4.3.9/src/modules/InstFunctions.rb 2020-07-20 09:55:37.000000000 +0200 @@ -34,12 +34,12 @@ def main textdomain "installation" + Yast.import "AutoinstGeneral" Yast.import "Linuxrc" Yast.import "AutoinstConfig" Yast.import "Stage" Yast.import "Mode" Yast.import "ProductControl" - Yast.import "Profile" Yast.import "SCR" end @@ -149,8 +149,7 @@ return false unless Mode.auto - profile = Profile.current - in_profile = profile.fetch("general", {}).fetch("self_update", false) + in_profile = !!AutoinstGeneral.self_update log.info("Self update was enabled explicitly by the AY profile") if in_profile in_profile end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.7/test/inst_functions_test.rb new/yast2-installation-4.3.9/test/inst_functions_test.rb --- old/yast2-installation-4.3.7/test/inst_functions_test.rb 2020-06-25 16:08:05.000000000 +0200 +++ new/yast2-installation-4.3.9/test/inst_functions_test.rb 2020-07-20 09:55:37.000000000 +0200 @@ -270,6 +270,7 @@ .and_return(self_update_in_cmdline) allow(subject).to receive(:self_update_in_cmdline?) .and_return(self_update_in_cmdline) + allow(Yast::AutoinstGeneral).to receive(:self_update).and_return(nil) end context "when self_update=1 is provided by linuxrc" do @@ -287,11 +288,9 @@ end context "when self_update is explicitly enabled in an AutoYaST profile" do - let(:profile) { { "general" => { "self_update" => true } } } - it "returns true" do allow(Yast::Mode).to receive("auto").and_return(true) - allow(Yast::Profile).to receive("current").and_return(profile) + allow(Yast::AutoinstGeneral).to receive(:self_update).and_return(true) expect(subject.self_update_explicitly_enabled?).to eq true end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.7/test/inst_update_installer_test.rb new/yast2-installation-4.3.9/test/inst_update_installer_test.rb --- old/yast2-installation-4.3.7/test/inst_update_installer_test.rb 2020-06-25 16:08:05.000000000 +0200 +++ new/yast2-installation-4.3.9/test/inst_update_installer_test.rb 2020-07-20 09:55:37.000000000 +0200 @@ -37,6 +37,7 @@ before do allow(::Installation::UpdateRepositoriesFinder).to receive(:new).and_return(finder) allow(Yast::GetInstArgs).to receive(:going_back).and_return(false) + allow(Yast::AutoinstGeneral).to receive(:self_update).and_return(nil) allow(Yast::NetworkService).to receive(:isNetworkRunning).and_return(network_running) allow(::Installation::UpdatesManager).to receive(:new).and_return(manager) allow(Yast::Installation).to receive(:restarting?).and_return(restarting) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.7/test/lib/update_repositories_finder_test.rb new/yast2-installation-4.3.9/test/lib/update_repositories_finder_test.rb --- old/yast2-installation-4.3.7/test/lib/update_repositories_finder_test.rb 2020-06-25 16:08:05.000000000 +0200 +++ new/yast2-installation-4.3.9/test/lib/update_repositories_finder_test.rb 2020-07-20 09:55:37.000000000 +0200 @@ -29,6 +29,7 @@ allow(Yast::Linuxrc).to receive(:InstallInf).with("SelfUpdate") .and_return(url_from_linuxrc) allow(Yast::Pkg).to receive(:GetArchitecture).and_return(arch) + allow(Yast::AutoinstGeneral).to receive(:self_update_url).and_return(nil) end context "when URL was specified via Linuxrc" do @@ -43,13 +44,14 @@ context "when URL was specified via an AutoYaST profile" do let(:profile_url) { "http://ay.test.example.com/update"; } - let(:profile) { { "general" => { "self_update_url" => profile_url } } } before do allow(Yast::Mode).to receive(:auto).and_return(true) end it "returns the updates repository using the custom URL from the profile" do + allow(Yast::AutoinstGeneral).to receive(:self_update_url).and_return(profile_url) + expect(Installation::UpdateRepository).to receive(:new) .with(URI(profile_url), :user).and_return(repo) expect(finder.updates).to eq([repo]) @@ -199,9 +201,8 @@ end context "and enables the installer update explicitly by an AutoYaST profile" do - let(:profile) { { "general" => { "self_update" => true } } } - it "handles registration errors" do + allow(Yast::AutoinstGeneral).to receive(:self_update).and_return(true) allow(Yast::Mode).to receive(:auto).and_return(true) allow(finder).to receive(:import_registration_ayconfig) expect(Registration::ConnectHelpers).to receive(:catch_registration_errors) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.7/test/lib/upgrade_repo_manager_test.rb new/yast2-installation-4.3.9/test/lib/upgrade_repo_manager_test.rb --- old/yast2-installation-4.3.7/test/lib/upgrade_repo_manager_test.rb 2020-06-25 16:08:05.000000000 +0200 +++ new/yast2-installation-4.3.9/test/lib/upgrade_repo_manager_test.rb 2020-07-20 09:55:37.000000000 +0200 @@ -6,19 +6,19 @@ describe Installation::UpgradeRepoManager do let(:repo1) do Y2Packager::Repository.new(repo_id: 1, repo_alias: "test1", - url: "https://example.com/1";, raw_url: "https://example.com/1";, + url: URI("https://example.com/1";), raw_url: URI("https://example.com/1";), name: "repo1", enabled: true, autorefresh: true) end let(:repo2) do Y2Packager::Repository.new(repo_id: 2, repo_alias: "test2", - url: "https://example.com/2";, raw_url: "https://example.com/2";, + url: URI("https://example.com/2";), raw_url: URI("https://example.com/2";), name: "repo2", enabled: true, autorefresh: true) end let(:extra_repo) do Y2Packager::Repository.new(repo_id: 42, repo_alias: "extra", - url: "https://example.com/extra";, raw_url: "https://example.com/extra";, + url: URI("https://example.com/extra";), raw_url: URI("https://example.com/extra";), name: "extra", enabled: true, autorefresh: true) end @@ -42,7 +42,7 @@ describe "#repo_url" do it "returns the original raw URL if it has not been changed" do - expect(subject.repo_url(repo1)).to eq(repo1.raw_url) + expect(subject.repo_url(repo1)).to eq(repo1.raw_url.to_s) end end
