Hello community,
here is the log from the commit of package yast2-registration for
openSUSE:Factory checked in at 2020-12-21 10:22:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-registration (Old)
and /work/SRC/openSUSE:Factory/.yast2-registration.new.5145 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-registration"
Mon Dec 21 10:22:19 2020 rev:67 rq:856901 version:4.3.17
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-registration/yast2-registration.changes
2020-12-12 20:29:47.513690999 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-registration.new.5145/yast2-registration.changes
2020-12-21 10:22:58.259956940 +0100
@@ -1,0 +2,7 @@
+Fri Dec 18 13:44:58 UTC 2020 - Stefan Schubert <sch...@suse.de>
+
+- Updating warning popup if the user has skipped the registration.
+ Added media information while online installation (bsc#1177504).
+- 4.3.17
+
+-------------------------------------------------------------------
Old:
----
yast2-registration-4.3.16.tar.bz2
New:
----
yast2-registration-4.3.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.iNFxcL/_old 2020-12-21 10:22:58.935957534 +0100
+++ /var/tmp/diff_new_pack.iNFxcL/_new 2020-12-21 10:22:58.939957538 +0100
@@ -17,7 +17,7 @@
Name: yast2-registration
-Version: 4.3.16
+Version: 4.3.17
Release: 0
Summary: YaST2 - Registration Module
License: GPL-2.0-only
++++++ yast2-registration-4.3.16.tar.bz2 -> yast2-registration-4.3.17.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-4.3.16/package/yast2-registration.changes
new/yast2-registration-4.3.17/package/yast2-registration.changes
--- old/yast2-registration-4.3.16/package/yast2-registration.changes
2020-12-10 15:16:39.000000000 +0100
+++ new/yast2-registration-4.3.17/package/yast2-registration.changes
2020-12-18 16:43:36.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Dec 18 13:44:58 UTC 2020 - Stefan Schubert <sch...@suse.de>
+
+- Updating warning popup if the user has skipped the registration.
+ Added media information while online installation (bsc#1177504).
+- 4.3.17
+
+-------------------------------------------------------------------
Tue Dec 8 09:16:16 UTC 2020 - schubi <schubi@intern>
- Updating warning popup if the user has skipped the registration.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-4.3.16/package/yast2-registration.spec
new/yast2-registration-4.3.17/package/yast2-registration.spec
--- old/yast2-registration-4.3.16/package/yast2-registration.spec
2020-12-10 15:16:39.000000000 +0100
+++ new/yast2-registration-4.3.17/package/yast2-registration.spec
2020-12-18 16:43:36.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-registration
-Version: 4.3.16
+Version: 4.3.17
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.16/src/lib/registration/ui/base_system_registration_dialog.rb
new/yast2-registration-4.3.17/src/lib/registration/ui/base_system_registration_dialog.rb
---
old/yast2-registration-4.3.16/src/lib/registration/ui/base_system_registration_dialog.rb
2020-12-10 15:16:39.000000000 +0100
+++
new/yast2-registration-4.3.17/src/lib/registration/ui/base_system_registration_dialog.rb
2020-12-18 16:43:36.000000000 +0100
@@ -433,10 +433,25 @@
# @return [String]
def online_skipping_text
# TRANSLATORS:
- # Popup : Installation cannot be continued without registration.
- _("<p>This installation is online only which requires registration for
"\
- "package repositories.\nFor installations without registration
please "\
- "install using full installation media.</p>")
+ # Popup (1/3) : Installation cannot be continued without registration.
+ warning = _("<p>This installation is online only which requires
registration for "\
+ "package repositories.</p>")
+
+ # these cannot be nil
+ if !media_name.empty? && !download_url.empty?
+ # TRANSLATORS: a popup message (2/3) the user wants to skip the
registration
+ # %{media_name} is the media name (e.g. SLE-15-SP2-Full),
+ # %{download_url} is an URL link (e.g. https://download.suse.com)
+ warning += _("<p>For installation without registering the system
please "\
+ "install using the %{media_name} installation media from
%{download_url}.</p>") %
+ { media_name: media_name, download_url: download_url } # these
cannot be nil
+
+ else
+ # TRANSLATORS: a popup message (3/3) the user wants to skip the
registration
+ warning += _("<p>For installations without registration please "\
+ "install using full installation media.</p>")
+ end
+ warning
end
# UI term for the network configuration button (or empty if not needed)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-4.3.16/test/base_system_registration_dialog_test.rb
new/yast2-registration-4.3.17/test/base_system_registration_dialog_test.rb
--- old/yast2-registration-4.3.16/test/base_system_registration_dialog_test.rb
2020-12-10 15:16:39.000000000 +0100
+++ new/yast2-registration-4.3.17/test/base_system_registration_dialog_test.rb
2020-12-18 16:43:36.000000000 +0100
@@ -196,6 +196,44 @@
context "Online installation medium" do
let(:online?) { true }
+ context "when full_system_media_name and full_system_download_url" \
+ " is defined in control.xml" do
+ before do
+ allow(Yast::ProductFeatures).to receive(:GetStringFeature)
+ .with("globals", "full_system_media_name")
+ .and_return("SLE-$os_release_version-Full")
+ allow(Yast::ProductFeatures).to receive(:GetStringFeature)
+ .with("globals",
"full_system_download_url").and_return("https://download.suse.com";)
+ allow(Yast::OSRelease).to
receive(:ReleaseVersionHumanReadable).and_return("15-SP2")
+ end
+
+ it "reports the media name and the download url to the user" do
+ expect(Yast2::Popup).to receive(:show).with(
+ /SLE-15-SP2-Full.*download.suse.com/m,
+ anything
+ ).and_return(true)
+ expect(subject.run).to eq(:abort)
+ end
+ end
+
+ context "when full_system_media_name and full_system_download_url" \
+ " is NOT defined in control.xml" do
+ before do
+ allow(Yast::ProductFeatures).to receive(:GetStringFeature)
+ .with("globals", "full_system_media_name").and_return("")
+ allow(Yast::ProductFeatures).to receive(:GetStringFeature)
+ .with("globals", "full_system_download_url").and_return("")
+ end
+
+ it "does not mention any media information" do
+ expect(Yast2::Popup).to receive(:show).with(
+ /install using full installation media/, anything
+ )
+ .and_return(true)
+ expect(subject.run).to eq(:abort)
+ end
+ end
+
it "reports that this is an online media only" do
expect(Yast2::Popup).to receive(:show).with(
/This installation is online only/,
_______________________________________________
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
