Hello community,
here is the log from the commit of package yast2-caasp for openSUSE:Factory
checked in at 2017-09-21 12:30:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-caasp (Old)
and /work/SRC/openSUSE:Factory/.yast2-caasp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-caasp"
Thu Sep 21 12:30:31 2017 rev:3 rq:526960 version:4.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-caasp/yast2-caasp.changes 2017-05-16
14:34:46.314661247 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-caasp.new/yast2-caasp.changes
2017-09-21 12:30:38.822712208 +0200
@@ -1,0 +2,26 @@
+Tue Sep 12 09:03:53 UTC 2017 - knut.anders...@suse.com
+
+- Replace /info.txt by /README.BETA as beta file to be shown
+ (bsc#1047060).
+- 4.0.1
+
+-------------------------------------------------------------------
+Thu Sep 7 12:06:32 UTC 2017 - jreidin...@suse.com
+
+- Add language selection (FATE#323837)
+- Mark all user visible strings for translation (FATE#323837)
+- 4.0.0
+
+-------------------------------------------------------------------
+Mon Sep 4 12:25:38 UTC 2017 - knut.anders...@suse.com
+
+- Fix keyboard selection widget requirement (fate#322276)
+- 1.1.2
+
+-------------------------------------------------------------------
+Mon Jun 5 18:37:34 UTC 2017 - knut.anders...@suse.com
+
+- Rearrange of keyboard and registration code widgets (bsc#1022768)
+- 1.1.1
+
+-------------------------------------------------------------------
Old:
----
yast2-caasp-1.1.0.tar.bz2
New:
----
yast2-caasp-4.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-caasp.spec ++++++
--- /var/tmp/diff_new_pack.ta7lP7/_old 2017-09-21 12:30:40.514474127 +0200
+++ /var/tmp/diff_new_pack.ta7lP7/_new 2017-09-21 12:30:40.518473564 +0200
@@ -17,7 +17,7 @@
Name: yast2-caasp
-Version: 1.1.0
+Version: 4.0.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -41,9 +41,9 @@
# Registration widget
Requires: yast2-registration >= 3.2.1
BuildRequires: yast2-registration >= 3.2.1
-# new keyboard layout cwm widget
-BuildRequires: yast2-country >= 3.2.10
-Requires: yast2-country >= 3.2.10
+# new language selection cwm widget
+BuildRequires: yast2-country >= 4.0.0
+Requires: yast2-country >= 4.0.0
# SlpServices.find
Requires: yast2-slp
BuildRequires: yast2-slp
++++++ yast2-caasp-1.1.0.tar.bz2 -> yast2-caasp-4.0.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-caasp-1.1.0/package/yast2-caasp.changes
new/yast2-caasp-4.0.1/package/yast2-caasp.changes
--- old/yast2-caasp-1.1.0/package/yast2-caasp.changes 2017-05-16
13:12:10.960075335 +0200
+++ new/yast2-caasp-4.0.1/package/yast2-caasp.changes 2017-09-13
10:58:39.354785342 +0200
@@ -1,4 +1,30 @@
-------------------------------------------------------------------
+Tue Sep 12 09:03:53 UTC 2017 - knut.anders...@suse.com
+
+- Replace /info.txt by /README.BETA as beta file to be shown
+ (bsc#1047060).
+- 4.0.1
+
+-------------------------------------------------------------------
+Thu Sep 7 12:06:32 UTC 2017 - jreidin...@suse.com
+
+- Add language selection (FATE#323837)
+- Mark all user visible strings for translation (FATE#323837)
+- 4.0.0
+
+-------------------------------------------------------------------
+Mon Sep 4 12:25:38 UTC 2017 - knut.anders...@suse.com
+
+- Fix keyboard selection widget requirement (fate#322276)
+- 1.1.2
+
+-------------------------------------------------------------------
+Mon Jun 5 18:37:34 UTC 2017 - knut.anders...@suse.com
+
+- Rearrange of keyboard and registration code widgets (bsc#1022768)
+- 1.1.1
+
+-------------------------------------------------------------------
Fri May 12 14:29:47 UTC 2017 - igonzalezs...@suse.com
- Adapt the system roles widget to yast2-installation 3.2.x
@@ -24,7 +50,7 @@
- Configure the administration node as a NTP server/client
(FATE#323249)
-- 1.0.2
+- 1.0.2
-------------------------------------------------------------------
Thu Apr 20 09:20:29 WEST 2017 - knut.anders...@suse.com
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-caasp-1.1.0/package/yast2-caasp.spec
new/yast2-caasp-4.0.1/package/yast2-caasp.spec
--- old/yast2-caasp-1.1.0/package/yast2-caasp.spec 2017-05-16
13:12:10.960075335 +0200
+++ new/yast2-caasp-4.0.1/package/yast2-caasp.spec 2017-09-13
10:58:39.354785342 +0200
@@ -17,7 +17,7 @@
Name: yast2-caasp
-Version: 1.1.0
+Version: 4.0.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -41,9 +41,9 @@
# Registration widget
Requires: yast2-registration >= 3.2.1
BuildRequires: yast2-registration >= 3.2.1
-# new keyboard layout cwm widget
-BuildRequires: yast2-country >= 3.2.10
-Requires: yast2-country >= 3.2.10
+# new language selection cwm widget
+BuildRequires: yast2-country >= 4.0.0
+Requires: yast2-country >= 4.0.0
# SlpServices.find
Requires: yast2-slp
BuildRequires: yast2-slp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-caasp-1.1.0/src/lib/y2caasp/clients/inst_casp_overview.rb
new/yast2-caasp-4.0.1/src/lib/y2caasp/clients/inst_casp_overview.rb
--- old/yast2-caasp-1.1.0/src/lib/y2caasp/clients/inst_casp_overview.rb
2017-05-16 13:12:10.964075425 +0200
+++ new/yast2-caasp-4.0.1/src/lib/y2caasp/clients/inst_casp_overview.rb
2017-09-13 10:58:39.354785342 +0200
@@ -21,7 +21,8 @@
require "uri"
require "users/widgets"
-require "y2country/widgets"
+require "y2country/widgets/keyboard_selection"
+require "y2country/widgets/language_selection"
require "ui/widgets"
require "tune/widgets"
require "registration/widgets/registration_code"
@@ -54,7 +55,7 @@
Yast.import "InstShowInfo"
Yast.import "SlpService"
- textdomain "installation"
+ textdomain "caasp"
# Simplified work-flow do not contain language proposal, but have
software one.
# So avoid false positive detection of language change
@@ -72,14 +73,17 @@
ret = Yast::CWM.show(
content,
# Title for installation overview dialog
- caption: _("Installation Overview"),
+ caption: _("Installation Overview"),
# Button label: start the installation
- next_button: _("Install"),
+ next_button: _("Install"),
# do not show abort and back button
- abort_button: "",
- back_button: ""
+ abort_button: "",
+ back_button: "",
+ skip_store_for: [:redraw]
)
+ next if ret == :redraw
+
# Currently no other return value is expected, behavior can
# be unpredictable if something else is received - raise
# RuntimeError
@@ -112,8 +116,8 @@
private
- # location of the info.txt file (containing the Beta warning)
- INFO_FILE = "/info.txt".freeze
+ # location of the info file (containing the Beta warning)
+ INFO_FILE = "/README.BETA".freeze
# Specific services that needs to be enabled on CAaSP see (FATE#321738)
# It is additional services to the ones defined for role.
@@ -150,6 +154,8 @@
# Returns a pair with UI widget-set for the dialog and widgets that can
# block installation
def content # rubocop:disable MethodLength
+ return @content if @content
+
controller_node = Installation::Widgets::HidingPlace.new(
Y2Caasp::Widgets::ControllerNode.new
)
@@ -163,12 +169,13 @@
redraw: [kdump_overview]
)
- quadrant_layout(
+ @content = quadrant_layout(
upper_left: VBox(
- ::Registration::Widgets::RegistrationCode.new,
- ::Users::PasswordWidget.new(little_space: true),
+ ::Y2Country::Widgets::LanguageSelection.new(emit_event: true),
# use english us as default keyboard layout
- ::Y2Country::Widgets::KeyboardSelectionCombo.new("english-us")
+ ::Y2Country::Widgets::KeyboardSelectionCombo.new,
+ ::Users::PasswordWidget.new(little_space: true),
+ ::Registration::Widgets::RegistrationCode.new
),
lower_left: VBox(
Y2Caasp::Widgets::SystemRole.new(controller_node, ntp_server),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-caasp-1.1.0/src/lib/y2caasp/widgets/ntp_server.rb
new/yast2-caasp-4.0.1/src/lib/y2caasp/widgets/ntp_server.rb
--- old/yast2-caasp-1.1.0/src/lib/y2caasp/widgets/ntp_server.rb 2017-05-16
13:12:10.964075425 +0200
+++ new/yast2-caasp-4.0.1/src/lib/y2caasp/widgets/ntp_server.rb 2017-09-13
10:58:39.354785342 +0200
@@ -33,6 +33,8 @@
module Widgets
# This widget is responsible of validating and storing the NTP server to
use.
class NtpServer < CWM::InputField
+ extend Yast::I18n
+
# @return [Array<String>] List of default servers
attr_reader :default_servers
@@ -41,13 +43,12 @@
# @params default_servers [Array<String>] List of servers
def initialize(default_servers = [])
@default_servers = default_servers
+ textdomain "caasp"
end
- # intentional no translation for CaaSP
- #
# @return [String] Widget's label
def label
- "NTP Servers"
+ _("NTP Servers")
end
# Store the value of the input field if validates
@@ -61,8 +62,8 @@
self.value = saved_servers.join(" ")
end
- NOT_VALID_SERVERS_MESSAGE = "Not valid location for the NTP
servers:\n%{servers}" \
- "\n\nPlease, enter a valid IP or Hostname".freeze
+ NOT_VALID_SERVERS_MESSAGE = N_("Not valid location for the NTP
servers:\n%{servers}" \
+ "\n\nPlease, enter a valid IP or Hostname").freeze
# Validate input
#
# * All specified IPs or hostnames should be valid
@@ -74,7 +75,7 @@
invalid_servers = servers.reject { |v| Yast::IP.Check(v) ||
Yast::Hostname.CheckFQ(v) }
return true if invalid_servers.empty?
Yast::Popup.Error(
- format(NOT_VALID_SERVERS_MESSAGE, servers: invalid_servers.join(",
"))
+ format(_(NOT_VALID_SERVERS_MESSAGE), servers:
invalid_servers.join(", "))
)
false
@@ -94,12 +95,12 @@
# @return [Boolean] true if user wants to skip it; false otherwise.
def skip_ntp_server?
Yast::Popup.AnyQuestion(
- "NTP Servers",
+ _("NTP Servers"),
# TRANSLATORS: error message for invalid ntp server name/address
- "You have not configured an NTP server. This may lead to\n" \
+ _("You have not configured an NTP server. This may lead to\n" \
"your cluster not functioning properly or at all.\n" \
"Proceed with caution and at your own risk.\n\n" \
- "Would you like to continue with the installation?",
+ "Would you like to continue with the installation?"),
Yast::Label.YesButton,
Yast::Label.NoButton,
:yes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-caasp-1.1.0/src/lib/y2caasp/widgets/overview.rb
new/yast2-caasp-4.0.1/src/lib/y2caasp/widgets/overview.rb
--- old/yast2-caasp-1.1.0/src/lib/y2caasp/widgets/overview.rb 2017-05-16
13:12:10.964075425 +0200
+++ new/yast2-caasp-4.0.1/src/lib/y2caasp/widgets/overview.rb 2017-09-13
10:58:39.354785342 +0200
@@ -38,7 +38,7 @@
# responsible for not creating circular dependencies.
# eg. "bootloader_proposal"
def initialize(client:, redraw: [])
- textdomain "installation"
+ textdomain "caasp"
@proposal_client = client
@replace_point = "rp_" + client
# by default widget_id is the class name; must differentiate instances
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-caasp-1.1.0/src/lib/y2caasp/widgets/system_role.rb
new/yast2-caasp-4.0.1/src/lib/y2caasp/widgets/system_role.rb
--- old/yast2-caasp-1.1.0/src/lib/y2caasp/widgets/system_role.rb
2017-05-16 13:12:10.964075425 +0200
+++ new/yast2-caasp-4.0.1/src/lib/y2caasp/widgets/system_role.rb
2017-09-13 10:58:39.354785342 +0200
@@ -35,9 +35,12 @@
# which must be a valid IP or FQDN.
# bsc#1032057: old name: Controller Node, new name: Administration Node.
class ControllerNode < CWM::InputField
+ def initialize
+ textdomain "caasp"
+ end
+
def label
- # intentional no translation for CAASP
- "Administration Node"
+ _("Administration Node")
end
# It stores the value of the input field if validates
@@ -85,7 +88,7 @@
attr_reader :widgets_map
def initialize(controller_node_widget, ntp_server_widget)
- textdomain "installation"
+ textdomain "caasp"
@widgets_map = {
controller_node: controller_node_widget,
ntp_server: ntp_server_widget
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-caasp-1.1.0/test/inst_casp_overview_test.rb
new/yast2-caasp-4.0.1/test/inst_casp_overview_test.rb
--- old/yast2-caasp-1.1.0/test/inst_casp_overview_test.rb 2017-05-16
13:12:10.964075425 +0200
+++ new/yast2-caasp-4.0.1/test/inst_casp_overview_test.rb 2017-09-13
10:58:39.354785342 +0200
@@ -49,17 +49,28 @@
module Y2Country
module Widgets
class KeyboardSelectionCombo < CWM::ComboBox
- def initialize(_language)
+ def initialize(_language = "def")
end
def label
"Keyboard"
end
end
+
+ class LanguageSelection < CWM::ComboBox
+ def initialize(emit_event: false)
+ end
+
+ def label
+ "language"
+ end
+ end
end
end
describe ::Y2Caasp::InstCaspOverview do
+ let(:beta_file) { "/README.BETA" }
+
describe "#run" do
let(:ntp_servers) { [] }
@@ -73,7 +84,7 @@
allow(Yast::WFM).to receive(:CallFunction)
.with("inst_doit", []).and_return(:next)
allow(File).to receive(:exist?).and_call_original
- allow(File).to receive(:exist?).with("/info.txt").and_return(false)
+ allow(File).to receive(:exist?).with(beta_file).and_return(false)
allow(Yast::SlpService).to receive(:all).and_return(ntp_servers)
end
@@ -113,16 +124,16 @@
expect(::Installation::Services.enabled).to include("cloud-init")
end
- it "displays the /info.txt file if it exists" do
- expect(File).to receive(:exist?).with("/info.txt").and_return(true)
- expect(Yast::InstShowInfo).to
receive(:show_info_txt).with("/info.txt").and_return(true)
+ it "displays the BETA file if it exists" do
+ expect(File).to receive(:exist?).with(beta_file).and_return(true)
+ expect(Yast::InstShowInfo).to
receive(:show_info_txt).with(beta_file).and_return(true)
expect(Yast::CWM).to receive(:show).and_return(:next)
subject.run
end
- it "does not try displaying the /info.txt file if it does not exist" do
- expect(File).to receive(:exist?).with("/info.txt").and_return(false)
+ it "does not try displaying the beta file if it does not exist" do
+ expect(File).to receive(:exist?).with(beta_file).and_return(false)
expect(Yast::InstShowInfo).to_not receive(:show_info_txt)
expect(Yast::CWM).to receive(:show).and_return(:next)
