Hello community,
here is the log from the commit of package yast2-registration for
openSUSE:Factory checked in at 2020-12-12 20:28:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-registration (Old)
and /work/SRC/openSUSE:Factory/.yast2-registration.new.2328 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-registration"
Sat Dec 12 20:28:06 2020 rev:66 rq:854592 version:4.3.16
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-registration/yast2-registration.changes
2020-12-04 21:27:48.978067001 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-registration.new.2328/yast2-registration.changes
2020-12-12 20:29:47.513690999 +0100
@@ -1,0 +2,7 @@
+Tue Dec 8 09:16:16 UTC 2020 - schubi <schubi@intern>
+
+- Updating warning popup if the user has skipped the registration.
+ (bsc#1177504)
+- 4.3.16
+
+-------------------------------------------------------------------
Old:
----
yast2-registration-4.3.15.tar.bz2
New:
----
yast2-registration-4.3.16.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.ygnlCo/_old 2020-12-12 20:29:47.989691495 +0100
+++ /var/tmp/diff_new_pack.ygnlCo/_new 2020-12-12 20:29:47.993691500 +0100
@@ -17,7 +17,7 @@
Name: yast2-registration
-Version: 4.3.15
+Version: 4.3.16
Release: 0
Summary: YaST2 - Registration Module
License: GPL-2.0-only
++++++ yast2-registration-4.3.15.tar.bz2 -> yast2-registration-4.3.16.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-4.3.15/package/yast2-registration.changes
new/yast2-registration-4.3.16/package/yast2-registration.changes
--- old/yast2-registration-4.3.15/package/yast2-registration.changes
2020-12-03 15:46:05.000000000 +0100
+++ new/yast2-registration-4.3.16/package/yast2-registration.changes
2020-12-10 15:16:39.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Dec 8 09:16:16 UTC 2020 - schubi <schubi@intern>
+
+- Updating warning popup if the user has skipped the registration.
+ (bsc#1177504)
+- 4.3.16
+
+-------------------------------------------------------------------
Wed Dec 2 14:20:56 UTC 2020 - Ladislav Slezák <lsle...@suse.cz>
- Fixed finding the installed base product when doing upgrade
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-4.3.15/package/yast2-registration.spec
new/yast2-registration-4.3.16/package/yast2-registration.spec
--- old/yast2-registration-4.3.15/package/yast2-registration.spec
2020-12-03 15:46:05.000000000 +0100
+++ new/yast2-registration-4.3.16/package/yast2-registration.spec
2020-12-10 15:16:39.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-registration
-Version: 4.3.15
+Version: 4.3.16
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.15/src/lib/registration/ui/base_system_registration_dialog.rb
new/yast2-registration-4.3.16/src/lib/registration/ui/base_system_registration_dialog.rb
---
old/yast2-registration-4.3.15/src/lib/registration/ui/base_system_registration_dialog.rb
2020-12-03 15:46:05.000000000 +0100
+++
new/yast2-registration-4.3.16/src/lib/registration/ui/base_system_registration_dialog.rb
2020-12-10 15:16:39.000000000 +0100
@@ -424,50 +424,19 @@
def default_skipping_text
# TRANSLATORS:
# Popup question: confirm skipping the registration on the Full medium
- "<p>" + _("You are skipping registration.") + medium_access_text +
"</p>" +
- # TRANSLATORS:
- # Popup question: confirm skipping the registration on the Full
medium
- _("<p>Without registration the system\n" \
- "will not have access to updates and security fixes.</p>")
- end
-
- def medium_access_text
- # in the firstboot mode the add-on module might be skipped,
- # do not display this part there
- return "" if Stage.firstboot
- # TRANSLATORS:
- # Popup question: confirm skipping the registration on the Full medium
- " " + _("Please configure access to packages medium in the next step.")
+ _("<p>System registration is required for updates and security
fixes.\n"\
+ "Please confirm to proceed without updates.\n"\
+ "You may register at a later date for updates and security
fixes.</p>")
end
# the warning for the Online media
# @return [String]
def online_skipping_text
- # TRANSLATORS: a popup message (1/3) the user wants to skip the
registration,
- # on the Online installation medium which is not possible
- warning = _("<p>The installation medium does not contain any
package\n" \
- "repository, the repositories will be accessible after
registering\n" \
- "the system.</p>" \
- "<p>Registration additionally enables access to the updates\n" \
- "and security fixes.</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 += "\n\n" +
- _("<p>For installation without registering the system use the\n"\
- "%{media_name} medium from %{download_url}.</p>") %
- { media_name: media_name, download_url: download_url }
-
- # TRANSLATORS: a popup message (3/3) the user wants to skip the
registration
- warning += "\n" +
- _("<p>However, without registration the system will not have
access\n" \
- "to updates and security fixes.</p>")
- end
-
- warning
+ # 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>")
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.15/test/base_system_registration_dialog_test.rb
new/yast2-registration-4.3.16/test/base_system_registration_dialog_test.rb
--- old/yast2-registration-4.3.15/test/base_system_registration_dialog_test.rb
2020-12-03 15:46:05.000000000 +0100
+++ new/yast2-registration-4.3.16/test/base_system_registration_dialog_test.rb
2020-12-10 15:16:39.000000000 +0100
@@ -196,64 +196,29 @@
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(
- /repositories will be accessible after registering/, anything
- )
- .and_return(true)
- expect(Yast2::Popup).not_to receive(:show).with(
- /installation without registering/, anything
- )
- expect(subject.run).to eq(:abort)
- end
+ it "reports that this is an online media only" do
+ expect(Yast2::Popup).to receive(:show).with(
+ /This installation is online only/,
+ anything
+ ).and_return(true)
+ expect(subject.run).to eq(:abort)
end
end
context "Full installation medium" do
let(:online?) { false }
- it "suggests selecting the repositories from the medium" do
- expect(Yast2::Popup).to receive(:show).with(
- /configure access to packages medium in the next step/, anything
- )
+ it "asks for confirmation to go on without updates" do
+ expect(Yast2::Popup).to receive(:show)
+ .with(/confirm to proceed without updates/, anything)
.and_return(true)
expect(subject.run).to eq(:abort)
end
end
it "does not try to register the system and closes the dialog" do
+ expect(Yast2::Popup).to receive(:show).and_return(true)
expect(registration_ui).to_not
receive(:register_system_and_base_product)
- expect(Yast2::Popup).to receive(:show).with(/skipping registration/,
anything)
- .and_return(true)
expect(subject.run).to eq(:abort)
end
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
