Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2015-08-10 09:10:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2015-08-05 19:14:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2015-08-10 09:10:01.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 7 12:53:08 UTC 2015 - igonzalezsosa@suse.com + +- Fix release notes loading when network is not working (bsc#940648) +- 3.1.153 + +------------------------------------------------------------------- Old: ---- yast2-installation-3.1.152.tar.bz2 New: ---- yast2-installation-3.1.153.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.KZ6ODW/_old 2015-08-10 09:10:02.000000000 +0200 +++ /var/tmp/diff_new_pack.KZ6ODW/_new 2015-08-10 09:10:02.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.152 +Version: 3.1.153 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-3.1.152.tar.bz2 -> yast2-installation-3.1.153.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.152/package/yast2-installation.changes new/yast2-installation-3.1.153/package/yast2-installation.changes --- old/yast2-installation-3.1.152/package/yast2-installation.changes 2015-08-05 14:59:11.000000000 +0200 +++ new/yast2-installation-3.1.153/package/yast2-installation.changes 2015-08-07 17:39:09.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 7 12:53:08 UTC 2015 - igonzalezsosa@suse.com + +- Fix release notes loading when network is not working (bsc#940648) +- 3.1.153 + +------------------------------------------------------------------- Wed Aug 5 11:45:25 UTC 2015 - jsrain@suse.cz - store cio_ignore settings before installing bootloader diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.152/package/yast2-installation.spec new/yast2-installation-3.1.153/package/yast2-installation.spec --- old/yast2-installation-3.1.152/package/yast2-installation.spec 2015-08-05 14:59:11.000000000 +0200 +++ new/yast2-installation-3.1.153/package/yast2-installation.spec 2015-08-07 17:39:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.152 +Version: 3.1.153 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.152/src/lib/installation/clients/inst_system_analysis.rb new/yast2-installation-3.1.153/src/lib/installation/clients/inst_system_analysis.rb --- old/yast2-installation-3.1.152/src/lib/installation/clients/inst_system_analysis.rb 2015-08-05 14:59:11.000000000 +0200 +++ new/yast2-installation-3.1.153/src/lib/installation/clients/inst_system_analysis.rb 2015-08-07 17:39:09.000000000 +0200 @@ -293,7 +293,7 @@ # try on-line release notes first WFM.CallFunction("inst_download_release_notes") - if !InstData.release_notes.empty? && + if !InstData.release_notes.empty? || !load_release_notes(Packages.GetBaseSourceID) return end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.152/test/inst_system_analysis_test.rb new/yast2-installation-3.1.153/test/inst_system_analysis_test.rb --- old/yast2-installation-3.1.152/test/inst_system_analysis_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.1.153/test/inst_system_analysis_test.rb 2015-08-07 17:39:09.000000000 +0200 @@ -0,0 +1,62 @@ +#!/usr/bin/env rspec + +require_relative "./test_helper" +require "installation/clients/inst_system_analysis" + +Yast.import "Product" +Yast.import "InstData" +Yast.import "Packages" + +describe Yast::InstSystemAnalysisClient do + describe "#download_and_show_release_notes" do + let(:product) { "openSUSE" } + let(:notes) { "some release notes" } + + before do + allow(Yast::WFM).to receive(:CallFunction).with("inst_download_release_notes") + .and_return(:auto) + allow(Yast::Product).to receive(:short_name).and_return(product) + allow(Yast::InstData).to receive(:release_notes).and_return(release_notes) + end + + context "when release notes were downloaded" do + let(:release_notes) { { product => notes } } + + it "does not enable the button nor load release notes again" do + expect(Yast::Wizard).to_not receive(:ShowReleaseNotesButton) + expect(Yast::UI).to_not receive(:SetReleaseNotes) + subject.download_and_show_release_notes + end + end + + context "when release notes were not downloaded" do + let(:release_notes) { {} } + + context "but can be loaded from media" do + before do + allow(subject).to receive(:load_release_notes).and_return(true) + subject.instance_variable_set(:@media_text, notes) + end + + it "enables the button and load the release notes" do + expect(Yast::Wizard).to receive(:ShowReleaseNotesButton) + expect(Yast::UI).to receive(:SetReleaseNotes).with(product => notes) + subject.download_and_show_release_notes + expect(Yast::InstData.release_notes).to eq(product => notes) + end + end + + context "and could not be loaded from media" do + before do + allow(subject).to receive(:load_release_notes).and_return(false) + end + + it "does not enable the button nor load release notes" do + expect(Yast::Wizard).to_not receive(:ShowReleaseNotesButton) + expect(Yast::UI).to_not receive(:SetReleaseNotes) + subject.download_and_show_release_notes + end + end + end + end +end