Merge pull request #207 from yast/summary_in_proposal

Summary in proposal
yast · Nov 25, 2016 · b781a54 · b781a54
2 parents 104ab4a + db71271
commit b781a54
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov 24 13:04:32 UTC 2016 - jreidinger@suse.com
+
+- Always show summary mode when clicking on details in software
+  proposal (bsc#966466)
+- 3.2.8
+
 -------------------------------------------------------------------
 Tue Nov 15 11:58:58 UTC 2016 - jreidinger@suse.com
 

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

diff --git a/src/clients/inst_sw_select.rb b/src/clients/inst_sw_select.rb
@@ -33,13 +33,8 @@ def main
         Pkg.PkgSolve(false)
 
         while @ret == :again
-          # display the installation summary in case there is a solver problem (bnc#436721)
-          if Ops.greater_than(Packages.solve_errors, 0)
-            Builtins.y2milestone("Unresolved conflicts, using summary mode")
-            @ret = PackagesUI.RunPackageSelector({ "mode" => :summaryMode })
-          else
-            @ret = PackagesUI.RunPatternSelector
-          end
+          # always show summary mode in installation (bnc#436721, bsc#966466)
+          @ret = PackagesUI.RunPackageSelector({ "mode" => :summaryMode })
 
           Builtins.y2milestone("Package selector result: %1", @ret)