make "establishPool()" return bool

diff --git a/zypp/Resolver.cc b/zypp/Resolver.cc
index 7e97d3a..81b0abf 100644 (file)
--- a/zypp/Resolver.cc
+++ b/zypp/Resolver.cc
@@ -58,8 +58,8 @@ namespace zypp
 
   bool Resolver::verifySystem ()
   { return _pimpl->verifySystem(); }
-  void Resolver::establishPool ()
-  { _pimpl->establishPool(); }
+  bool Resolver::establishPool ()
+  { return _pimpl->establishPool(); }
   bool Resolver::resolvePool ()
   { return _pimpl->resolvePool (); }
   void Resolver::undo()

diff --git a/zypp/Resolver.h b/zypp/Resolver.h
index e43e55e..72b83ae 100644 (file)
--- a/zypp/Resolver.h
+++ b/zypp/Resolver.h
@@ -59,8 +59,15 @@ namespace zypp
      * Must be called when dealing with non-package resolvables,
      * like Patches, Patterns, and Products
      *
+     * Must be called with a 'plain' pool, e.g. no additonal
+     * transacts set.
+     *
+     * return true if it was successful
+     * return false if not (this will only happen if other
+     *   transactions are in the pool which will lead to
+     *   no solution)
      **/
-    void establishPool (void);
+    bool establishPool (void);
 
     /**
      * Resolve package dependencies:

diff --git a/zypp/solver/detail/Resolver.cc b/zypp/solver/detail/Resolver.cc
index 4f51f54..673f466 100644 (file)
--- a/zypp/solver/detail/Resolver.cc
+++ b/zypp/solver/detail/Resolver.cc
@@ -416,7 +416,7 @@ Resolver::establishState (ResolverContext_Ptr context)
 }
 
 
-void
+bool
 Resolver::establishPool ()
 {
     establishState ();                                         // establish !
@@ -427,9 +427,10 @@ Resolver::establishPool ()
     }
     else {
        ERR << "establishState did not return a bestContext" << endl;
+       return false;
     }
 
-    return;
+    return true;
 }
 
 //---------------------------------------------------------------------------

diff --git a/zypp/solver/detail/Resolver.h b/zypp/solver/detail/Resolver.h
index aa66b5b..d4cacb6 100644 (file)
--- a/zypp/solver/detail/Resolver.h
+++ b/zypp/solver/detail/Resolver.h
@@ -173,7 +173,7 @@ class Resolver : public base::ReferenceCounted, private base::NonCopyable {
 
     bool verifySystem (void);
     void establishState (const ResolverContext_Ptr context = NULL);
-    void establishPool (void);
+    bool establishPool (void);
     bool resolveDependencies (const ResolverContext_Ptr context = NULL);
     bool resolvePool (void);