extern "C"
{
-#include <satsolver/repo.h>
+#include <solv/repo.h>
}
#include "zypp/ZYppFactory.h"
<HR>
\section V_6_10_0 6.10.0 - Removed zypp::UpgradeStatistics
-Since \c Code-11 the distribution upgrade is computed by the satsolver and no longer by
+Since \c Code-11 the distribution upgrade is computed by libsolv and no longer by
libzypp itself. For some reason zypp::UpgradeStatistics were still present in the interfaces,
but actually no longer used. Neither as input nor as result struct. Now they are removed.
<HR>
\verbatim
- added tests/data/openSUSE-11.1 containing raw susetags metadata.
Keeping .solv files in svn is somewhat inconvenient, as you must rebuild them
- if something in satsolver changes.
+ if something in libsolv changes.
\endverbatim
\verbatim
--- /dev/null
+/** \namespace zypp::sat \ref LIBSOLV
+*/
+/** \defgroup LIBSOLV Libsolv interface
+
+Interface to sat-pool and sat-solver.
+
+*/
+++ /dev/null
-/** \namespace zypp::sat \ref SATSOLVER
-*/
-/** \defgroup SATSOLVER Satsolver interface
-
-Interface to sat-pool and sat-solver.
-
-*/
* from the metadata are preserved into
* the final object
*
- * so the test covers both satsolver-tools
+ * so the test covers both libsolv-tools
* right insertion and parsing
* and libzypp ResObject and friends data
* extraction from solv files
if ( ! _begin )
return 0;
- // jump over satsolvers internal ids.
+ // jump over libsolvs internal ids.
Capabilities::size_type ret = 0;
for ( const sat::detail::IdType * end = _begin; *end; ++end )
{
//
/** Container of \ref Capability (currently read only).
*
- * \note satsolver dependency lists may include internal ids
+ * \note libsolv dependency lists may include internal ids
* which must be skipped on iteration or size calculation
* (\see \ref detail::isDepMarkerId).
*/
}
void increment()
- { // jump over satsolvers internal ids.
+ { // jump over libsolvs internal ids.
if ( sat::detail::isDepMarkerId( *(++base_reference()) ) )
{
_tagged = true;
if ( split.kind() == ResKind::srcpackage )
{
// map 'kind srcpackage' to 'arch src', the pseudo architecture
- // satsolver uses.
+ // libsolv uses.
nid = ::rel2id( pool_r, nid, IdString(ARCH_SRC).id(), REL_ARCH, /*create*/true );
}
_kind = EXPRESSION;
return;
}
- // map back satsolvers pseudo arch 'src' to kind srcpackage
+ // map back libsolvs pseudo arch 'src' to kind srcpackage
if ( _archIfSimple == ARCH_SRC )
{
_lhs = IdString( (ResKind::srcpackage.asString() + ":" + IdString(_lhs).c_str()).c_str() ).id();
EXPRESSION = 0x04
};
- /** Enum values corresponding with libsatsolver defines.
+ /** Enum values corresponding with libsolv defines.
* \note MPL check in PoolImpl.cc
*/
enum CapRel
sat::Pool satpool( sat::Pool::instance() );
- // init satsolver result vector with mountpoints
+ // init libsolv result vector with mountpoints
static const ::DUChanges _initdu = { 0, 0, 0 };
std::vector< ::DUChanges> duchanges( result.size(), _initdu );
{
*/
extern "C"
{
-#include <satsolver/evr.h>
+#include <solv/evr.h>
}
#include "zypp/base/String.h"
if ( ! ret.empty() )
ret += ':';
- if ( slv_r.isKind<SrcPackage>() ) // satsolver uses no namespace in SrcPackage ident!
+ if ( slv_r.isKind<SrcPackage>() ) // libsolv uses no namespace in SrcPackage ident!
{
ret += ResKind::srcpackage.c_str();
ret += ':';
// low level API
/**
- * Free function to get the satsolver repo search
+ * Free function to get libsolv repo search
* flags.
*
* \see \ref Match
Match flags() const;
/**
- * Free function to set the satsolver repo search
+ * Free function to set libsolv repo search
* flags.
*
* \see \ref Match
/** Enumarators provided \b only for use \ref inSwitch statement.
* \see inSwitch
- * \note Enumarator values also correspond to the values libsatsolver
+ * \note Enumarator values also correspond to the values libsolv
* uses to encode these relations.
*/
enum for_use_in_switch {
for_use_in_switch inSwitch() const
{ return _op; }
- /** Enumarator values suitable for libsatsolver. */
+ /** Enumarator values suitable for libsolv. */
unsigned bits() const
{ return _op; }
{
Repository repo = sat::Pool::instance().addRepoSolv( solvfile, info );
// test toolversion in order to rebuild solv file in case
- // it was written by an old satsolver-tool parser.
+ // it was written by an old libsolv-tool parser.
//
// Known version strings used:
// - <no string>
::_Repo * get() const;
/** Expert backdoor. */
IdType id() const { return _id; }
- /** satsolver internal priorities.
+ /** libsolv internal priorities.
* Unlike the \ref RepoInfo priority which tries to be YUM conform
* (H[1-99]L), this one is the solvers internal priority representation.
* It is type \c int and as one might expect it, the higher the value
explicit ResKind( const char * cstr_r ) : _str( str::toLower(cstr_r) ) {}
public:
- /** Return the satsolver identifier for name.
- * Libsatsolver combines the objects kind and name in a single
+ /** Return libsolv identifier for name.
+ * Libsolv combines the objects kind and name in a single
* identifier \c "pattern:kde_multimedia", \b except for packages
* and source packes. They are not prefixed by any kind string.
*/
{
#include <sys/utsname.h>
#include <unistd.h>
-#include <satsolver/satversion.h>
+#include <solv/satversion.h>
}
#include <iostream>
#include <fstream>
{
str << "libzypp: " << VERSION << " built " << __DATE__ << " " << __TIME__ << endl;
- str << "satsolver: " << sat_version;
- if ( ::strcmp( sat_version, SATSOLVER_VERSION_STRING ) )
- str << " (built against " << SATSOLVER_VERSION_STRING << ")";
+ str << "libsolv: " << sat_version;
+ if ( ::strcmp( sat_version, LIBSOLV_VERSION_STRING ) )
+ str << " (built against " << LIBSOLV_VERSION_STRING << ")";
str << endl;
str << "zypp.conf: '" << _pimpl->_parsedZyppConf << "'" << endl;
\---------------------------------------------------------------------*/
extern "C"
{
-#include <satsolver/knownid.h>
+#include <solv/knownid.h>
}
#include <iostream>
#include <iostream>
extern "C"
{
-#include <satsolver/knownid.h>
+#include <solv/knownid.h>
}
#include "zypp/base/LogTools.h"
*/
extern "C"
{
-#include <satsolver/repo.h>
+#include <solv/repo.h>
}
#include <iostream>
sep = 0; // suppress 'NOTHING|'
break;
case Match::OTHER:
- str << mode<<"("<<obj.modeval()<<")"; // check whether satsolver has introduced new modes!
+ str << mode<<"("<<obj.modeval()<<")"; // check whether libsolv has introduced new modes!
break;
default:
str << mode;
if ( val )
{
if ( sep ) str << sep;
- str << zypp::str::hexstring( val ); // check whether satsolver has introduced new flags.
+ str << zypp::str::hexstring( val ); // check whether libsolv has introduced new flags.
}
}
return str;
*
* These are usable iff \ref solvAttrSubEntry is \c true.
*
- * \note Unfortunately the underlying satsolver dataiterator as returned
+ * \note Unfortunately the underlying libsolv dataiterator as returned
* by \ref subBegin and \ref subFind loses some context when being created.
* Thus it's not possible to invoke \ref subBegin and \ref subFind on an
* iterator that was previously returned by one of those methods. The result
*/
extern "C"
{
-#include "satsolver/queue.h"
+#include "solv/queue.h"
}
#include <iostream>
#include "zypp/base/LogTools.h"
namespace sat
{ /////////////////////////////////////////////////////////////////
- /** Satsolver Id queue wrapper.
+ /** Libsolv Id queue wrapper.
*/
class Queue : private base::NonCopyable
{
*/
extern "C"
{
-#include <satsolver/knownid.h>
+#include <solv/knownid.h>
}
#include <iostream>
const SolvAttr SolvAttr::noAttr;
#warning STILL ATTRIBUTES HERE WHICH ARE NOT PROVIDED BY SOLV FILES
-// At least the ones that do nat have a satsolver/knownid.
+// At least the ones that do nat have a solv/knownid.
const SolvAttr SolvAttr::name ( SOLVABLE_NAME );
const SolvAttr SolvAttr::edition ( SOLVABLE_EVR );
static const sat::SolvAttr susetagsDatadir( "susetags:datadir" );
Pathname ret;
// First look for repo attribute "susetags:datadir". If not found,
- // look into the solvables as Code11 satsolver placed it there.
+ // look into the solvables as Code11 libsolv placed it there.
sat::LookupRepoAttr datadir( susetagsDatadir, repor_r );
if ( ! datadir.empty() )
ret = datadir.begin().asString();
//
/** A \ref Solvable object within the sat \ref Pool.
*
- * \note Unfortunately libsatsolver combines the objects kind and
+ * \note Unfortunately libsolv combines the objects kind and
* name in a single identifier \c "pattern:kde_multimedia",
* \b except for packages and source packes. They are not prefixed
* by any kind string. Instead the architecture is abused to store
*/
extern "C"
{
-#include <satsolver/transaction.h>
-#include <satsolver/bitmap.h>
+#include <solv/transaction.h>
+#include <solv/bitmap.h>
}
#include <iostream>
#include "zypp/base/LogTools.h"
class Transaction_const_iterator;
}
- /** Satsolver transaction wrapper.
+ /** Libsolv transaction wrapper.
* \note Note that Transaction is derived from \ref sat::SolvIterMixin which
* makes PoolItem and Selectable iterators automatically available.
* \note Changing the \ref ResPool content (loading/unloading repositories)
//
/** WhatProvides implementation date.
* Stores the offset into a O terminated Id array. Per default
- * the satsolvers whatprovidesdata, otherwise private data.
+ * libsolvs whatprovidesdata, otherwise private data.
*
- * As the satsolvers whatprovidesdata might be realocated
+ * As libsolvs whatprovidesdata might be realocated
* while iterating a result, the iterator takes an
* <tt>const IdType *const*</tt>. Thats why we explicitly
* provide _private and pass its adress to the iterator,
if ( _pimpl->_private )
return const_iterator( _pimpl->_private );
- // for satsolvers index use one more indirection, as it might get relocated.
+ // for libsolvs index use one more indirection, as it might get relocated.
return const_iterator( &myPool().getPool()->whatprovidesdata, _pimpl->_offset );
}
extern "C"
{
-// Workaround satsolver project not providing a common include
+// Workaround libsolv project not providing a common include
// directory. (the -devel package does, but the git repo doesn't).
-// #include <satsolver/repo_helix.h>
+// #include <solv/repo_helix.h>
void repo_add_helix( ::Repo *repo, FILE *fp, int flags );
}
static void logSat( struct _Pool *, void *data, int type, const char *logString )
{
if ( type & (SAT_FATAL|SAT_ERROR) ) {
- _ERR("satsolver") << logString;
+ _ERR("libsolv") << logString;
} else if ( type & SAT_DEBUG_STATS ) {
- _DBG("satsolver") << logString;
+ _DBG("libsolv") << logString;
} else {
- _MIL("satsolver") << logString;
+ _MIL("libsolv") << logString;
}
}
for_( it, sysarchs.begin(), sysarchs.end() )
sysids.insert( it->id() );
- // unfortunately satsolver treats src/nosrc as architecture:
+ // unfortunately libsolv treats src/nosrc as architecture:
sysids.insert( ARCH_SRC );
sysids.insert( ARCH_NOSRC );
}
{
bool dirty = false;
- // satsolver priority is based on '<', while yum's repoinfo
+ // libsolv priority is based on '<', while yum's repoinfo
// uses 1(highest)->99(lowest). Thus we use -info_r.priority.
if ( repo->priority != int(-info_r.priority()) )
{
#define ZYPP_SAT_DETAIL_POOLIMPL_H
extern "C"
{
-#include <satsolver/pool.h>
-#include <satsolver/repo.h>
-#include <satsolver/solvable.h>
-#include <satsolver/poolarch.h>
-#include <satsolver/repo_solv.h>
+#include <solv/pool.h>
+#include <solv/repo.h>
+#include <solv/solvable.h>
+#include <solv/poolarch.h>
+#include <solv/repo_solv.h>
}
#include <iosfwd>
void Resolver::solverInit()
{
- // Solving with the satsolver
+ // Solving with libsolv
static bool poolDumped = false;
MIL << "-------------- Calling SAT Solver -------------------" << endl;
if ( getenv("ZYPP_FULLLOG") ) {
*/
extern "C"
{
-#include <satsolver/repo_solv.h>
-#include <satsolver/poolarch.h>
-#include <satsolver/evr.h>
-#include <satsolver/poolvendor.h>
-#include <satsolver/policy.h>
-#include <satsolver/bitmap.h>
-#include <satsolver/queue.h>
+#include <solv/repo_solv.h>
+#include <solv/poolarch.h>
+#include <solv/evr.h>
+#include <solv/poolvendor.h>
+#include <solv/policy.h>
+#include <solv/bitmap.h>
+#include <solv/queue.h>
}
#include "zypp/solver/detail/Helper.h"
extern "C"
{
-#include <satsolver/solver.h>
-#include <satsolver/pool.h>
+#include <solv/solver.h>
+#include <solv/pool.h>
}
#include <iosfwd>
*/
extern "C"
{
-#include <satsolver/solver.h>
+#include <solv/solver.h>
}
#include "zypp/base/Logger.h"
*/
extern "C"
{
-#include <satsolver/solver.h>
+#include <solv/solver.h>
}
#include "zypp/base/Logger.h"
*/
extern "C"
{
-#include <satsolver/solver.h>
+#include <solv/solver.h>
}
#include "zypp/base/Logger.h"
*/
extern "C"
{
-#include <satsolver/solver.h>
+#include <solv/solver.h>
}
#include "zypp/base/Logger.h"
*/
extern "C"
{
-#include <satsolver/solver.h>
+#include <solv/solver.h>
}
#include "zypp/base/Logger.h"
*/
extern "C"
{
-#include <satsolver/solver.h>
+#include <solv/solver.h>
}
#include "zypp/base/Logger.h"
projects / platform / upstream / libzypp.git / commitdiff