Fix abort button in offline add-on installation (bnc#879397)

yast · Jun 2, 2014 · bdb06e1 · bdb06e1
1 parent 57dd97e
commit bdb06e1
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/include/add-on/add-on-workflow.rb b/src/include/add-on/add-on-workflow.rb
@@ -1190,6 +1190,8 @@ def RunAddOnMainDialog(enable_back, enable_next, enable_abort, back_button, next
                   AddOnProduct.src_id
               end
             end
+            # properly return abort in installation
+            ret = :abort if ret == :first_time
           # extra handling for the global enable checkbox
           elsif ret == :first_time
             ret = :back if ret2 == :back
@@ -1210,7 +1212,7 @@ def RunAddOnMainDialog(enable_back, enable_next, enable_abort, back_button, next
           # because of CD/DVD + url cd://
           Pkg.SourceReleaseAll
         end
-      end until ret == :next || ret == :back
+      end until [:next, :back, :abort].include?(ret)
 
       Builtins.y2milestone(
         "Ret: %1, Some Add-on Added/Removed: %2",