move installOnly to Solvable

diff --git a/zypp/ResObject.cc b/zypp/ResObject.cc
index 4803653..dfd8018 100644 (file)
--- a/zypp/ResObject.cc
+++ b/zypp/ResObject.cc
@@ -16,7 +16,6 @@
 #include "zypp/sat/Solvable.h"
 #include "zypp/Repository.h"
 #include "zypp/RepoInfo.h"
-#include "zypp/ZConfig.h"
 #include "zypp/IdString.h"
 
 using namespace zypp;
@@ -85,14 +84,6 @@ namespace zypp
   unsigned ResObject::mediaNr() const
   { return lookupNumAttribute( sat::SolvAttr::medianr ); }
 
-  bool ResObject::installOnly() const
-  {
-      std::set<IdString> parallel = ZConfig::instance().parallelInstallable();
-      if (parallel.find(ident()) != parallel.end())
-             return true;
-      return false;
-  }
-
   Date ResObject::buildtime() const
   { return Date( lookupNumAttribute( sat::SolvAttr::buildtime ) ); }
 

diff --git a/zypp/ResObject.h b/zypp/ResObject.h
index 644cd7e..7c0ba96 100644 (file)
--- a/zypp/ResObject.h
+++ b/zypp/ResObject.h
@@ -135,13 +135,6 @@ namespace zypp
     unsigned mediaNr() const;
 
     /**
-     * \TODO FIXME what is this?
-     * Flag in the metadata indicating this should be
-     * installed unsing '-i' (not -U).
-     */
-    bool installOnly() const;
-
-    /**
      * \short build time of the resolvable
      */
     Date buildtime() const;

diff --git a/zypp/Resolvable.h b/zypp/Resolvable.h
index 33b7eda..4e73bd9 100644 (file)
--- a/zypp/Resolvable.h
+++ b/zypp/Resolvable.h
@@ -63,6 +63,13 @@ namespace zypp
     using sat::Solvable::edition;
     using sat::Solvable::arch;
 
+      
+    /**
+     * Flag in the metadata indicating this should be
+     * installed unsing '-i' (not -U).
+     */
+    using sat::Solvable::installOnly;      
+
     /** \name Dependencies. */
     //@{
     /** Select by Dep. */

diff --git a/zypp/sat/Solvable.cc b/zypp/sat/Solvable.cc
index f67083a..e4bfbeb 100644 (file)
--- a/zypp/sat/Solvable.cc
+++ b/zypp/sat/Solvable.cc
@@ -22,6 +22,7 @@
 #include "zypp/sat/Pool.h"
 #include "zypp/Repository.h"
 #include "zypp/OnMediaLocation.h"
+#include "zypp/ZConfig.h"
 
 using std::endl;
 
@@ -318,6 +319,14 @@ namespace zypp
       //return ArchId( _solvable->arch );
     }
 
+    bool Solvable::installOnly() const
+    {
+       std::set<IdString> parallel = ZConfig::instance().parallelInstallable();
+       if (parallel.find(ident()) != parallel.end())
+             return true;
+       return false;
+    }
+
     IdString Solvable::vendor() const
     {
       NO_SOLVABLE_RETURN( IdString() );

diff --git a/zypp/sat/Solvable.h b/zypp/sat/Solvable.h
index 1257e4f..e47ac60 100644 (file)
--- a/zypp/sat/Solvable.h
+++ b/zypp/sat/Solvable.h
@@ -156,6 +156,8 @@ namespace zypp
 
         IdString     vendor()   const;
 
+       bool         installOnly() const;
+
       public:
 
         /** \name Access to the \ref Solvable dependencies.