Hello community,
here is the log from the commit of package yast2-registration for
openSUSE:Factory checked in at 2019-02-06 15:44:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-registration (Old)
and /work/SRC/openSUSE:Factory/.yast2-registration.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-registration"
Wed Feb 6 15:44:58 2019 rev:30 rq:671154 version:4.1.16
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-registration/yast2-registration.changes
2019-01-26 22:21:46.682886630 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-registration.new.28833/yast2-registration.changes
2019-02-06 15:45:15.207338025 +0100
@@ -1,0 +2,7 @@
+Fri Feb 1 12:18:35 UTC 2019 - lsle...@suse.cz
+
+- Improved the message in the registration skipping dialog
+ (bsc#1122608)
+- 4.1.16
+
+-------------------------------------------------------------------
Old:
----
yast2-registration-4.1.15.tar.bz2
New:
----
yast2-registration-4.1.16.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.KcQ4Go/_old 2019-02-06 15:45:16.395337303 +0100
+++ /var/tmp/diff_new_pack.KcQ4Go/_new 2019-02-06 15:45:16.395337303 +0100
@@ -17,7 +17,7 @@
Name: yast2-registration
-Version: 4.1.15
+Version: 4.1.16
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -62,13 +62,6 @@
# bsc#1088552
ExcludeArch: %ix86 s390
-# FIXME: it seems can we cannot move it to macros.yast, the yast-rake-ci is not
-# installed into the chroot, the build fails...
-%bcond_with yast_run_ci_tests
-%if %{with yast_run_ci_tests}
-BuildRequires: rubygem(yast-rake-ci)
-%endif
-
Summary: YaST2 - Registration Module
License: GPL-2.0-only
Group: System/YaST
++++++ yast2-registration-4.1.15.tar.bz2 -> yast2-registration-4.1.16.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-4.1.15/package/yast2-registration.changes
new/yast2-registration-4.1.16/package/yast2-registration.changes
--- old/yast2-registration-4.1.15/package/yast2-registration.changes
2019-01-25 12:49:46.000000000 +0100
+++ new/yast2-registration-4.1.16/package/yast2-registration.changes
2019-02-04 17:17:45.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Feb 1 12:18:35 UTC 2019 - lsle...@suse.cz
+
+- Improved the message in the registration skipping dialog
+ (bsc#1122608)
+- 4.1.16
+
+-------------------------------------------------------------------
Fri Jan 25 10:52:15 CET 2019 - sch...@suse.de
- Do not try to remove services which have already been deleted.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-4.1.15/package/yast2-registration.spec
new/yast2-registration-4.1.16/package/yast2-registration.spec
--- old/yast2-registration-4.1.15/package/yast2-registration.spec
2019-01-25 12:49:46.000000000 +0100
+++ new/yast2-registration-4.1.16/package/yast2-registration.spec
2019-02-04 17:17:45.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-registration
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,15 +17,12 @@
Name: yast2-registration
-Version: 4.1.15
+Version: 4.1.16
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-Group: System/YaST
-License: GPL-2.0-only
-
# Y2Packager::ProductLicense
Requires: yast2 >= 4.0.63
# "dupAllowVendorChange" option in Pkg.SetSolverFlags()
@@ -42,20 +39,20 @@
# suse-connect gem.
Requires: SUSEConnect >= 0.2.37
-Requires: yast2-slp >= 3.1.9
Requires: yast2-add-on >= 3.1.8
+Requires: yast2-slp >= 3.1.9
# packager/product_patterns.rb
Requires: yast2-packager >= 3.1.95
Requires: yast2-update >= 3.1.36
# Y2Packager::ProductLicense
-BuildRequires: yast2 >= 4.0.63
BuildRequires: update-desktop-files
+BuildRequires: yast2 >= 4.0.63
BuildRequires: yast2-devtools >= 3.1.39
-BuildRequires: rubygem(yast-rake) >= 0.2.5
+BuildRequires: yast2-slp >= 3.1.9
BuildRequires: rubygem(rspec)
BuildRequires: rubygem(suse-connect) >= 0.3.11
-BuildRequires: yast2-slp >= 3.1.9
+BuildRequires: rubygem(yast-rake) >= 0.2.5
# updated product renames
BuildRequires: yast2-packager >= 4.0.40
BuildRequires: yast2-update >= 3.1.36
@@ -65,14 +62,9 @@
# bsc#1088552
ExcludeArch: %ix86 s390
-# FIXME: it seems can we cannot move it to macros.yast, the yast-rake-ci is not
-# installed into the chroot, the build fails...
-%bcond_with yast_run_ci_tests
-%if %{with yast_run_ci_tests}
-BuildRequires: rubygem(yast-rake-ci)
-%endif
-
Summary: YaST2 - Registration Module
+License: GPL-2.0-only
+Group: System/YaST
Url: https://github.com/yast/yast-registration
%description
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-4.1.15/src/lib/registration/ui/base_system_registration_dialog.rb
new/yast2-registration-4.1.16/src/lib/registration/ui/base_system_registration_dialog.rb
---
old/yast2-registration-4.1.15/src/lib/registration/ui/base_system_registration_dialog.rb
2019-01-25 12:49:46.000000000 +0100
+++
new/yast2-registration-4.1.16/src/lib/registration/ui/base_system_registration_dialog.rb
2019-02-04 17:17:45.000000000 +0100
@@ -360,33 +360,56 @@
"get updates and extensions.")
end
- # Show a warning about skipping the registration
#
- # @return [Boolean] true when skipping has been confirmed
- def show_skipping_warning
- media_name = ProductFeatures.GetStringFeature(
+ # Read the full media name from the product control file
+ #
+ # @return [String] the name or empty string if not set
+ #
+ def media_name
+ ProductFeatures.GetStringFeature(
"globals",
"full_system_media_name"
)
- download_url = ProductFeatures.GetStringFeature(
+ end
+
+ #
+ # Read the full media download URL from the product control file
+ #
+ # @return [String] the URL or empty string if not set
+ #
+ def download_url
+ ProductFeatures.GetStringFeature(
"globals",
"full_system_download_url"
)
+ end
- warning = _("Without registration, update channels will not be\n" \
- "configured. This disables updates and security fixes.")
+ # Show a warning about skipping the registration
+ #
+ # @return [Boolean] true when skipping has been confirmed
+ def show_skipping_warning
+ # TRANSLATORS:
+ # Popup question (1/1): confirm skipping the registration
+ warning = _("You are skipping registration.\n"\
+ "Please configure access to packages medium in the next step.\n"\
+ "\n"\
+ "Without registration update-channels will not be configured.\n"\
+ "This will disable the updates and security fixes.")
- # Popup question: confirm skipping the registration
# TRANSLATORS:
+ # Popup question (2/2): confirm skipping the registration
# %{media_name} is the media name (e.g. SLE-15-Packages),
# %{download_url} is an URL link (e.g. https://download.suse.com)
if !media_name.empty? && # cannot be nil
!download_url.empty? # cannot be nil
warning += "\n\n" +
- _("A full system can be installed using the\n" \
- "%{media_name} media from %{download_url}.\n" \
- "Without these media only a minimum system is available\n" \
- "in this installation.") %
+ _("If you do not register AND do not use the %{media_name}\n"\
+ "medium from %{download_url}\n"\
+ "then only an installation system is installed.\n"\
+ "\n"\
+ "The installation system is not intended to be used as\n"\
+ "an operational system. The installation system can only\n"\
+ "be used to install a working system.") %
{ media_name: media_name, download_url: download_url }
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-registration-4.1.15/test/base_system_registration_dialog_test.rb
new/yast2-registration-4.1.16/test/base_system_registration_dialog_test.rb
--- old/yast2-registration-4.1.15/test/base_system_registration_dialog_test.rb
2019-01-25 12:49:46.000000000 +0100
+++ new/yast2-registration-4.1.16/test/base_system_registration_dialog_test.rb
2019-02-04 17:17:45.000000000 +0100
@@ -192,11 +192,11 @@
context "when full_system_media_name and full_system_download_url" \
" is defined in control.xml" do
it "reports the media name and the regarding download url to the
user" do
- expect(Yast::ProductFeatures).to receive(:GetStringFeature)
+ allow(Yast::ProductFeatures).to receive(:GetStringFeature)
.with("globals",
"full_system_media_name").and_return("SLE-15-Packages")
- expect(Yast::ProductFeatures).to receive(:GetStringFeature)
+ allow(Yast::ProductFeatures).to receive(:GetStringFeature)
.with("globals",
"full_system_download_url").and_return("https://download.suse.com";)
- expect(Yast::Popup).to
receive(:Warning).with(/SLE-15-Packages.*download.suse.com/)
+ expect(Yast::Popup).to
receive(:Warning).with(/SLE-15-Packages.*download.suse.com/m)
expect(subject.run).to eq(:skip)
end
end
@@ -204,9 +204,9 @@
context "when full_system_media_name and full_system_download_url" \
" is NOT defined in control.xml" do
it "does not mention any media information" do
- expect(Yast::ProductFeatures).to receive(:GetStringFeature)
+ allow(Yast::ProductFeatures).to receive(:GetStringFeature)
.with("globals", "full_system_media_name").and_return("")
- expect(Yast::ProductFeatures).to receive(:GetStringFeature)
+ allow(Yast::ProductFeatures).to receive(:GetStringFeature)
.with("globals", "full_system_download_url").and_return("")
expect(Yast::Popup).to receive(:Warning).with(/Without
registration/)
.and_return(true)
