Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2018-05-22 16:58:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation" Tue May 22 16:58:46 2018 rev:405 rq:610370 version:4.0.61 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2018-05-17 19:32:35.460858289 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2018-05-22 16:58:49.659068885 +0200 @@ -1,0 +2,6 @@ +Fri May 18 13:16:30 UTC 2018 - igonzalezs...@suse.com + +- Fix installation mode detection (related to bsc#1089547). +- 4.0.61 + +------------------------------------------------------------------- Old: ---- yast2-installation-4.0.60.tar.bz2 New: ---- yast2-installation-4.0.61.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.K8U9eb/_old 2018-05-22 16:58:50.319044872 +0200 +++ /var/tmp/diff_new_pack.K8U9eb/_new 2018-05-22 16:58:50.323044726 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 4.0.60 +Version: 4.0.61 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -28,7 +28,7 @@ Requires: yast2-ruby-bindings >= 4.0.6 Summary: YaST2 - Installation Parts -License: GPL-2.0-only +License: GPL-2.0 Group: System/YaST Source1: YaST2-Second-Stage.service ++++++ yast2-installation-4.0.60.tar.bz2 -> yast2-installation-4.0.61.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.0.60/package/yast2-installation.changes new/yast2-installation-4.0.61/package/yast2-installation.changes --- old/yast2-installation-4.0.60/package/yast2-installation.changes 2018-05-16 15:51:12.000000000 +0200 +++ new/yast2-installation-4.0.61/package/yast2-installation.changes 2018-05-18 15:55:42.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri May 18 13:16:30 UTC 2018 - igonzalezs...@suse.com + +- Fix installation mode detection (related to bsc#1089547). +- 4.0.61 + +------------------------------------------------------------------- Wed May 16 12:50:36 UTC 2018 - jlo...@suse.com - Do not try to set read-only property to default BTRFS subvolume diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.0.60/package/yast2-installation.spec new/yast2-installation-4.0.61/package/yast2-installation.spec --- old/yast2-installation-4.0.60/package/yast2-installation.spec 2018-05-16 15:51:12.000000000 +0200 +++ new/yast2-installation-4.0.61/package/yast2-installation.spec 2018-05-18 15:55:42.000000000 +0200 @@ -16,7 +16,7 @@ # Name: yast2-installation -Version: 4.0.60 +Version: 4.0.61 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.0.60/src/lib/installation/clients/inst_system_analysis.rb new/yast2-installation-4.0.61/src/lib/installation/clients/inst_system_analysis.rb --- old/yast2-installation-4.0.60/src/lib/installation/clients/inst_system_analysis.rb 2018-05-16 15:51:12.000000000 +0200 +++ new/yast2-installation-4.0.61/src/lib/installation/clients/inst_system_analysis.rb 2018-05-18 15:55:42.000000000 +0200 @@ -196,7 +196,7 @@ # This error message is only shown when no disks where found during a normal # installation. The autoinstallation case will be handled later by AutoYaST at # https://github.com/yast/yast-autoinstallation/blob/8e414637d8157462bee5e1ee29c5d2e747754670/src/modules/AutoinstStorage.rb#L334 - if devicegraph.empty? && !Mode.auto? + if devicegraph.empty? && !Mode.auto Report.Error( Builtins.sformat( # TRANSLATORS: Error pop-up diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.0.60/test/lib/clients/inst_system_analysis_test.rb new/yast2-installation-4.0.61/test/lib/clients/inst_system_analysis_test.rb --- old/yast2-installation-4.0.60/test/lib/clients/inst_system_analysis_test.rb 2018-05-16 15:51:12.000000000 +0200 +++ new/yast2-installation-4.0.61/test/lib/clients/inst_system_analysis_test.rb 2018-05-18 15:55:42.000000000 +0200 @@ -29,20 +29,21 @@ instance_double(Y2Storage::StorageManager, activate: true, probe: nil, probed: devicegraph) end - let(:devicegraph) { instance_double(Y2Storage::Devicegraph, empty?: false) } + let(:devicegraph) { instance_double(Y2Storage::Devicegraph, empty?: empty) } let(:auto) { false } let(:activate_result) { true } let(:probe_result) { true } + let(:empty) { false } + let(:callbacks_class) { double("Y2Autoinstallation::ActivateCallbacks", new: callbacks) } + let(:callbacks) { instance_double("Y2Autoinstallation::ActivateCallbacks") } before do allow(client).to receive(:require).with("autoinstall/activate_callbacks") - end - - before do allow(Y2Storage::StorageManager).to receive(:instance).and_return(storage) allow(storage).to receive(:activate).and_return activate_result allow(storage).to receive(:probe).and_return probe_result allow(Yast::Mode).to receive(:auto).and_return(auto) + stub_const("Y2Autoinstallation::ActivateCallbacks", callbacks_class) end it "uses default activation callbacks" do @@ -53,10 +54,6 @@ context "when running AutoYaST" do let(:auto) { true } - let(:callbacks_class) { double("Y2Autoinstallation::ActivateCallbacks", new: callbacks) } - let(:callbacks) { instance_double("Y2Autoinstallation::ActivateCallbacks") } - - before { stub_const("Y2Autoinstallation::ActivateCallbacks", callbacks_class) } it "uses AutoYaST activation callbacks" do expect(storage).to receive(:activate).with(callbacks).and_return true @@ -80,5 +77,27 @@ expect { client.ActionHDDProbe }.to raise_error Yast::AbortException end end + + context "when no devices are detected" do + let(:empty) { true } + + context "and not running AutoYaST" do + let(:auto) { false } + + it "displays an error" do + expect(Yast::Report).to receive(:Error) + client.ActionHDDProbe + end + end + + context "and running AutoYaST" do + let(:auto) { true } + + it "does not display any error" do + expect(Yast::Report).to_not receive(:Error) + client.ActionHDDProbe + end + end + end end end