Hello community,
here is the log from the commit of package yast2-services-manager for
openSUSE:Factory checked in at 2014-03-01 14:38:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-services-manager (Old)
and /work/SRC/openSUSE:Factory/.yast2-services-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-services-manager"
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-services-manager/yast2-services-manager.changes
2014-02-21 13:48:12.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-services-manager.new/yast2-services-manager.changes
2014-03-01 14:38:20.000000000 +0100
@@ -1,0 +2,18 @@
+Fri Feb 28 17:06:39 UTC 2014 - [email protected]
+
+- Reload target detection after install config change (bnc#866292)
+- 3.1.8
+
+-------------------------------------------------------------------
+Wed Feb 26 13:24:10 UTC 2014 - [email protected]
+
+- Select the current default target in the proposal (bnc#865357)
+- 3.1.7
+
+-------------------------------------------------------------------
+Tue Feb 25 15:43:51 UTC 2014 - [email protected]
+
+- Fix crashing installer if canceled target proposal (bnc#865354)
+- 3.1.6
+
+-------------------------------------------------------------------
Old:
----
yast2-services-manager-3.1.5.tar.bz2
New:
----
yast2-services-manager-3.1.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-services-manager.spec ++++++
--- /var/tmp/diff_new_pack.E2qY8K/_old 2014-03-01 14:38:21.000000000 +0100
+++ /var/tmp/diff_new_pack.E2qY8K/_new 2014-03-01 14:38:21.000000000 +0100
@@ -24,7 +24,7 @@
######################################################################
Name: yast2-services-manager
-Version: 3.1.5
+Version: 3.1.8
Release: 0
BuildArch: noarch
++++++ yast2-services-manager-3.1.5.tar.bz2 ->
yast2-services-manager-3.1.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.1.5/package/yast2-services-manager.changes
new/yast2-services-manager-3.1.8/package/yast2-services-manager.changes
--- old/yast2-services-manager-3.1.5/package/yast2-services-manager.changes
2014-02-20 14:02:56.000000000 +0100
+++ new/yast2-services-manager-3.1.8/package/yast2-services-manager.changes
2014-02-28 18:42:07.000000000 +0100
@@ -1,4 +1,22 @@
-------------------------------------------------------------------
+Fri Feb 28 17:06:39 UTC 2014 - [email protected]
+
+- Reload target detection after install config change (bnc#866292)
+- 3.1.8
+
+-------------------------------------------------------------------
+Wed Feb 26 13:24:10 UTC 2014 - [email protected]
+
+- Select the current default target in the proposal (bnc#865357)
+- 3.1.7
+
+-------------------------------------------------------------------
+Tue Feb 25 15:43:51 UTC 2014 - [email protected]
+
+- Fix crashing installer if canceled target proposal (bnc#865354)
+- 3.1.6
+
+-------------------------------------------------------------------
Thu Feb 20 12:54:55 UTC 2014 - [email protected]
- Fix wrong target selection (bnc#864073)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.1.5/package/yast2-services-manager.spec
new/yast2-services-manager-3.1.8/package/yast2-services-manager.spec
--- old/yast2-services-manager-3.1.5/package/yast2-services-manager.spec
2014-02-20 14:02:56.000000000 +0100
+++ new/yast2-services-manager-3.1.8/package/yast2-services-manager.spec
2014-02-28 18:42:07.000000000 +0100
@@ -24,7 +24,7 @@
######################################################################
Name: yast2-services-manager
-Version: 3.1.5
+Version: 3.1.8
Release: 0
BuildArch: noarch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-services-manager-3.1.5/src/clients/default_target_proposal.rb
new/yast2-services-manager-3.1.8/src/clients/default_target_proposal.rb
--- old/yast2-services-manager-3.1.5/src/clients/default_target_proposal.rb
2014-02-20 14:02:56.000000000 +0100
+++ new/yast2-services-manager-3.1.8/src/clients/default_target_proposal.rb
2014-02-28 18:42:07.000000000 +0100
@@ -26,7 +26,6 @@
if Linuxrc.vnc && selected_target != Target::GRAPHICAL
warnings << _('VNC needs graphical system to be available')
end
- warnings << _("\nDo you want to proceed?") unless warnings.empty?
end
end
@@ -50,8 +49,8 @@
def description
{
'id' => 'services-manager',
- 'menu_title' => _("&Default systemd target and services"),
- 'rich_text_title' => _("Default systemd target and services")
+ 'menu_title' => _("&Default systemd target"),
+ 'rich_text_title' => _("Default systemd target")
}
end
@@ -72,24 +71,24 @@
end
def show
- create_dialog
- {'workflow_sequence' => show_dialog}
+ # create the proposal dialog and get the sequence symbol from block
+ sequence = create_dialog { handle_dialog }
+ {'workflow_sequence' => sequence}
end
private
- def show_dialog
+ def handle_dialog
case UI.UserInput
when :next, :ok
selected_target = UI.QueryWidget(Id(:selected_target),
:CurrentButton).to_s
Builtins.y2milestone "Target selected by user: #{selected_target}"
detect_warnings(selected_target)
if !warnings.empty?
- return show_dialog unless Popup.YesNo(warnings.join)
+ return handle_dialog unless Popup.ContinueCancel(warnings.join
"\n")
end
Builtins.y2milestone "Setting systemd default target to
'#{selected_target}'"
SystemdTarget.default_target = selected_target unless
selected_target.empty?
- Wizard.CloseDialog
:next
when :cancel
:cancel
@@ -99,7 +98,8 @@
def generate_target_buttons
Builtins.y2milestone "Available targets: #{available_targets}"
radio_buttons = available_targets.map do |target_name|
- Left(RadioButton(Id(target_name), target_name))
+ selected = target_name == SystemdTarget.default_target
+ Left(RadioButton(Id(target_name), target_name, selected))
end
VBox(*radio_buttons)
end
@@ -117,6 +117,9 @@
)
Wizard.SetAbortButton(:cancel, Label.CancelButton)
Wizard.HideBackButton
+ yield
+ ensure
+ Wizard.CloseDialog
end
def help
@@ -163,7 +166,6 @@
def initialize
textdomain 'services-manager'
- self.default_target = ProductFeatures.GetFeature('globals',
'default_target')
change_default_target
detect_warnings(default_target)
end
@@ -179,9 +181,8 @@
private
def change_default_target
- return self.default_target = SystemdTarget.default_target unless
SystemdTarget.default_target.empty?
-
- detect_target unless Mode.autoinst
+ self.default_target = ProductFeatures.GetFeature('globals',
'default_target')
+ detect_target
SystemdTarget.default_target = self.default_target
end
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
