Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2018-02-02 22:19:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
and /work/SRC/openSUSE:Factory/.yast2-installation.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation"
Fri Feb 2 22:19:09 2018 rev:393 rq:572070 version:4.0.30
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes
2018-01-28 00:38:29.740117365 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2018-02-02 22:19:09.814611175 +0100
@@ -1,0 +2,27 @@
+Fri Feb 2 15:26:05 UTC 2018 - [email protected]
+
+- do not crash if no role is selected (bsc#1078809)
+- 4.0.30
+
+-------------------------------------------------------------------
+Fri Feb 2 12:49:34 UTC 2018 - [email protected]
+
+- Provides the current language when asking for the product's
+ release notes to the yast2.rpm API (related to bsc#1079045).
+- 4.0.29
+
+-------------------------------------------------------------------
+Wed Jan 31 13:09:51 CET 2018 - [email protected]
+
+- Do not enable xvnc.socket for second installation stage.
+ Xvnc will be started by a direct call in vnc.sh. (bnc#1077236)
+- 4.0.28
+
+-------------------------------------------------------------------
+Tue Jan 30 09:30:26 UTC 2018 - [email protected]
+
+- Reimplemented finding package upgrades to require less memory
+ (related to bsc#1076768)
+- 4.0.27
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-4.0.26.tar.bz2
New:
----
yast2-installation-4.0.30.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.ZClcpE/_old 2018-02-02 22:19:10.506578870 +0100
+++ /var/tmp/diff_new_pack.ZClcpE/_new 2018-02-02 22:19:10.510578683 +0100
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 4.0.26
+Version: 4.0.30
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -41,8 +41,8 @@
BuildRequires: rubygem(rspec)
BuildRequires: rubygem(yast-rake)
-# Yast::AutoinstData.autoyast_second_stage_error
-BuildRequires: yast2 >= 4.0.27
+# Mandatory language in Product#release_notes
+BuildRequires: yast2 >= 4.0.49
# Yast::Packages.check_remote_installation_packages
BuildRequires: yast2-packager >= 4.0.9
@@ -50,8 +50,8 @@
BuildRequires: yast2-storage-ng >= 4.0.43
Requires: yast2-storage-ng >= 4.0.43
-# Yast::AutoinstData.autoyast_second_stage_error
-Requires: yast2 >= 4.0.27
+# Mandatory language in Product#release_notes
+Requires: yast2 >= 4.0.49
# Language::GetLanguageItems and other API
# Language::Set (handles downloading the translation extensions)
++++++ yast2-installation-4.0.26.tar.bz2 -> yast2-installation-4.0.30.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.0.26/package/yast2-installation.changes
new/yast2-installation-4.0.30/package/yast2-installation.changes
--- old/yast2-installation-4.0.26/package/yast2-installation.changes
2018-01-26 15:08:01.000000000 +0100
+++ new/yast2-installation-4.0.30/package/yast2-installation.changes
2018-02-02 17:05:49.000000000 +0100
@@ -1,4 +1,31 @@
-------------------------------------------------------------------
+Fri Feb 2 15:26:05 UTC 2018 - [email protected]
+
+- do not crash if no role is selected (bsc#1078809)
+- 4.0.30
+
+-------------------------------------------------------------------
+Fri Feb 2 12:49:34 UTC 2018 - [email protected]
+
+- Provides the current language when asking for the product's
+ release notes to the yast2.rpm API (related to bsc#1079045).
+- 4.0.29
+
+-------------------------------------------------------------------
+Wed Jan 31 13:09:51 CET 2018 - [email protected]
+
+- Do not enable xvnc.socket for second installation stage.
+ Xvnc will be started by a direct call in vnc.sh. (bnc#1077236)
+- 4.0.28
+
+-------------------------------------------------------------------
+Tue Jan 30 09:30:26 UTC 2018 - [email protected]
+
+- Reimplemented finding package upgrades to require less memory
+ (related to bsc#1076768)
+- 4.0.27
+
+-------------------------------------------------------------------
Fri Jan 26 11:19:05 UTC 2018 - [email protected]
- Start performing real installation with as much memory as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.0.26/package/yast2-installation.spec
new/yast2-installation-4.0.30/package/yast2-installation.spec
--- old/yast2-installation-4.0.26/package/yast2-installation.spec
2018-01-26 15:08:01.000000000 +0100
+++ new/yast2-installation-4.0.30/package/yast2-installation.spec
2018-02-02 17:05:49.000000000 +0100
@@ -16,7 +16,7 @@
#
Name: yast2-installation
-Version: 4.0.26
+Version: 4.0.30
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -40,8 +40,8 @@
BuildRequires: rubygem(rspec)
BuildRequires: rubygem(yast-rake)
-# Yast::AutoinstData.autoyast_second_stage_error
-BuildRequires: yast2 >= 4.0.27
+# Mandatory language in Product#release_notes
+BuildRequires: yast2 >= 4.0.49
# Yast::Packages.check_remote_installation_packages
BuildRequires: yast2-packager >= 4.0.9
@@ -49,8 +49,8 @@
BuildRequires: yast2-storage-ng >= 4.0.43
Requires: yast2-storage-ng >= 4.0.43
-# Yast::AutoinstData.autoyast_second_stage_error
-Requires: yast2 >= 4.0.27
+# Mandatory language in Product#release_notes
+Requires: yast2 >= 4.0.49
# Language::GetLanguageItems and other API
# Language::Set (handles downloading the translation extensions)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.0.26/src/lib/installation/clients/inst_download_release_notes.rb
new/yast2-installation-4.0.30/src/lib/installation/clients/inst_download_release_notes.rb
---
old/yast2-installation-4.0.26/src/lib/installation/clients/inst_download_release_notes.rb
2018-01-26 15:08:01.000000000 +0100
+++
new/yast2-installation-4.0.30/src/lib/installation/clients/inst_download_release_notes.rb
2018-02-02 17:05:49.000000000 +0100
@@ -36,6 +36,7 @@
Yast.import "GetInstArgs"
Yast.import "Wizard"
Yast.import "Mode"
+Yast.import "Language"
module Yast
# Client to download and manage release notes button
@@ -52,7 +53,7 @@
format = UI.TextMode ? :txt : :rtf
relnotes_map = products.each_with_object({}) do |product, all|
- relnotes = product.release_notes(format)
+ relnotes = product.release_notes(Yast::Language.language, format)
if relnotes.nil?
log.info "No release notes were found for product
#{product.short_name}"
next
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.0.26/src/lib/installation/clients/inst_extrasources.rb
new/yast2-installation-4.0.30/src/lib/installation/clients/inst_extrasources.rb
---
old/yast2-installation-4.0.26/src/lib/installation/clients/inst_extrasources.rb
2018-01-26 15:08:01.000000000 +0100
+++
new/yast2-installation-4.0.30/src/lib/installation/clients/inst_extrasources.rb
2018-02-02 17:05:49.000000000 +0100
@@ -38,6 +38,8 @@
# Adds all sources defined in control file (software->extra_urls)
# and stores them at the end.
class InstExtrasourcesClient < Client
+ include Yast::Logger
+
def main
textdomain "installation"
@@ -448,28 +450,24 @@
# check if there is a selected package in the requested repositories
# returns list of repositories providing an update (repo IDs)
def UpgradesAvailable(repos)
- repos = deep_copy(repos)
ret = []
packages = []
- Builtins.foreach(Pkg.ResolvableProperties("", :package, "")) do |pkg|
- source = Ops.get_integer(pkg, "source", -1)
- if Ops.get_symbol(pkg, "status", :none) == :selected &&
- Builtins.contains(repos, source)
- package = Builtins.sformat(
- "%1-%2.%3",
- Ops.get_string(pkg, "name", ""),
- Ops.get_string(pkg, "version", ""),
- Ops.get_string(pkg, "arch", "")
- )
- Builtins.y2milestone("Found upgrade to install: %1", package)
- packages = Builtins.add(packages, package)
+ # only package names (without version)
+ names_only = true
+ Pkg.GetPackages(:selected, names_only).each do |pkg|
+ Pkg.ResolvableProperties(pkg, :package, "").each do |p|
+ source = p["source"]
+ next unless p["status"] == :selected && repos.include?(source)
- ret = Builtins.add(ret, source) if !Builtins.contains(ret, source)
+ package = "#{p["name"]}-#{p["version"]}.#{p["arch"]}"
+ log.info("Found upgrade to install: #{package}")
+ packages << package
+ ret << source unless ret.include?(source)
end
end
- Builtins.y2milestone("Upgrades found in repositories: %1", ret)
+ log.info("Upgrades found in repositories: #{ret.inspect}")
{ "repositories" => ret, "packages" => packages }
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.0.26/src/lib/installation/remote_finish_client.rb
new/yast2-installation-4.0.30/src/lib/installation/remote_finish_client.rb
--- old/yast2-installation-4.0.26/src/lib/installation/remote_finish_client.rb
2018-01-26 15:08:01.000000000 +0100
+++ new/yast2-installation-4.0.30/src/lib/installation/remote_finish_client.rb
2018-02-02 17:05:49.000000000 +0100
@@ -50,7 +50,7 @@
"when" => modes
}
when "Write"
- enable_remote
+ remote.write
else
log.error "unknown function: #{func}"
end
@@ -67,19 +67,13 @@
_("Enabling remote administration...")
end
- # Modes in which #enable_remote should be called
+ # Modes which will be used for writing settings
#
# @return [Array<Symbol>]
def modes
Yast::Linuxrc.vnc ? [:installation, :autoinst] : []
end
- # Enables remote access
- def enable_remote
- remote.enable!
- remote.write
- end
-
def remote
@remote ||= Y2Remote::Remote.instance
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.0.26/src/lib/installation/select_system_role.rb
new/yast2-installation-4.0.30/src/lib/installation/select_system_role.rb
--- old/yast2-installation-4.0.26/src/lib/installation/select_system_role.rb
2018-01-26 15:08:01.000000000 +0100
+++ new/yast2-installation-4.0.30/src/lib/installation/select_system_role.rb
2018-02-02 17:05:49.000000000 +0100
@@ -86,6 +86,13 @@
def next_handler
role_id = Yast::UI.QueryWidget(Id(:roles), :CurrentButton)
+ if role_id.nil? # no role selected (bsc#1078809)
+ # An Error popup
+ msg = _("Select one of the available roles to continue.")
+ Yast::Popup.Error(msg)
+ return
+ end
+
orig_role_id = self.class.original_role_id
if !orig_role_id.nil? && orig_role_id != role_id
# A Continue-Cancel popup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.0.26/test/lib/clients/inst_download_release_notes_test.rb
new/yast2-installation-4.0.30/test/lib/clients/inst_download_release_notes_test.rb
---
old/yast2-installation-4.0.26/test/lib/clients/inst_download_release_notes_test.rb
2018-01-26 15:08:01.000000000 +0100
+++
new/yast2-installation-4.0.30/test/lib/clients/inst_download_release_notes_test.rb
2018-02-02 17:05:49.000000000 +0100
@@ -9,6 +9,7 @@
describe "#main" do
let(:sles_relnotes) { instance_double(Y2Packager::ReleaseNotes, content:
"SLES RN") }
let(:sdk_relnotes) { instance_double(Y2Packager::ReleaseNotes, content:
"SDK RN") }
+ let(:language) { double("Yast::Language", language: "en_US") }
let(:sles) do
instance_double(Y2Packager::Product, short_name: "SLES", release_notes:
sles_relnotes)
@@ -27,6 +28,7 @@
.and_return([sles, sdk])
allow(Yast::Stage).to receive(:initial).and_return(true)
allow(Yast::Packages).to
receive(:init_called).and_return(packages_init_called)
+ stub_const("Yast::Language", language)
Yast::InstData.main
end
@@ -66,7 +68,7 @@
let(:textmode) { true }
it "asks for :txt version" do
- expect(sles).to receive(:release_notes).with(:txt)
+ expect(sles).to receive(:release_notes).with(language.language, :txt)
client.main
end
end
@@ -75,7 +77,7 @@
let(:textmode) { false }
it "asks for :rtf version" do
- expect(sles).to receive(:release_notes).with(:rtf)
+ expect(sles).to receive(:release_notes).with(language.language, :rtf)
client.main
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.0.26/test/lib/clients/inst_extrasources_test.rb
new/yast2-installation-4.0.30/test/lib/clients/inst_extrasources_test.rb
--- old/yast2-installation-4.0.26/test/lib/clients/inst_extrasources_test.rb
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-4.0.30/test/lib/clients/inst_extrasources_test.rb
2018-02-02 17:05:49.000000000 +0100
@@ -0,0 +1,18 @@
+require_relative "../../test_helper"
+require "installation/clients/inst_extrasources"
+
+describe Yast::InstExtrasourcesClient do
+ subject(:client) { described_class.new }
+
+ describe "#UpgradesAvailable" do
+ it "returns available package updates" do
+ source = 42
+ expect(Yast::Pkg).to receive(:GetPackages).and_return(["foo"])
+ expect(Yast::Pkg).to receive(:ResolvableProperties).with("foo",
:package, "")
+ .and_return(["name" => "foo", "version" => "1.0", "arch" => "x86_64",
+ "status" => :selected, "source" => source])
+ expect(subject.UpgradesAvailable([source])).to eq("packages" =>
["foo-1.0.x86_64"],
+ "repositories" =>
[source])
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-4.0.26/test/remote_finish_test.rb
new/yast2-installation-4.0.30/test/remote_finish_test.rb
--- old/yast2-installation-4.0.26/test/remote_finish_test.rb 2018-01-26
15:08:01.000000000 +0100
+++ new/yast2-installation-4.0.30/test/remote_finish_test.rb 2018-02-02
17:05:49.000000000 +0100
@@ -21,7 +21,7 @@
end
it "can be called as a WFM client with 'Write'" do
- expect_any_instance_of(::Installation::RemoteFinishClient).to
receive(:enable_remote)
+ expect(remote).to receive(:write)
expect(Yast::WFM.CallFunction("remote_finish", ["Write"])).to be_nil
end
end
@@ -52,13 +52,5 @@
end
end
- describe "#enable_remote" do
- it "enables remote access" do
- expect(remote).to receive(:enable!)
- expect(remote).to receive(:write)
-
- subject.enable_remote
- end
- end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.0.26/test/select_system_role_test.rb
new/yast2-installation-4.0.30/test/select_system_role_test.rb
--- old/yast2-installation-4.0.26/test/select_system_role_test.rb
2018-01-26 15:08:01.000000000 +0100
+++ new/yast2-installation-4.0.30/test/select_system_role_test.rb
2018-02-02 17:05:49.000000000 +0100
@@ -158,6 +158,22 @@
expect(subject.run).to eq(:back)
end
end
+
+ context "when no roles is selected" do
+ it "shows error and does not continue" do
+ allow(Yast::Wizard).to receive(:SetContents)
+ allow(Yast::UI).to receive(:UserInput)
+ .and_return(:next, :back)
+ allow(Yast::UI).to receive(:QueryWidget)
+ .with(Id(:roles), :CurrentButton).and_return(nil)
+
+ expect(Yast::Popup).to receive(:Error)
+ expect(Yast::ProductFeatures).to receive(:ClearOverlay)
+ expect(Yast::ProductFeatures).to_not receive(:SetOverlay)
+
+ expect(subject.run).to eq(:back)
+ end
+ end
end
end
