Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2015-04-07 09:28:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
and /work/SRC/openSUSE:Factory/.yast2-installation.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes
2015-03-30 19:09:52.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2015-04-07 09:28:45.000000000 +0200
@@ -1,0 +2,19 @@
+Thu Apr 2 09:27:55 UTC 2015 - [email protected]
+
+- avoid endless loop when confirm update in proposal runner
+ (FATE#315161)
+- 3.1.138
+
+-------------------------------------------------------------------
+Wed Apr 1 18:54:34 UTC 2015 - [email protected]
+
+- fix method missing error in proposal_runner (FATE#315161)
+- 3.1.137
+
+-------------------------------------------------------------------
+Wed Apr 1 11:39:32 UTC 2015 - [email protected]
+
+- fix dependencies in proposal_store (FATE#315161)
+- 3.1.136
+
+-------------------------------------------------------------------
@@ -4,0 +24 @@
+ (FATE#315161)
Old:
----
yast2-installation-3.1.135.tar.bz2
New:
----
yast2-installation-3.1.138.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.rZd8oZ/_old 2015-04-07 09:28:46.000000000 +0200
+++ /var/tmp/diff_new_pack.rZd8oZ/_new 2015-04-07 09:28:46.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.135
+Version: 3.1.138
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-installation-3.1.135.tar.bz2 -> yast2-installation-3.1.138.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.135/package/yast2-installation.changes
new/yast2-installation-3.1.138/package/yast2-installation.changes
--- old/yast2-installation-3.1.135/package/yast2-installation.changes
2015-03-27 15:14:16.000000000 +0100
+++ new/yast2-installation-3.1.138/package/yast2-installation.changes
2015-04-02 12:29:12.000000000 +0200
@@ -1,7 +1,27 @@
-------------------------------------------------------------------
+Thu Apr 2 09:27:55 UTC 2015 - [email protected]
+
+- avoid endless loop when confirm update in proposal runner
+ (FATE#315161)
+- 3.1.138
+
+-------------------------------------------------------------------
+Wed Apr 1 18:54:34 UTC 2015 - [email protected]
+
+- fix method missing error in proposal_runner (FATE#315161)
+- 3.1.137
+
+-------------------------------------------------------------------
+Wed Apr 1 11:39:32 UTC 2015 - [email protected]
+
+- fix dependencies in proposal_store (FATE#315161)
+- 3.1.136
+
+-------------------------------------------------------------------
Fri Mar 27 13:14:22 UTC 2015 - [email protected]
- allow proposal runner dialog to use different proposal store
+ (FATE#315161)
- 3.1.135
-------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.135/package/yast2-installation.spec
new/yast2-installation-3.1.138/package/yast2-installation.spec
--- old/yast2-installation-3.1.135/package/yast2-installation.spec
2015-03-27 15:14:16.000000000 +0100
+++ new/yast2-installation-3.1.138/package/yast2-installation.spec
2015-04-02 12:29:12.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.135
+Version: 3.1.138
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.135/src/lib/installation/proposal_runner.rb
new/yast2-installation-3.1.138/src/lib/installation/proposal_runner.rb
--- old/yast2-installation-3.1.135/src/lib/installation/proposal_runner.rb
2015-03-27 15:14:16.000000000 +0100
+++ new/yast2-installation-3.1.138/src/lib/installation/proposal_runner.rb
2015-04-02 12:29:12.000000000 +0200
@@ -52,6 +52,8 @@
Yast.import "Popup"
Yast.import "Language"
Yast.import "GetInstArgs"
+ Yast.import "ProductControl"
+ Yast.import "HTML"
# values used in defined functions
@@ -111,6 +113,58 @@
private
+ # Shows dialog to user to confirm update and return user response.
+ # Returns 'true' if the user confirms, 'false' otherwise.
+ #
+ def confirm_update
+ # Heading for confirmation popup before the update really starts
+ heading = Yast::HTML.Heading(_("Confirm Update"))
+
+ body =
+ # Text for confirmation popup before the update really starts 1/3
+ _("<p>Information required to perform an update is now complete.</p>")
+
+ # Text for confirmation popup before the update really starts 2/3
+ _(
+ "\n" \
+ "<p>If you continue now, data on your hard disk will be
overwritten\n" \
+ "according to the settings in the previous dialogs.</p>"
+ ) +
+ # Text for confirmation popup before the update really starts 3/3
+ _("<p>Go back and check the settings if you are unsure.</p>")
+
+ # Label for the button that confirms startint the installation
+ confirm_button_label = _("Start &Update")
+
+ size_x = 70
+ size_y = 18
+
+ Yast::UI.OpenDialog(
+ VBox(
+ VSpacing(0.4),
+ HSpacing(size_x), # force width
+ HBox(
+ HSpacing(0.7),
+ VSpacing(size_y), # force height
+ RichText(heading + body),
+ HSpacing(0.7)
+ ),
+ ButtonBox(
+ PushButton(
+ Id(:cancel),
+ Opt(:cancelButton, :key_F10, :default),
+ Yast::Label.BackButton
+ ),
+ PushButton(Id(:ok), Opt(:okButton, :key_F9), confirm_button_label)
+ )
+ )
+ )
+
+ button = Yast::UI.UserInput
+ Yast::UI.CloseDialog
+
+ button == :ok
+ end
+
def input_loop
loop do
richtext_normal_cursor(Id(:proposal))
@@ -239,10 +293,8 @@
input = Yast::WFM.CallFunction("inst_doit", [])
# bugzilla #219097, #221571, yast2-update on running system
elsif Yast::Stage.stage == "normal" && Yast::Mode.update
- if !confirmInstallation
- log.info "Update not confirmed, returning back..."
- input = nil
- end
+ input = confirm_update ? :next : nil
+ log.info "Update not confirmed, returning back..." unless input
end
input
