Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2-nis-server for
openSUSE:Factory checked in at 2022-02-24 18:18:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-nis-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-nis-server.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-nis-server"
Thu Feb 24 18:18:16 2022 rev:48 rq:956943 version:4.4.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-nis-server/yast2-nis-server.changes
2021-07-29 21:30:57.624845215 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-nis-server.new.1958/yast2-nis-server.changes
2022-02-24 18:18:18.446740790 +0100
@@ -1,0 +2,7 @@
+Fri Feb 18 12:51:37 UTC 2022 - Michal Filka <mfi...@suse.com>
+
+- bnc#1195714
+ - slaves removed from UI and replaced by workers
+- 4.4.2
+
+-------------------------------------------------------------------
Old:
----
yast2-nis-server-4.4.1.tar.bz2
New:
----
yast2-nis-server-4.4.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-nis-server.spec ++++++
--- /var/tmp/diff_new_pack.ePI7t8/_old 2022-02-24 18:18:18.938740659 +0100
+++ /var/tmp/diff_new_pack.ePI7t8/_new 2022-02-24 18:18:18.942740658 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-nis-server
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: yast2-nis-server
-Version: 4.4.1
+Version: 4.4.2
Release: 0
Summary: YaST2 - Network Information Services (NIS) Server Configuration
License: GPL-2.0-only
++++++ yast2-nis-server-4.4.1.tar.bz2 -> yast2-nis-server-4.4.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nis-server-4.4.1/.github/workflows/ci.yml
new/yast2-nis-server-4.4.2/.github/workflows/ci.yml
--- old/yast2-nis-server-4.4.1/.github/workflows/ci.yml 2021-07-23
15:56:20.000000000 +0200
+++ new/yast2-nis-server-4.4.2/.github/workflows/ci.yml 2022-02-23
10:49:40.000000000 +0100
@@ -8,7 +8,14 @@
jobs:
Tests:
runs-on: ubuntu-latest
- container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ distro: [ "tumbleweed", "leap_latest" ]
+
+ container:
+ image:
registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
steps:
@@ -27,13 +34,22 @@
# send the coverage report to coveralls.io
- name: Coveralls Report
+ # send it only from the TW build to avoid duplicate submits
+ if: ${{ matrix.distro == 'tumbleweed' }}
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
Package:
runs-on: ubuntu-latest
- container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ distro: [ "tumbleweed", "leap_latest" ]
+
+ container:
+ image:
registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
steps:
@@ -45,7 +61,14 @@
Yardoc:
runs-on: ubuntu-latest
- container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ distro: [ "leap_latest" ]
+
+ container:
+ image:
registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
steps:
@@ -59,7 +82,14 @@
# checks into one job avoids that overhead
Checks:
runs-on: ubuntu-latest
- container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ distro: [ "leap_latest" ]
+
+ container:
+ image:
registry.opensuse.org/yast/head/containers_${{matrix.distro}}/yast-ruby
steps:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-nis-server-4.4.1/package/yast2-nis-server.changes
new/yast2-nis-server-4.4.2/package/yast2-nis-server.changes
--- old/yast2-nis-server-4.4.1/package/yast2-nis-server.changes 2021-07-23
15:56:20.000000000 +0200
+++ new/yast2-nis-server-4.4.2/package/yast2-nis-server.changes 2022-02-23
10:49:40.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Feb 18 12:51:37 UTC 2022 - Michal Filka <mfi...@suse.com>
+
+- bnc#1195714
+ - slaves removed from UI and replaced by workers
+- 4.4.2
+
+-------------------------------------------------------------------
Fri Jul 23 12:15:34 UTC 2021 - Imobach Gonzalez Sosa <igonzalezs...@suse.com>
- Set X-SuSE-YaST-AutoInstClient in the desktop file to properly
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nis-server-4.4.1/package/yast2-nis-server.spec
new/yast2-nis-server-4.4.2/package/yast2-nis-server.spec
--- old/yast2-nis-server-4.4.1/package/yast2-nis-server.spec 2021-07-23
15:56:20.000000000 +0200
+++ new/yast2-nis-server-4.4.2/package/yast2-nis-server.spec 2022-02-23
10:49:40.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-nis-server
-Version: 4.4.1
+Version: 4.4.2
Release: 0
Group: System/YaST
License: GPL-2.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nis-server-4.4.1/src/clients/nis_server.rb
new/yast2-nis-server-4.4.2/src/clients/nis_server.rb
--- old/yast2-nis-server-4.4.1/src/clients/nis_server.rb 2021-07-23
15:56:20.000000000 +0200
+++ new/yast2-nis-server-4.4.2/src/clients/nis_server.rb 2022-02-23
10:49:40.000000000 +0100
@@ -98,8 +98,19 @@
"boolean (map)"
),
# command line action help
+ # TRANSLATORS: help for the "slave" action. It is obsoleted by
the "worker" action
"help" => _(
- "Configure NIS slave server"
+ "Configure NIS worker server (obsolete)"
+ )
+ },
+ "worker" => {
+ "handler" => fun_ref(
+ method(:NisServerSlaveHandler),
+ "boolean (map)"
+ ),
+ # command line action help
+ "help" => _(
+ "Configure NIS worker server"
)
}
},
@@ -186,7 +197,7 @@
CommandLine.Print(_("A NIS master server is configured."))
else
# summary label
- CommandLine.Print(_("A NIS slave server is configured."))
+ CommandLine.Print(_("A NIS worker server is configured."))
end
# summary label
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-nis-server-4.4.1/src/include/nis_server/master.rb
new/yast2-nis-server-4.4.2/src/include/nis_server/master.rb
--- old/yast2-nis-server-4.4.1/src/include/nis_server/master.rb 2021-07-23
15:56:20.000000000 +0200
+++ new/yast2-nis-server-4.4.2/src/include/nis_server/master.rb 2022-02-23
10:49:40.000000000 +0100
@@ -73,13 +73,14 @@
)
# help text 2/3
+ # TRANSLATORS: workers or worker servers used to be known as slave
servers before
helptext = Ops.add(
helptext,
_(
- "<p>For slave servers to cooperate with this master, check\n" +
- "<i>Active Slave NIS server exists</i>. If you check\n" +
+ "<p>For worker servers to cooperate with this master, check\n" +
+ "<i>Active Worker NIS server exists</i>. If you check\n" +
"<i>Fast Map distribution</i>, it will speed up the transfer of
maps to the\n" +
- "slaves.</p>\n"
+ "workers.</p>\n"
)
)
@@ -167,7 +168,7 @@
CheckBox(
Id(:have_slave),
# To translators: checkbox label
- _("Active Slave NIS server &exists"),
+ _("Active Worker NIS server &exists"),
!nopush
)
),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-nis-server-4.4.1/src/include/nis_server/routines.rb
new/yast2-nis-server-4.4.2/src/include/nis_server/routines.rb
--- old/yast2-nis-server-4.4.1/src/include/nis_server/routines.rb
2021-07-23 15:56:20.000000000 +0200
+++ new/yast2-nis-server-4.4.2/src/include/nis_server/routines.rb
2022-02-23 10:49:40.000000000 +0100
@@ -48,26 +48,6 @@
Yast.import "Service"
end
- # Converts from any type to boolean:
- # true, "true" and nonzero integers are true,
- # everything else including nil is false.
- # @param [Object] arg argument to convert
- # @return converted value
- def toboolean(arg)
- arg = deep_copy(arg)
- if arg == nil
- return false
- elsif Ops.is_boolean?(arg)
- return deep_copy(arg)
- elsif Ops.is_string?(arg)
- return arg == "true"
- elsif Ops.is_integer?(arg)
- return arg != 0
- else
- return false
- end
- end
-
# @return Checks if the YP server was already configured
# by reading the SCR, not the module data
# (not to confuse the user if he backs up to the first dialog)
@@ -82,47 +62,6 @@
NisServer.nopush ? :none_slave : :have_slave
end
- # unused
- # @return Checks if this host is in the slaves list on master
- def hasMasterThisSlave
- # list of maps: $["host": "foo.com", "map":"passwd.byuid"]
- running_maps = Convert.convert(
- SCR.Read(path(".run.ypwhich_m")),
- :from => "any",
- :to => "list <map>"
- )
- if running_maps != nil
- running_maps_str = Builtins.maplist(running_maps) do |m|
- Ops.get_string(m, "map", "")
- end
- if Builtins.contains(running_maps_str, "ypservers")
- out = Convert.to_map(
- SCR.Execute(path(".target.bash_output"), "/usr/bin/ypcat
ypservers")
- )
- slaves = Ops.get_string(out, "stdout", "")
- if slaves != nil
- out = Convert.to_map(
- SCR.Execute(
- path(".target.bash_output"),
- "/usr/lib/yp/yphelper --hostname"
- )
- )
- hostname = Ops.get_string(out, "stdout", "")
- return false if hostname == ""
- hostname = Builtins.substring(
- hostname,
- 0,
- Ops.subtract(Builtins.size(hostname), 1)
- )
- if Builtins.contains(Builtins.splitstring(slaves, "\n"), hostname)
- return true
- end
- end
- end
- end
- false
- end
-
# Do the check if DHCP client is able to change domain name and
# warn user about this (see bug #28727)
def CheckForDHCPClient(domain)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-nis-server-4.4.1/src/include/nis_server/slave.rb
new/yast2-nis-server-4.4.2/src/include/nis_server/slave.rb
--- old/yast2-nis-server-4.4.1/src/include/nis_server/slave.rb 2021-07-23
15:56:20.000000000 +0200
+++ new/yast2-nis-server-4.4.2/src/include/nis_server/slave.rb 2022-02-23
10:49:40.000000000 +0100
@@ -104,9 +104,9 @@
)
)
- # To translators: dialog label
+ # To translators: dialog label, worker used to be known as slave
Wizard.SetContents(
- _("Slave Server Setup"),
+ _("Worker Server Setup"),
contents,
helptext,
true,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-nis-server-4.4.1/src/include/nis_server/slaves.rb
new/yast2-nis-server-4.4.2/src/include/nis_server/slaves.rb
--- old/yast2-nis-server-4.4.1/src/include/nis_server/slaves.rb 2021-07-23
15:56:20.000000000 +0200
+++ new/yast2-nis-server-4.4.2/src/include/nis_server/slaves.rb 2022-02-23
10:49:40.000000000 +0100
@@ -97,7 +97,7 @@
def YPSlavePopup(slave)
hbox = HBox(
# To translators: textentry label
- InputField(Id(:slave), Opt(:hstretch), _("&Slave's host name"), slave),
+ InputField(Id(:slave), Opt(:hstretch), _("&Worker's host name"),
slave),
VBox(
VSpacing(),
PushButton(Id(:browse), Opt(:key_F6), Label.BrowseButton)
@@ -109,7 +109,7 @@
VBox(
VSpacing(0.3),
# To translators: popup dialog heading
- Heading(_("Edit slave")),
+ Heading(_("Edit worker")),
VSpacing(0.5),
hbox,
VSpacing(0.3),
@@ -173,7 +173,7 @@
def MastersSlavesDialog
# help text 1/1
helptext = _(
- "<p>Here, enter the names of hosts to configure as NIS server slaves.
Use <i>Add</i> to add a new one, <i>Edit</i> to change an existing entry, and
<i>Delete</i> to remove an entry.</p>"
+ "<p>Here, enter the names of hosts to configure as NIS server workers.
Use <i>Add</i> to add a new one, <i>Edit</i> to change an existing entry, and
<i>Delete</i> to remove an entry.</p>"
)
slaves = deep_copy(NisServer.ypservers)
@@ -192,7 +192,7 @@
SelectionBox(
Id(:slaves),
Opt(:notify),
- _("&Slaves"),
+ _("&Workers"),
Builtins.sort(slaves)
)
),
@@ -201,7 +201,7 @@
# To translators: dialog label
Wizard.SetContents(
- _("NIS Master Server Slaves Setup"),
+ _("NIS Master Server Workers Setup"),
contents,
helptext,
true,
@@ -231,7 +231,7 @@
SelectionBox(
Id(:slaves),
Opt(:notify),
- _("&Slaves"),
+ _("&Workers"),
Builtins.sort(slaves)
)
)
@@ -247,7 +247,7 @@
SelectionBox(
Id(:slaves),
Opt(:notify),
- _("&Slaves"),
+ _("&Workers"),
Builtins.sort(slaves)
)
)
@@ -260,7 +260,7 @@
SelectionBox(
Id(:slaves),
Opt(:notify),
- _("&Slaves"),
+ _("&Workers"),
Builtins.sort(slaves)
)
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nis-server-4.4.1/src/include/nis_server/ui.rb
new/yast2-nis-server-4.4.2/src/include/nis_server/ui.rb
--- old/yast2-nis-server-4.4.1/src/include/nis_server/ui.rb 2021-07-23
15:56:20.000000000 +0200
+++ new/yast2-nis-server-4.4.2/src/include/nis_server/ui.rb 2022-02-23
10:49:40.000000000 +0100
@@ -70,20 +70,6 @@
ret ? :next : :abort
end
- # Popup to confirm after finish is pressed
- # @return `yes or `back
- def FinishPopup
- if Popup.ContinueCancelHeadline(
- # To translators: ContinueCancel Popup headline
- _("Finish"),
- # To translators: ContinueCancel Popup
- _("Really save configuration ?")
- )
- return :yes
- end
- :back
- end
-
# Popup to confirm vhen exitting without saving
# @return `exit or `back
def ExitPopup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-nis-server-4.4.1/src/include/nis_server/what.rb
new/yast2-nis-server-4.4.2/src/include/nis_server/what.rb
--- old/yast2-nis-server-4.4.1/src/include/nis_server/what.rb 2021-07-23
15:56:20.000000000 +0200
+++ new/yast2-nis-server-4.4.2/src/include/nis_server/what.rb 2022-02-23
10:49:40.000000000 +0100
@@ -55,7 +55,7 @@
def WhatToConfigure
# help text 1/2
helptext = _(
- "<p>Select whether to configure the NIS server as a <b>master</b> or
a\n<b>slave</b> or not to configure a NIS server.</p>\n"
+ "<p>Select whether to configure the NIS server as a <b>master</b> or
a\n<b>worker</b> or not to configure a NIS server.</p>\n"
)
detected = NisServer.ui_what
@@ -83,7 +83,7 @@
# To translators: label in the dialog
master_setup_label = _("Install and set up an NIS &Master Server")
# To translators: label in the dialog
- slave_setup_label = _("Install and set up an NIS &Slave Server")
+ slave_setup_label = _("Install and set up an NIS &Worker Server")
# To translators: label in the dialog
none_setup_label = _("&Do nothing and leave set up")
elsif isYPServerConfigured
@@ -92,9 +92,9 @@
slave_or_master = isMaster ?
# To translators: part of the label in the dialog
_("Master") :
- # To translators: part of the label in the dialog
- _("Slave")
- # To translators: label in the dialog, %1 is Master or Slave above
+ # To translators: part of the label in the dialog, used to be slave
before
+ _("Worker")
+ # To translators: label in the dialog, %1 is Master or Worker above
labels << Left(Label(Builtins.sformat(
_("A NIS %1 Server is configured."), slave_or_master
)))
@@ -104,9 +104,9 @@
# To translators: label in the dialog
change_to_master = _("Change to NIS &Master Server")
# To translators: label in the dialog
- reconfigure_slave = _("Reconfigure NIS &Slave Server")
+ reconfigure_slave = _("Reconfigure NIS &Worker Server")
# To translators: label in the dialog
- change_to_slave = _("Change to NIS &Slave Server")
+ change_to_slave = _("Change to NIS &Worker Server")
master_setup_label = isMaster ? reconfigure_master : change_to_master
slave_setup_label = isMaster ? change_to_slave : reconfigure_slave
@@ -121,7 +121,7 @@
# To translators: checkbox label
master_setup_label = _("Create NIS &Master Server")
# To translators: checkbox label
- slave_setup_label = _("Create NIS &Slave Server")
+ slave_setup_label = _("Create NIS &Worker Server")
# To translators: checkbox label
none_setup_label = _("&Do nothing and leave set up")
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nis-server-4.4.1/src/modules/NisServer.rb
new/yast2-nis-server-4.4.2/src/modules/NisServer.rb
--- old/yast2-nis-server-4.4.1/src/modules/NisServer.rb 2021-07-23
15:56:20.000000000 +0200
+++ new/yast2-nis-server-4.4.2/src/modules/NisServer.rb 2022-02-23
10:49:40.000000000 +0100
@@ -668,7 +668,7 @@
if !Builtins.contains(running_maps, "ypservers")
# To translators: message in the popup dialog
- addError(_("Could not get list with slaves.\n"))
+ addError(_("Could not get list with workers.\n"))
else
output = Convert.to_map(
SCR.Execute(
@@ -1097,10 +1097,10 @@
[
# To translators: progress label
{
- "save_label" => _("Save slaves."),
+ "save_label" => _("Save workers."),
# To translators: progress label
"progress_label" => _(
- "Saving slaves."
+ "Saving workers."
),
"function" => [fun_ref(method(:SaveSlaves), "void ()")]
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nis-server-4.4.1/test/routines_test.rb
new/yast2-nis-server-4.4.2/test/routines_test.rb
--- old/yast2-nis-server-4.4.1/test/routines_test.rb 2021-07-23
15:56:20.000000000 +0200
+++ new/yast2-nis-server-4.4.2/test/routines_test.rb 1970-01-01
01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-require_relative "test_helper"
-
-class TestClass < Yast::Client
- def initialize
- Yast.include self, "nis_server/routines.rb"
- end
-end
-
-describe "RoutinesInclude" do
- subject { TestClass.new }
-
- describe "#toboolean" do
- it "converts value to boolean" do
- ["true", 1, true].each do |v|
- expect(subject.toboolean(v)).to eq true
- end
-
- ["false", 0, false].each do |v|
- expect(subject.toboolean(v)).to eq false
- end
- end
-
- it "returns false for unknown values" do
- [[], {}, nil, :symbol].each do |v|
- expect(subject.toboolean(v)).to eq false
- end
- end
- end
-end
