Author: mlandres
Date: Tue Feb 12 13:09:13 2008
New Revision: 8625
URL: http://svn.opensuse.org/viewcvs/zypp?rev=8625&view=rev
Log:
backup
Modified:
branches/tmp/ma/jump_sat/libzypp/devel/devel.ma/NewPool.cc
branches/tmp/ma/jump_sat/libzypp/devel/devel.ma/ma_test
Modified: branches/tmp/ma/jump_sat/libzypp/devel/devel.ma/NewPool.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/devel/devel.ma/NewPool.cc?rev=8625&r1=8624&r2=8625&view=diff
==============================================================================
--- branches/tmp/ma/jump_sat/libzypp/devel/devel.ma/NewPool.cc (original)
+++ branches/tmp/ma/jump_sat/libzypp/devel/devel.ma/NewPool.cc Tue Feb 12 13:09:13 2008
@@ -33,6 +33,7 @@
#include "zypp/sat/Pool.h"
#include "zypp/sat/Repo.h"
#include "zypp/sat/Solvable.h"
+#include "zypp/sat/detail/PoolMember.h"
#include "zypp/sat/detail/PoolImpl.h"
#include
@@ -46,7 +47,7 @@
///////////////////////////////////////////////////////////////////
-static const Pathname sysRoot( "/Local/ROOT" );
+static const Pathname sysRoot( getenv("SYSROOT") ? getenv("SYSROOT") : "/Local/ROOT" );
///////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
@@ -137,15 +138,15 @@
{
bool operator()( const PoolItem & obj_r )
{
- MIL << obj_r << endl;
- DBG << " -> " << obj_r->satSolvable() << endl;
+ //MIL << obj_r << endl;
+ //DBG << " -> " << obj_r->satSolvable() << endl;
return true;
}
bool operator()( const sat::Solvable & obj_r )
{
- dumpOn( MIL, obj_r ) << endl;
+ //dumpOn( MIL, obj_r ) << endl;
return true;
}
};
@@ -212,7 +213,7 @@
{
bool rres = false;
{
- zypp::base::LogControl::TmpLineWriter shutUp;
+ //zypp::base::LogControl::TmpLineWriter shutUp;
rres = getZYpp()->resolver()->resolvePool();
}
if ( ! rres )
@@ -413,6 +414,11 @@
#undef OUTS
}
+void foo( int i, const Capability & c )
+{
+ WAR << c << endl;
+}
+
/******************************************************************
**
** FUNCTION NAME : main
@@ -422,7 +428,6 @@
try {
//zypp::base::LogControl::instance().logfile( "log.restrict" );
INT << "===[START]==========================================" << endl;
- setenv( "ZYPP_CONF", (sysRoot/"zypp.conf").c_str(), 1 );
sat::Pool satpool( sat::Pool::instance() );
ResPool pool( ResPool::instance() );
@@ -473,27 +478,38 @@
{
Measure x( "INIT TARGET" );
{
-// zypp::base::LogControl::TmpLineWriter shutUp;
getZYpp()->initializeTarget( sysRoot );
getZYpp()->target()->load();
}
}
- MIL << satpool << endl;
+ satpool.addRepoSolv( "/Local/ROOT/cache/openSUSE-11.0.solv" );
USR << "pool: " << pool << endl;
- vdumpPoolStats( USR << "Pool:"<< endl,
- pool.begin(), pool.end() ) << endl;
+ {
+ Measure x( "Upgrade" );
+ UpgradeStatistics u;
+ getZYpp()->resolver()->doUpgrade( u );
+ }
+ if ( 0 ) {
+ PoolItem pi ( getPi<Package>("amarok") );
+ MIL << pi << endl;
+ if ( pi )
+ {
+ pi.status().setTransact( true, ResStatus::USER );
+ solve();
+ vdumpPoolStats( USR << "Transacting:"<< endl,
+ make_filter_beginresfilter::ByTransact(pool),
+ make_filter_endresfilter::ByTransact(pool) ) << endl;
+
+ }
+ }
+ //vdumpPoolStats( USR << "Pool:"<< endl, pool.begin(), pool.end() ) << endl;
//waitForInput();
- //std::for_each( pool.begin(), pool.end(), Xprint() );
-// for_( it, satpool.solvablesBegin(), satpool.solvablesEnd() )
-// {
-// MIL << *it << endl;
-// //MIL << dump(*it) << endl;
-// }
+ //std::for_each( pool.begin(), pool.end(), Xprint() );
///////////////////////////////////////////////////////////////////
INT << "===[END]============================================" << endl << endl;
Modified: branches/tmp/ma/jump_sat/libzypp/devel/devel.ma/ma_test
URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/devel/devel.ma/ma_test?rev=8625&r1=8624&r2=8625&view=diff
==============================================================================
--- branches/tmp/ma/jump_sat/libzypp/devel/devel.ma/ma_test (original)
+++ branches/tmp/ma/jump_sat/libzypp/devel/devel.ma/ma_test Tue Feb 12 13:09:13 2008
@@ -38,6 +38,9 @@
echo "====================================================="
export ZYPP_LOGFILE=-
export ZYPP_KEYRING_DEFAULT_ACCEPT_ALL=1
+export SYSROOT=/Local/ROOT
+export ZYPP_CONF=$SYSROOT/zypp.conf
+
#export ZYPP_TESTSUITE_FAKE_ARCH=x86_64
#$SUDO ./$PRG "$@" 2>&1 | tee log > $LPIPE
exec 2> >(tee log > $LPIPE)
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
