Hello community,
here is the log from the commit of package yast2-registration for
openSUSE:Factory checked in at 2020-12-04 21:27:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-registration (Old)
and /work/SRC/openSUSE:Factory/.yast2-registration.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-registration"
Fri Dec 4 21:27:46 2020 rev:65 rq:852922 version:4.3.15
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-registration/yast2-registration.changes
2020-12-01 14:21:31.401511321 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-registration.new.5913/yast2-registration.changes
2020-12-04 21:27:48.978067001 +0100
@@ -1,0 +2,7 @@
+Wed Dec 2 14:20:56 UTC 2020 - Ladislav Slezák <lsle...@suse.cz>
+
+- Fixed finding the installed base product when doing upgrade
+ using the Full installation medium (bsc#1178652)
+- 4.3.15
+
+-------------------------------------------------------------------
Old:
----
yast2-registration-4.3.14.tar.bz2
New:
----
yast2-registration-4.3.15.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.5mVFYG/_old 2020-12-04 21:27:49.506067758 +0100
+++ /var/tmp/diff_new_pack.5mVFYG/_new 2020-12-04 21:27:49.510067764 +0100
@@ -17,7 +17,7 @@
Name: yast2-registration
-Version: 4.3.14
+Version: 4.3.15
Release: 0
Summary: YaST2 - Registration Module
License: GPL-2.0-only
++++++ yast2-registration-4.3.14.tar.bz2 -> yast2-registration-4.3.15.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-4.3.14/package/yast2-registration.changes
new/yast2-registration-4.3.15/package/yast2-registration.changes
--- old/yast2-registration-4.3.14/package/yast2-registration.changes
2020-11-27 16:35:11.000000000 +0100
+++ new/yast2-registration-4.3.15/package/yast2-registration.changes
2020-12-03 15:46:05.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed Dec 2 14:20:56 UTC 2020 - Ladislav Slezák <lsle...@suse.cz>
+
+- Fixed finding the installed base product when doing upgrade
+ using the Full installation medium (bsc#1178652)
+- 4.3.15
+
+-------------------------------------------------------------------
Thu Nov 26 16:54:21 UTC 2020 - Josef Reidinger <jreidin...@suse.com>
- correct add-on spelling (jsc#SLE-14772)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-4.3.14/package/yast2-registration.spec
new/yast2-registration-4.3.15/package/yast2-registration.spec
--- old/yast2-registration-4.3.14/package/yast2-registration.spec
2020-11-27 16:35:11.000000000 +0100
+++ new/yast2-registration-4.3.15/package/yast2-registration.spec
2020-12-03 15:46:05.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-registration
-Version: 4.3.14
+Version: 4.3.15
Release: 0
Summary: YaST2 - Registration Module
License: GPL-2.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-4.3.14/src/lib/registration/clients/inst_scc.rb
new/yast2-registration-4.3.15/src/lib/registration/clients/inst_scc.rb
--- old/yast2-registration-4.3.14/src/lib/registration/clients/inst_scc.rb
2020-11-27 16:35:11.000000000 +0100
+++ new/yast2-registration-4.3.15/src/lib/registration/clients/inst_scc.rb
2020-12-03 15:46:05.000000000 +0100
@@ -228,8 +228,15 @@
log.info "The system is already registered, displaying registered dialog"
# ensure that @registration is initialized
return :cancel if init_registration == :cancel
+
+ extensions_enabled = true
+ success = Registration::ConnectHelpers.catch_registration_errors do
+ extensions_enabled =
!Registration::Addon.find_all(@registration).empty?
+ end
+ return :abort unless success
+
::Registration::UI::RegisteredSystemDialog.run(
- extensions_enabled: !Registration::Addon.find_all(@registration).empty?
+ extensions_enabled: extensions_enabled
)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-4.3.14/src/lib/registration/ui/migration_repos_workflow.rb
new/yast2-registration-4.3.15/src/lib/registration/ui/migration_repos_workflow.rb
---
old/yast2-registration-4.3.14/src/lib/registration/ui/migration_repos_workflow.rb
2020-11-27 16:35:11.000000000 +0100
+++
new/yast2-registration-4.3.15/src/lib/registration/ui/migration_repos_workflow.rb
2020-12-03 15:46:05.000000000 +0100
@@ -643,9 +643,9 @@
# for upgrade, select the new base product to install.
def add_offline_base_product
# find the installed base product
- installed_base = Y2Packager::Resolvable.find(
- kind: :product, status: :installed, type: "base"
- ).first
+ installed = Y2Packager::Resolvable.find(kind: :product, status:
:installed)
+ # Resolvable.find cannot filter by product type, run the filter here
+ installed_base = installed.find { |p| p.type == "base" }
if !installed_base
log.error("Installed base product not found")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-registration-4.3.14/test/inst_scc_test.rb
new/yast2-registration-4.3.15/test/inst_scc_test.rb
--- old/yast2-registration-4.3.14/test/inst_scc_test.rb 2020-11-27
16:35:11.000000000 +0100
+++ new/yast2-registration-4.3.15/test/inst_scc_test.rb 2020-12-03
15:46:05.000000000 +0100
@@ -17,6 +17,7 @@
allow(Yast::Mode).to receive(:update).and_return(false)
allow(Yast::SlpService).to receive(:all).and_return([])
allow(Y2Packager::MediumType).to receive(:online?).and_return(false)
+ allow(subject).to receive(:init_registration)
allow(Registration::Addon).to receive(:find_all).and_return([])
end
@@ -36,16 +37,13 @@
it "displays an error when loading the available extensions fails" do
error = "Invalid system credentials"
- # click installing extensions, abort the workflow
- expect(Yast::UI).to receive(:UserInput).and_return(:extensions, :abort)
expect(Yast::Report).to receive(:Error) do |msg|
# make sure the propoer error is displayed
expect(msg).to include(error)
end
- expect_any_instance_of(Registration::RegistrationUI).to
receive(:get_available_addons)
- .and_raise(error)
+ expect(Registration::Addon).to receive(:find_all).and_raise(error)
expect(subject.main).to eq(:abort)
end
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
