Imported Upstream version 17.23.1

diff --git a/VERSION.cmake b/VERSION.cmake
index 9cefbe0..f04cc4f 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "17")
 SET(LIBZYPP_COMPATMINOR "22")
 SET(LIBZYPP_MINOR "23")
-SET(LIBZYPP_PATCH "0")
+SET(LIBZYPP_PATCH "1")
 #
-# LAST RELEASED: 17.23.0 (22)
+# LAST RELEASED: 17.23.1 (22)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 7cf0bee..684deee 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Mon Mar  2 19:53:51 CET 2020 - ma@suse.de
+
+- Fix package status computation regarding unneeded, orphaned, recommended
+  and suggested packages (broken in 17.23.0) (bsc#1165476)
+- version 17.23.1 (22)
+
+-------------------------------------------------------------------
 Fri Feb 21 16:06:57 CET 2020 - ma@suse.de
 
 - Log patch status changes to history (jsc#SLE-5116)

diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc
index ad30275..664b967 100644 (file)
--- a/zypp/solver/detail/SATResolver.cc
+++ b/zypp/solver/detail/SATResolver.cc
@@ -113,9 +113,9 @@ namespace zypp
            sat::Queue suggestions;
            ::solver_get_recommendations( &satSolver_r, recommendations, suggestions, 0 );
            for ( sat::Queue::size_type i = 0; i < recommendations.size(); ++i )
-             PoolItem(sat::Solvable(i)).status().setRecommended( true );
+             PoolItem(sat::Solvable(recommendations[i])).status().setRecommended( true );
            for ( sat::Queue::size_type i = 0; i < suggestions.size(); ++i )
-             PoolItem(sat::Solvable(i)).status().setSuggested( true );
+             PoolItem(sat::Solvable(suggestions[i])).status().setSuggested( true );
          }
          {
            orphanedItems_r.clear();    // cached on the fly
@@ -123,7 +123,7 @@ namespace zypp
            ::solver_get_orphaned( &satSolver_r, orphaned );
            for ( sat::Queue::size_type i = 0; i < orphaned.size(); ++i )
            {
-             PoolItem pi { sat::Solvable(i) };
+             PoolItem pi { sat::Solvable(orphaned[i]) };
              pi.status().setOrphaned( true );
              orphanedItems_r.push_back( pi );
            }
@@ -132,7 +132,7 @@ namespace zypp
            sat::Queue unneeded;
            ::solver_get_unneeded( &satSolver_r, unneeded, 1 );
            for ( sat::Queue::size_type i = 0; i < unneeded.size(); ++i )
-             PoolItem(sat::Solvable(i)).status().setUnneeded( true );
+             PoolItem(sat::Solvable(unneeded[i])).status().setUnneeded( true );
          }
        }