Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2016-04-28 20:31:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2016-04-22 16:18:36.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2016-04-28 20:31:05.000000000 +0200
@@ -1,0 +2,9 @@
+Wed Apr 20 10:47:12 UTC 2016 - [email protected]
+
+- Disk Activation step will be skipped in case of installer update
+ success (bsc#974409)
+- License agreement will be remembered in case of going back after
+ a installer update.
+- 3.1.182
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-3.1.181.tar.bz2
New:
----
yast2-installation-3.1.182.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.A6VjZy/_old 2016-04-28 20:31:06.000000000 +0200
+++ /var/tmp/diff_new_pack.A6VjZy/_new 2016-04-28 20:31:06.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.181
+Version: 3.1.182
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -50,7 +50,7 @@
Requires: autoyast2-installation >= 3.1.105
# Moved proc_modules.scr
-Requires: yast2 >= 3.1.180
+Requires: yast2 >= 3.1.186
# Language::GetLanguageItems and other API
# Language::Set (handles downloading the translation extensions)
@@ -63,7 +63,7 @@
Conflicts: yast2-mouse < 2.18.0
# New API for ProductLicense
-Requires: yast2-packager >= 2.19.2
+Requires: yast2-packager >= 3.1.96
# Storage::GetDetectedDiskPaths
Requires: yast2-storage >= 2.24.1
++++++ yast2-installation-3.1.181.tar.bz2 -> yast2-installation-3.1.182.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.181/doc/SELF_UPDATE.md
new/yast2-installation-3.1.182/doc/SELF_UPDATE.md
--- old/yast2-installation-3.1.181/doc/SELF_UPDATE.md 2016-04-19
15:25:10.000000000 +0200
+++ new/yast2-installation-3.1.182/doc/SELF_UPDATE.md 2016-04-28
15:04:36.000000000 +0200
@@ -37,12 +37,12 @@
1. The `SelfUpdate` boot option
2. The AutoYaST control file - in AutoYaST installation only, use the
- `/generic/self_update_url` XML node:
+ `/general/self_update_url` XML node:
```xml
- <generic>
+ <general>
<self_update_url>http://example.com/updates/$arch</self_update_url>
- </generic>
+ </general>
```
3. Hard-coded in the `control.xml` file on the installation medium (thus it
depends on the base product):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.181/package/yast2-installation.changes
new/yast2-installation-3.1.182/package/yast2-installation.changes
--- old/yast2-installation-3.1.181/package/yast2-installation.changes
2016-04-19 15:25:10.000000000 +0200
+++ new/yast2-installation-3.1.182/package/yast2-installation.changes
2016-04-28 15:04:36.000000000 +0200
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Wed Apr 20 10:47:12 UTC 2016 - [email protected]
+
+- Disk Activation step will be skipped in case of installer update
+ success (bsc#974409)
+- License agreement will be remembered in case of going back after
+ a installer update.
+- 3.1.182
+
+-------------------------------------------------------------------
Tue Apr 19 09:08:35 UTC 2016 - [email protected]
- Fix handling of license acceptance in welcome screen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.181/package/yast2-installation.spec
new/yast2-installation-3.1.182/package/yast2-installation.spec
--- old/yast2-installation-3.1.181/package/yast2-installation.spec
2016-04-19 15:25:10.000000000 +0200
+++ new/yast2-installation-3.1.182/package/yast2-installation.spec
2016-04-28 15:04:36.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.181
+Version: 3.1.182
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -47,7 +47,7 @@
Requires: autoyast2-installation >= 3.1.105
# Moved proc_modules.scr
-Requires: yast2 >= 3.1.180
+Requires: yast2 >= 3.1.186
# Language::GetLanguageItems and other API
# Language::Set (handles downloading the translation extensions)
@@ -60,7 +60,7 @@
Conflicts: yast2-mouse < 2.18.0
# New API for ProductLicense
-Requires: yast2-packager >= 2.19.2
+Requires: yast2-packager >= 3.1.96
# Storage::GetDetectedDiskPaths
Requires: yast2-storage >= 2.24.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.181/src/lib/installation/clients/inst_complex_welcome.rb
new/yast2-installation-3.1.182/src/lib/installation/clients/inst_complex_welcome.rb
---
old/yast2-installation-3.1.181/src/lib/installation/clients/inst_complex_welcome.rb
2016-04-19 15:25:10.000000000 +0200
+++
new/yast2-installation-3.1.182/src/lib/installation/clients/inst_complex_welcome.rb
2016-04-28 15:04:36.000000000 +0200
@@ -42,8 +42,10 @@
textdomain "installation"
+ @license_id = Ops.get(Pkg.SourceGetCurrent(true), 0, 0)
+
# ------------------------------------- main part of the client
-----------
- if data_stored? && !GetInstArgs.going_back
+ if Installation.restarting? && data_stored?
apply_data
return :next
end
@@ -53,8 +55,6 @@
@language = Language.language
@keyboard = ""
- @license_id = Ops.get(Pkg.SourceGetCurrent(true), 0, 0)
-
# ----------------------------------------------------------------------
# Build dialog
# ----------------------------------------------------------------------
@@ -100,7 +100,8 @@
Keyboard.Set(@keyboard)
Keyboard.user_decision = true
when :license_agreement
- InstData.product_license_accepted =
UI.QueryWidget(Id(:license_agreement), :Value)
+ read_ui_state
+ InstData.product_license_accepted = @license_accepted
when :language
next if Mode.config
read_ui_state
@@ -144,6 +145,7 @@
Wizard.EnableAbortButton
UI.ChangeWidget(Id(:language), :Value, @language)
+ UI.ChangeWidget(Id(:license_agreement), :Value, @license_accepted)
if Keyboard.user_decision
UI.ChangeWidget(Id(:keyboard), :Value, Keyboard.current_kbd)
@@ -286,8 +288,9 @@
end
def read_ui_state
- @language = UI.QueryWidget(Id(:language), :Value)
- @keyboard = UI.QueryWidget(Id(:keyboard), :Value)
+ @language = UI.QueryWidget(Id(:language), :Value)
+ @keyboard = UI.QueryWidget(Id(:keyboard), :Value)
+ @license_accepted = UI.QueryWidget(Id(:license_agreement), :Value)
end
def retranslate_yast
@@ -321,6 +324,7 @@
def setup_final_choice
Keyboard.Set(@keyboard)
+ InstData.product_license_accepted = @license_accepted
# Language has been set already.
# On first run store users decision as default.
@@ -357,8 +361,9 @@
def store_data
data = {
- "language" => @language,
- "keyboard" => @keyboard
+ "language" => @language,
+ "keyboard" => @keyboard,
+ "license_accepted" => @license_accepted
}
File.write(DATA_PATH, data.to_yaml)
@@ -366,8 +371,10 @@
def apply_data
data = YAML.load(File.read(DATA_PATH))
- @language = data["language"]
- @keyboard = data["keyboard"]
+ @language = data["language"]
+ @keyboard = data["keyboard"]
+ @license_accepted = data["license_accepted"]
+ ProductLicense.info_seen!(@license_id)
change_language
setup_final_choice
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.181/src/lib/installation/clients/inst_disks_activate.rb
new/yast2-installation-3.1.182/src/lib/installation/clients/inst_disks_activate.rb
---
old/yast2-installation-3.1.181/src/lib/installation/clients/inst_disks_activate.rb
2016-04-19 15:25:10.000000000 +0200
+++
new/yast2-installation-3.1.182/src/lib/installation/clients/inst_disks_activate.rb
2016-04-28 15:04:36.000000000 +0200
@@ -26,6 +26,9 @@
#
# $Id$
#
+
+require "installation/clients/inst_update_installer"
+
module Yast
class InstDisksActivateClient < Client
def main
@@ -55,6 +58,8 @@
@have_zfcp = false
@want_fcoe = false
+ return :next if Installation.restarting?
+
if Arch.s390
# popup label
UI.OpenDialog(Label(_("Detecting Available Controllers")))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.181/src/lib/installation/clients/inst_update_installer.rb
new/yast2-installation-3.1.182/src/lib/installation/clients/inst_update_installer.rb
---
old/yast2-installation-3.1.181/src/lib/installation/clients/inst_update_installer.rb
2016-04-19 15:25:10.000000000 +0200
+++
new/yast2-installation-3.1.182/src/lib/installation/clients/inst_update_installer.rb
2016-04-28 15:04:36.000000000 +0200
@@ -40,14 +40,16 @@
textdomain "installation"
return :back if GetInstArgs.going_back
+
+ Installation.finish_restarting! if Installation.restarting?
+
return :next unless try_to_update?
log.info("Trying installer update")
if update_installer
::FileUtils.touch(update_flag_file) # Indicates that the installer was
updated.
- ::FileUtils.touch(Installation.restart_file)
- :restart_yast # restart YaST to apply modifications.
+ Installation.restart!
else
:next
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.181/test/inst_complex_welcome_test.rb
new/yast2-installation-3.1.182/test/inst_complex_welcome_test.rb
--- old/yast2-installation-3.1.181/test/inst_complex_welcome_test.rb
2016-04-19 15:25:10.000000000 +0200
+++ new/yast2-installation-3.1.182/test/inst_complex_welcome_test.rb
2016-04-28 15:04:36.000000000 +0200
@@ -13,6 +13,7 @@
before do
stub_const("Yast::InstComplexWelcomeClient::DATA_PATH", store_path)
+ allow(Yast::ProductLicense).to receive(:info_seen?) { true }
end
after do
@@ -20,6 +21,7 @@
end
describe "#main" do
+ let(:restarting) { false }
context "when installation Mode is auto" do
it "returns :auto" do
expect(Yast::Mode).to receive(:autoinst) { true }
@@ -31,18 +33,29 @@
context "when installation mode is not auto" do
before do
expect(Yast::Mode).to receive(:autoinst) { false }
+ allow(Yast::Installation).to receive(:restarting?) { restarting }
end
- context "and previous data exist" do
- it "applies data and returns :next" do
+ context "and installer is restarting" do
+ let(:restarting) { true }
+ it "applies data if exists and returns next" do
allow(subject).to receive(:data_stored?) { true }
expect(subject).to receive(:apply_data)
expect(subject.main).to eql(:next)
end
+
+ it "does not apply data if not exists and continues as not restarting"
do
+ allow(subject).to receive(:data_stored?) { false }
+ expect(subject).not_to receive(:apply_data)
+ allow(subject).to receive(:event_loop)
+ expect(subject).to receive(:initialize_dialog)
+
+ subject.main
+ end
end
- context "and no previous data exist" do
+ context "and installer is not restarting" do
before do
allow(subject).to receive(:data_stored?) { false }
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.181/test/inst_disks_activate_test.rb
new/yast2-installation-3.1.182/test/inst_disks_activate_test.rb
--- old/yast2-installation-3.1.181/test/inst_disks_activate_test.rb
2016-04-19 15:25:10.000000000 +0200
+++ new/yast2-installation-3.1.182/test/inst_disks_activate_test.rb
2016-04-28 15:04:36.000000000 +0200
@@ -10,11 +10,11 @@
Yast.import "GetInstArgs"
Yast.import "UI"
Yast.import "Popup"
- Yast.import "Storage"
describe "#main" do
let(:probed_disks) { [] }
let(:s390) { false }
+ let(:restarting) { false }
before do
allow(Yast::Linuxrc).to
receive(:InstallInf).with("WithFCoE").and_return("0")
@@ -22,7 +22,18 @@
allow(Yast::UI).to receive(:CloseDialog)
allow(Yast::Popup).to
receive(:ConfirmAbort).with(:painless).and_return(true)
allow(Yast::Arch).to receive(:s390).and_return(s390)
- allow(Yast::Storage).to receive(:ReReadTargetMap)
+ allow(Yast::GetInstArgs).to receive(:going_back) { going_back }
+ allow(Yast::Installation).to receive(:restarting?) { restarting }
+ stub_const("Yast::Storage", double("Yast::Storage", ReReadTargetMap:
true))
+ end
+
+ context "when installation is restarting" do
+ let(:restarting) { true }
+ it "returns next" do
+ expect(Yast::Arch).to_not receive(:s390)
+
+ expect(subject.main).to eql(:next)
+ end
end
context "when architecture is s390" do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.181/test/inst_update_installer_test.rb
new/yast2-installation-3.1.182/test/inst_update_installer_test.rb
--- old/yast2-installation-3.1.181/test/inst_update_installer_test.rb
2016-04-19 15:25:10.000000000 +0200
+++ new/yast2-installation-3.1.182/test/inst_update_installer_test.rb
2016-04-28 15:04:36.000000000 +0200
@@ -23,6 +23,8 @@
allow(Yast::Mode).to receive(:auto).and_return(false)
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?)
+ allow(Yast::Installation).to receive(:restart!) { :restart_yast }
# stub the Profile module to avoid dependency on autoyast2-installation
ay_profile = double("Yast::Profile")
@@ -51,7 +53,7 @@
end
it "creates update file and returns :restart_yast" do
- expect(::FileUtils).to receive(:touch).twice
+ expect(::FileUtils).to receive(:touch).once
allow(subject).to receive(:self_update_enabled?).and_return(true)
expect(subject.main).to eq(:restart_yast)
end
