handle closing the initial installation screen (bsc#979499)

... by the window manager close button in SSH installation - 3.1.186
yast · May 16, 2016 · 6e58a6d · 6e58a6d
1 parent f1fafc1
commit 6e58a6d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,4 +37,5 @@ home*:*
 *.sh
 .yardoc
 /coverage
-/nbproject/private/
+/test-driver
+test/*.trs
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon May 16 08:29:25 UTC 2016 - lslezak@suse.cz
+
+- SSH installation: handle closing the initial installation screen
+  by the window manager close button (bsc#979499)
+- 3.1.186
+
 -------------------------------------------------------------------
 Mon May  9 15:14:22 CEST 2016 - schubi@suse.de
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.185
+Version:        3.1.186
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/lib/installation/clients/inst_complex_welcome.rb b/src/lib/installation/clients/inst_complex_welcome.rb
@@ -92,10 +92,10 @@ def event_loop
         case ret
         when :back
           return ret
-        when :abort
+        when :abort, :cancel
           next unless Popup.ConfirmAbort(:painless)
           Wizard.RestoreNextButton
-          return ret
+          return :abort
         when :keyboard
           read_ui_state
           Keyboard.Set(@keyboard)