reenable zypp-query-pool

diff --git a/VERSION.cmake b/VERSION.cmake
index 335e33e..ea10091 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -47,4 +47,4 @@
 SET(LIBZYPP_MAJOR "4")
 SET(LIBZYPP_MINOR "11")
 SET(LIBZYPP_COMPATMINOR "11")
-SET(LIBZYPP_PATCH "0")
+SET(LIBZYPP_PATCH "1")

diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake
index 5162860..444a86e 100644 (file)
--- a/libzypp.spec.cmake
+++ b/libzypp.spec.cmake
@@ -144,7 +144,7 @@ rm -rf "$RPM_BUILD_ROOT"
 %dir               /etc/zypp
 %dir               /etc/zypp/repos.d
 %config(noreplace) /etc/zypp/zypp.conf
-#%{prefix}/lib/zypp
+%{prefix}/lib/zypp
 %{prefix}/share/zypp
 %{prefix}/share/applications/package-manager.desktop
 %{prefix}/share/icons/hicolor/scalable/apps/package-manager-icon.svg

diff --git a/package/libzypp.changes b/package/libzypp.changes
index e8ea3fa..aad5419 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -6,6 +6,12 @@ Mon Apr 14 12:53:09 CEST 2008 - ma@suse.de
 - revision 9605
 
 -------------------------------------------------------------------
+Mon Apr 14 17:00:05 CEST 2008 - dmacvicar@suse.de
+
+- reenable zypp-query-pool
+- 4.11.1
+
+-------------------------------------------------------------------
 Sun Apr 13 02:17:25 CEST 2008 - jkupec@suse.cz
 
 - RawMetadataRefreshPolicy: CheckIfNeededIgnoreDelay added

diff --git a/tools/registration/zypp-query-pool.cc b/tools/registration/zypp-query-pool.cc
index 90cfafe..291a9e5 100644 (file)
--- a/tools/registration/zypp-query-pool.cc
+++ b/tools/registration/zypp-query-pool.cc
@@ -35,7 +35,12 @@ public:
     if (_repository.empty()
         || _repository == item->repository().info().alias())
     {
-      cout << (item.status().isInstalled() ? "i" : " ");
+
+       if ( isKind<Package>(item.resolvable()) )
+           cout << (item.status().isInstalled() ? "i" : " ");
+       else
+           cout << (item.status().isSatisfied() ? "i" : " ");
+
       cout << "|" << item->kind();
       cout << "|" << item->name();
       cout << "|" << item->edition().version();
@@ -118,8 +123,11 @@ query_pool( ZYpp::Ptr Z, string filter, const string & repository)
  
   MIL << "Loaded target." << endl;
 
-
   MIL << "Pool has " << Z->pool().size() << " entries" << endl;
+
+  // solve to get the status satisfied available
+  getZYpp()->resolver()->resolvePool();
+
   if ( filter == FILTER_ALL)
   {
     PrintItem printitem( system ? "" : repository );