Mailinglist Archive: zypp-commit (223 mails)

< Previous Next >
[zypp-commit] r10599 - in /trunk/libzypp/zypp: ResObject.cc ResObject.h Resolvable.h sat/Solvable.cc sat/Solvable.h
  • From: schubi2@xxxxxxxxxxxxxxxx
  • Date: Thu, 17 Jul 2008 07:29:37 -0000
  • Message-id: <20080717072937.B0E922743B@xxxxxxxxxxxxxxxx>
Author: schubi2
Date: Thu Jul 17 09:29:36 2008
New Revision: 10599

URL: http://svn.opensuse.org/viewcvs/zypp?rev=10599&view=rev
Log:
move installOnly to Solvable

Modified:
trunk/libzypp/zypp/ResObject.cc
trunk/libzypp/zypp/ResObject.h
trunk/libzypp/zypp/Resolvable.h
trunk/libzypp/zypp/sat/Solvable.cc
trunk/libzypp/zypp/sat/Solvable.h

Modified: trunk/libzypp/zypp/ResObject.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResObject.cc?rev=10599&r1=10598&r2=10599&view=diff
==============================================================================
--- trunk/libzypp/zypp/ResObject.cc (original)
+++ trunk/libzypp/zypp/ResObject.cc Thu Jul 17 09:29:36 2008
@@ -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 @@
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 ) ); }


Modified: trunk/libzypp/zypp/ResObject.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResObject.h?rev=10599&r1=10598&r2=10599&view=diff
==============================================================================
--- trunk/libzypp/zypp/ResObject.h (original)
+++ trunk/libzypp/zypp/ResObject.h Thu Jul 17 09:29:36 2008
@@ -135,13 +135,6 @@
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;

Modified: trunk/libzypp/zypp/Resolvable.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Resolvable.h?rev=10599&r1=10598&r2=10599&view=diff
==============================================================================
--- trunk/libzypp/zypp/Resolvable.h (original)
+++ trunk/libzypp/zypp/Resolvable.h Thu Jul 17 09:29:36 2008
@@ -63,6 +63,13 @@
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. */

Modified: trunk/libzypp/zypp/sat/Solvable.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Solvable.cc?rev=10599&r1=10598&r2=10599&view=diff
==============================================================================
--- trunk/libzypp/zypp/sat/Solvable.cc (original)
+++ trunk/libzypp/zypp/sat/Solvable.cc Thu Jul 17 09:29:36 2008
@@ -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 @@
//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() );

Modified: trunk/libzypp/zypp/sat/Solvable.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Solvable.h?rev=10599&r1=10598&r2=10599&view=diff
==============================================================================
--- trunk/libzypp/zypp/sat/Solvable.h (original)
+++ trunk/libzypp/zypp/sat/Solvable.h Thu Jul 17 09:29:36 2008
@@ -156,6 +156,8 @@

IdString vendor() const;

+ bool installOnly() const;
+
public:

/** \name Access to the \ref Solvable dependencies.

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages