Mailinglist Archive: zypp-commit (268 mails)

< Previous Next >
[zypp-commit] r7975 - in /trunk/libzypp/zypp/sat/detail: PoolImpl.cc PoolImpl.h
  • From: mlandres@xxxxxxxxxxxxxxxx
  • Date: Thu, 29 Nov 2007 12:09:33 -0000
  • Message-id: <20071129120933.4FA5D28245@xxxxxxxxxxxxxxxx>
Author: mlandres
Date: Thu Nov 29 13:09:32 2007
New Revision: 7975

URL: http://svn.opensuse.org/viewcvs/zypp?rev=7975&view=rev
Log:
set default pool architecture to ZConfig value

Modified:
trunk/libzypp/zypp/sat/detail/PoolImpl.cc
trunk/libzypp/zypp/sat/detail/PoolImpl.h

Modified: trunk/libzypp/zypp/sat/detail/PoolImpl.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/detail/PoolImpl.cc?rev=7975&r1=7974&r2=7975&view=diff
==============================================================================
--- trunk/libzypp/zypp/sat/detail/PoolImpl.cc (original)
+++ trunk/libzypp/zypp/sat/detail/PoolImpl.cc Thu Nov 29 13:09:32 2007
@@ -9,18 +9,14 @@
/** \file zypp/sat/detail/PoolImpl.cc
*
*/
-extern "C"
-{
-#include <satsolver/solvable.h>
-#include <satsolver/repo.h>
-#include <satsolver/pool.h>
-}
-
#include <iostream>
+
#include "zypp/base/Logger.h"
#include "zypp/base/Gettext.h"
#include "zypp/base/Exception.h"

+#include "zypp/ZConfig.h"
+
#include "zypp/sat/detail/PoolImpl.h"

using std::endl;
@@ -37,10 +33,10 @@

void logSat( struct _Pool *, void *data, int type, const char *logString
)
{
- if ((type & (SAT_FATAL|SAT_ERROR)) == 0) {
- _MIL("satsolver") << logString;
- } else {
+ if ((type & (SAT_FATAL|SAT_ERROR))) {
_ERR("satsolver") << logString;
+ } else {
+ _DBG("satsolver") << logString;
}
}

@@ -69,8 +65,11 @@
}
// initialialize logging
bool verbose = ( getenv("ZYPP_FULLLOG") ||
getenv("ZYPP_LIBSAT_FULLLOG") );
- ::pool_setdebuglevel (_pool, verbose ? 5 : 2);
- ::pool_setdebugcallback(_pool, logSat, NULL );
+ ::pool_setdebuglevel( _pool, verbose ? 5 : 2 );
+ ::pool_setdebugcallback( _pool, logSat, NULL );
+
+ // set pool architecture
+ ::pool_setarch( _pool,
ZConfig::instance().systemArchitecture().asString().c_str() );
}

///////////////////////////////////////////////////////////////////

Modified: trunk/libzypp/zypp/sat/detail/PoolImpl.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/detail/PoolImpl.h?rev=7975&r1=7974&r2=7975&view=diff
==============================================================================
--- trunk/libzypp/zypp/sat/detail/PoolImpl.h (original)
+++ trunk/libzypp/zypp/sat/detail/PoolImpl.h Thu Nov 29 13:09:32 2007
@@ -16,6 +16,7 @@
#include <satsolver/pool.h>
#include <satsolver/repo.h>
#include <satsolver/solvable.h>
+#include <satsolver/poolarch.h>
#include <satsolver/repo_solv.h>
}
#include <iosfwd>
@@ -126,11 +127,11 @@
return noSolvableId;
}

- private:
- /** sat-pool. */
- ::_Pool * _pool;
- /** Serial number. */
- SerialNumber _serial;
+ private:
+ /** sat-pool. */
+ ::_Pool * _pool;
+ /** Serial number. */
+ SerialNumber _serial;
};
///////////////////////////////////////////////////////////////////


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

< Previous Next >
This Thread
  • No further messages