Hello community,
here is the log from the commit of package yast2-iscsi-lio-server for
openSUSE:Factory checked in at 2018-08-18 00:05:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-iscsi-lio-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-iscsi-lio-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-iscsi-lio-server"
Sat Aug 18 00:05:17 2018 rev:31 rq:629608 version:4.1.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-iscsi-lio-server/yast2-iscsi-lio-server.changes
2018-06-29 22:37:31.213943498 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-iscsi-lio-server.new/yast2-iscsi-lio-server.changes
2018-08-18 00:05:18.971293170 +0200
@@ -1,0 +2,7 @@
+Tue Aug 7 12:09:41 UTC 2018 - [email protected]
+
+- Use Yast2::ServiceWidget to manage the service status
+ (part of fate#319428).
+- 4.1.0
+
+-------------------------------------------------------------------
@@ -4,0 +12 @@
+- Changed UI layout.
Old:
----
yast2-iscsi-lio-server-4.0.11.tar.bz2
New:
----
yast2-iscsi-lio-server-4.1.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-lio-server.spec ++++++
--- /var/tmp/diff_new_pack.qQa1bU/_old 2018-08-18 00:05:19.435294559 +0200
+++ /var/tmp/diff_new_pack.qQa1bU/_new 2018-08-18 00:05:19.435294559 +0200
@@ -17,14 +17,15 @@
Name: yast2-iscsi-lio-server
-Version: 4.0.11
+Version: 4.1.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
BuildRequires: update-desktop-files
-BuildRequires: yast2
+# Yast2::ServiceWidget
+BuildRequires: yast2 >= 4.1.0
BuildRequires: yast2-devtools >= 3.1.10
BuildRequires: rubygem(%rb_default_ruby_abi:rspec)
BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake)
@@ -32,8 +33,8 @@
Requires: python3-rtslib-fb
Requires: python3-targetcli-fb
-#Replace SuSEFirewall2 by firewalld
-Requires: yast2 >= 4.0.39
+# Yast2::ServiceWidget
+Requires: yast2 >= 4.1.0
BuildArch: noarch
++++++ yast2-iscsi-lio-server-4.0.11.tar.bz2 ->
yast2-iscsi-lio-server-4.1.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-lio-server-4.0.11/package/yast2-iscsi-lio-server.changes
new/yast2-iscsi-lio-server-4.1.0/package/yast2-iscsi-lio-server.changes
--- old/yast2-iscsi-lio-server-4.0.11/package/yast2-iscsi-lio-server.changes
2018-06-29 18:31:50.000000000 +0200
+++ new/yast2-iscsi-lio-server-4.1.0/package/yast2-iscsi-lio-server.changes
2018-08-16 17:10:39.000000000 +0200
@@ -1,7 +1,15 @@
-------------------------------------------------------------------
+Tue Aug 7 12:09:41 UTC 2018 - [email protected]
+
+- Use Yast2::ServiceWidget to manage the service status
+ (part of fate#319428).
+- 4.1.0
+
+-------------------------------------------------------------------
Wed Jun 27 15:21:50 CEST 2018 - [email protected]
- Added additional searchkeys to desktop file (fate#321043).
+- Changed UI layout.
- 4.0.11
-------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-lio-server-4.0.11/package/yast2-iscsi-lio-server.spec
new/yast2-iscsi-lio-server-4.1.0/package/yast2-iscsi-lio-server.spec
--- old/yast2-iscsi-lio-server-4.0.11/package/yast2-iscsi-lio-server.spec
2018-06-29 18:31:50.000000000 +0200
+++ new/yast2-iscsi-lio-server-4.1.0/package/yast2-iscsi-lio-server.spec
2018-08-16 17:10:39.000000000 +0200
@@ -17,14 +17,15 @@
Name: yast2-iscsi-lio-server
-Version: 4.0.11
+Version: 4.1.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
BuildRequires: update-desktop-files
-BuildRequires: yast2
+# Yast2::ServiceWidget
+BuildRequires: yast2 >= 4.1.0
BuildRequires: yast2-devtools >= 3.1.10
BuildRequires: rubygem(%rb_default_ruby_abi:rspec)
BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake)
@@ -32,8 +33,8 @@
Requires: python3-rtslib-fb
Requires: python3-targetcli-fb
-#Replace SuSEFirewall2 by firewalld
-Requires: yast2 >= 4.0.39
+# Yast2::ServiceWidget
+Requires: yast2 >= 4.1.0
BuildArch: noarch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-lio-server-4.0.11/src/clients/iscsi-lio-server.rb
new/yast2-iscsi-lio-server-4.1.0/src/clients/iscsi-lio-server.rb
--- old/yast2-iscsi-lio-server-4.0.11/src/clients/iscsi-lio-server.rb
2018-06-29 18:31:50.000000000 +0200
+++ new/yast2-iscsi-lio-server-4.1.0/src/clients/iscsi-lio-server.rb
2018-08-16 17:10:39.000000000 +0200
@@ -1,21 +1,15 @@
require_relative '../include/iscsi-lio-server/iscsi-lio-server_helper.rb'
require_relative '../include/iscsi-lio-server/TargetData.rb'
require_relative '../include/iscsi-lio-server/UI_dialogs.rb'
-require "cwm/widget"
-require "ui/service_status"
require "yast"
require "yast2/execute"
require "y2firewall/firewalld"
Yast.import "CWM"
-Yast.import "CWMTab"
Yast.import "TablePopup"
-Yast.import "CWMServiceStart"
Yast.import "Popup"
Yast.import "Wizard"
Yast.import "CWMFirewallInterfaces"
-Yast.import "Service"
-Yast.import "CWMServiceStart"
Yast.import "UI"
Yast.import "Confirm"
@@ -71,9 +65,9 @@
contents = VBox(tabs,VStretch())
Yast::Wizard.CreateDialog
ret = CWM.show(contents, caption: _("Yast iSCSI Targets"),next_button:
_("Finish"))
- Yast::Wizard.CloseDialog
if ret == :next
firewalld.write
+ service_tab.write
status = $discovery_auth.fetch_status
userid = $discovery_auth.fetch_userid
password = $discovery_auth.fetch_password
@@ -110,8 +104,8 @@
end
$global_data.execute_exit_commands
end
+ Yast::Wizard.CloseDialog
end
-
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-lio-server-4.0.11/src/include/iscsi-lio-server/UI_dialogs.rb
new/yast2-iscsi-lio-server-4.1.0/src/include/iscsi-lio-server/UI_dialogs.rb
---
old/yast2-iscsi-lio-server-4.0.11/src/include/iscsi-lio-server/UI_dialogs.rb
2018-06-29 18:31:50.000000000 +0200
+++ new/yast2-iscsi-lio-server-4.1.0/src/include/iscsi-lio-server/UI_dialogs.rb
2018-08-16 17:10:39.000000000 +0200
@@ -1,23 +1,21 @@
-require_relative './iscsi-lio-server_helper.rb'
-require_relative './TargetData.rb'
-require 'cwm/widget'
-require 'ui/service_status'
require 'yast'
+require 'yast2/execute'
+require 'yast2/system_service'
+
require 'cwm/table'
require 'cwm/dialog'
-require 'yast2/execute'
+require 'cwm/widget'
+require 'cwm/service_widget'
+
+require_relative './iscsi-lio-server_helper.rb'
+require_relative './TargetData.rb'
Yast.import 'CWM'
-Yast.import 'CWMTab'
Yast.import 'TablePopup'
-Yast.import 'CWMServiceStart'
Yast.import 'Popup'
Yast.import 'Wizard'
Yast.import 'CWMFirewallInterfaces'
-Yast.import 'Service'
-Yast.import 'CWMServiceStart'
Yast.import 'UI'
-Yast.import 'TablePopup'
class NoDiscoveryAuth_CheckBox < ::CWM::CheckBox
def initialize(container,value)
@@ -408,56 +406,58 @@
class ServiceTab < ::CWM::Tab
include Yast::I18n
include Yast::UIShortcuts
+
def initialize
textdomain "iscsi-lio-server"
+
self.initial = true
- @service = Yast::SystemdService.find("targetcli.service")
- @service_status = ::UI::ServiceStatus.new(@service, reload_flag: true,
reload_flag_label: :restart)
+ @service = Yast2::SystemService.find("targetcli")
+ @service_widget = ::CWM::ServiceWidget.new(@service)
@firewall_widget = ::CWM::WrapperWidget.new(
- CWMFirewallInterfaces.CreateOpenFirewallWidget("services" =>
["iscsi-target"]),
- )
+ CWMFirewallInterfaces.CreateOpenFirewallWidget("services" =>
["iscsi-target"]),
+ )
+ end
+
+ def label
+ _('Service')
end
def contents
VBox(
- VStretch(),
- HBox(
- HStretch(),
- HSpacing(1),
- VBox(@service_status.widget,
- VSpacing(2),
- @firewall_widget,
- VSpacing(2)),
- HSpacing(1),
- HStretch()
+ VStretch(),
+ HBox(
+ HStretch(),
+ HSpacing(1),
+ VBox(
+ @service_widget,
+ VSpacing(2),
+ @firewall_widget,
+ VSpacing(2)
),
- VStretch()
+ HSpacing(1),
+ HStretch()
+ ),
+ VStretch()
)
end
- def handle(event)
- @service_status.handle_input(event["ID"])
- if @service_status.enabled_flag?
- @service.enable
- else
- @service.disable
- end
- nil
+ def store
+ @service_widget.store
end
- def opt
- [:notify]
+ def write
+ @service.save
end
- def label
- _('Service')
+ def opt
+ [:notify]
end
def help
- help_msg = _("<h1>iSCSI Target</h1>")
+ help_msg = _("<h1>iSCSI Target</h1>")
help_msg += _("<h2>Service Start</h2>")
help_msg += _("To start the service every time your computer is booted, \
- set <b>When Booting</b>. Otherwise set <b>Manually</b>.\n")
+ set to <b>Start on boot</b>. Otherwise choose <b>Do not
start</b>.\n")
help_msg += _("<h2>Firewall Settings</h2>")
help_msg += _("To open the firewall to allow access to the service from
remote computers, \
set <b>Open Port in Firewall</b>.\n")
