Hello community,
here is the log from the commit of package yast2-nis-server for
openSUSE:Leap:15.2 checked in at 2020-03-13 10:55:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/yast2-nis-server (Old)
and /work/SRC/openSUSE:Leap:15.2/.yast2-nis-server.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-nis-server"
Fri Mar 13 10:55:14 2020 rev:20 rq:781757 version:4.2.2
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/yast2-nis-server/yast2-nis-server.changes
2020-01-15 16:32:16.116881322 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.yast2-nis-server.new.3160/yast2-nis-server.changes
2020-03-13 10:55:16.612344914 +0100
@@ -1,0 +2,7 @@
+Fri Feb 28 11:12:19 UTC 2020 - Josef Reidinger <[email protected]>
+
+- Properly report in CLI whether NIS is configured or not
+ (bsc#1146030)
+- 4.2.2
+
+-------------------------------------------------------------------
Old:
----
yast2-nis-server-4.2.1.tar.bz2
New:
----
yast2-nis-server-4.2.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-nis-server.spec ++++++
--- /var/tmp/diff_new_pack.K4ygD7/_old 2020-03-13 10:55:17.180345319 +0100
+++ /var/tmp/diff_new_pack.K4ygD7/_new 2020-03-13 10:55:17.184345322 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-nis-server
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 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,7 +17,7 @@
Name: yast2-nis-server
-Version: 4.2.1
+Version: 4.2.2
Release: 0
Summary: YaST2 - Network Information Services (NIS) Server Configuration
License: GPL-2.0-only
++++++ yast2-nis-server-4.2.1.tar.bz2 -> yast2-nis-server-4.2.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-nis-server-4.2.1/package/yast2-nis-server.changes
new/yast2-nis-server-4.2.2/package/yast2-nis-server.changes
--- old/yast2-nis-server-4.2.1/package/yast2-nis-server.changes 2019-08-27
19:40:03.000000000 +0200
+++ new/yast2-nis-server-4.2.2/package/yast2-nis-server.changes 2020-02-28
13:20:56.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Feb 28 11:12:19 UTC 2020 - Josef Reidinger <[email protected]>
+
+- Properly report in CLI whether NIS is configured or not
+ (bsc#1146030)
+- 4.2.2
+
+-------------------------------------------------------------------
Tue Aug 27 18:25:37 CEST 2019 - [email protected]
- Set X-SuSE-YaST-AutoInstResource in desktop file (bsc#144894).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nis-server-4.2.1/package/yast2-nis-server.spec
new/yast2-nis-server-4.2.2/package/yast2-nis-server.spec
--- old/yast2-nis-server-4.2.1/package/yast2-nis-server.spec 2019-08-27
19:40:03.000000000 +0200
+++ new/yast2-nis-server-4.2.2/package/yast2-nis-server.spec 2020-02-28
13:20:56.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-nis-server
-Version: 4.2.1
+Version: 4.2.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.2.1/src/include/nis_server/what.rb
new/yast2-nis-server-4.2.2/src/include/nis_server/what.rb
--- old/yast2-nis-server-4.2.1/src/include/nis_server/what.rb 2019-08-27
19:40:03.000000000 +0200
+++ new/yast2-nis-server-4.2.2/src/include/nis_server/what.rb 2020-02-28
13:20:56.000000000 +0100
@@ -62,29 +62,23 @@
labels = VBox()
labels = Builtins.add(labels, VSpacing(1.5))
- master_setup_label = ""
- slave_setup_label = ""
- none_setup_label = ""
-
- if detected == :none
+ if NisServer.isYPServerInstalled
+ # To translators: label in the dialog
+ install_label = _("NIS Software is installed.")
+ else
# help text 2/2
- helptext = Ops.add(
- helptext,
+ helptext +=
_(
"<p>The NIS server package will be <b>installed</b> first if you
want to\nconfigure it.</p>"
)
- )
+ # To translators: label in the dialog
+ install_label = _("No NIS Software is installed.")
+ end
+ labels << Left(Label(install_label))
+ if detected == :none
# To translators: label in the dialog
- labels = Builtins.add(
- labels,
- Left(Label(_("No NIS Software is installed.")))
- )
- # To translators: label in the dialog
- labels = Builtins.add(
- labels,
- Left(Label(_("No NIS Server is configured.")))
- )
+ labels << Left(Label(_("No NIS Server is configured.")))
# To translators: label in the dialog
master_setup_label = _("Install and set up an NIS &Master Server")
@@ -95,27 +89,15 @@
elsif isYPServerConfigured
isMaster = detected == :master
- labels = Builtins.add(
- labels,
- Left(Label(_("NIS Software is installed.")))
- )
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
- labels = Builtins.add(
- labels,
- Left(
- Label(
- Builtins.sformat(
- _("A NIS %1 Server is configured."),
- slave_or_master
- )
- )
- )
- )
+ labels << Left(Label(Builtins.sformat(
+ _("A NIS %1 Server is configured."), slave_or_master
+ )))
# To translators: label in the dialog
reconfigure_master = _("Reconfigure NIS &Master Server")
@@ -132,15 +114,9 @@
none_setup_label = _("&Deactivate any NIS server configuration")
else
# To translators: label in the dialog
- labels = Builtins.add(
- labels,
- Left(Label(_("NIS Software is installed.")))
- )
- # To translators: label in the dialog
- labels = Builtins.add(
- labels,
- Left(Label(_("No NIS Server is configured.")))
- )
+ labels << Left(Label(_("NIS Software is installed.")))
+ # To translators: label in the dialog
+ labels << Left(Label(_("No NIS Server is configured.")))
# To translators: checkbox label
master_setup_label = _("Create NIS &Master Server")
@@ -152,47 +128,39 @@
info = HBox()
# To translators: label in the dialog
- info = Builtins.add(info, VBox(Label(_("Current status:"))))
- info = Builtins.add(info, HSpacing(4))
- info = Builtins.add(info, labels)
+ info << VBox(Label(_("Current status:")))
+ info << HSpacing(4)
+ info << labels
+
buttons = VBox()
- buttons = Builtins.add(buttons, VSpacing(0.5))
- buttons = Builtins.add(
- buttons,
- Left(
- RadioButton(
- Id(:master),
- Opt(:notify),
- master_setup_label,
- detected == :master
- )
- )
- )
- buttons = Builtins.add(buttons, VSpacing(0.2))
- buttons = Builtins.add(
- buttons,
- Left(
- RadioButton(
- Id(:slave),
- Opt(:notify),
- slave_setup_label,
- detected == :slave
- )
- )
- )
- buttons = Builtins.add(buttons, VSpacing(0.2))
- buttons = Builtins.add(
- buttons,
- Left(
- RadioButton(
- Id(:none),
- Opt(:notify),
- none_setup_label,
- detected == :none
- )
- )
- )
- buttons = Builtins.add(buttons, VSpacing(0.5))
+ buttons << VSpacing(0.5)
+ buttons << Left(
+ RadioButton(
+ Id(:master),
+ Opt(:notify),
+ master_setup_label,
+ detected == :master
+ )
+ )
+ buttons << VSpacing(0.2)
+ buttons << Left(
+ RadioButton(
+ Id(:slave),
+ Opt(:notify),
+ slave_setup_label,
+ detected == :slave
+ )
+ )
+ buttons << VSpacing(0.2)
+ buttons << Left(
+ RadioButton(
+ Id(:none),
+ Opt(:notify),
+ none_setup_label,
+ detected == :none
+ )
+ )
+ buttons << VSpacing(0.5)
buttons = HBox(HSpacing(0.5), buttons, HSpacing(0.5))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nis-server-4.2.1/src/modules/NisServer.rb
new/yast2-nis-server-4.2.2/src/modules/NisServer.rb
--- old/yast2-nis-server-4.2.1/src/modules/NisServer.rb 2019-08-27
19:40:03.000000000 +0200
+++ new/yast2-nis-server-4.2.2/src/modules/NisServer.rb 2020-02-28
13:20:56.000000000 +0100
@@ -305,7 +305,7 @@
end
Progress.NextStage
- if !isYPServerInstalled
+ if !isYPServerInstalled || getMaster.nil?
@ui_what = :none
else
@ui_what = isYPMaster ? :master : :slave
