commit 6ad8fe8cf804b5846dce2829c3274fcc282e43bd
Author: Michael Andres
Date: Wed Jan 21 16:33:55 2009 +0100
backup
---
devel/devel.ma/NewPool.cc | 41 ++++++++++++++++++-----------------------
devel/devel.ma/Tools.h | 2 +-
2 files changed, 19 insertions(+), 24 deletions(-)
diff --git a/devel/devel.ma/NewPool.cc b/devel/devel.ma/NewPool.cc
index dfaeb38..b72bea5 100644
--- a/devel/devel.ma/NewPool.cc
+++ b/devel/devel.ma/NewPool.cc
@@ -243,16 +243,24 @@ inline bool g( const NameKindProxy & nkp, Arch arch = Arch() )
///////////////////////////////////////////////////////////////////
+void testcase()
+{
+ getZYpp()->resolver()->createSolverTestcase( "./solverTestcase" );
+}
+
bool solve()
{
bool rres = false;
{
//zypp::base::LogControl::TmpLineWriter shutUp;
+ getZYpp()->resolver()->setIgnoreAlreadyRecommended( true );
rres = getZYpp()->resolver()->resolvePool();
}
if ( ! rres )
{
ERR << "resolve " << rres << endl;
+ getZYpp()->resolver()->problems();
+ testcase();
return false;
}
MIL << "resolve " << rres << endl;
@@ -268,11 +276,6 @@ bool install()
return true;
}
-void testcase()
-{
- getZYpp()->resolver()->createSolverTestcase( "./solverTestcase" );
-}
-
///////////////////////////////////////////////////////////////////
struct DigestReceive : public callback::ReceiveReport<DigestReport>
@@ -449,7 +452,7 @@ try {
Measure x( "INIT TARGET" );
{
{
- //zypp::base::LogControl::TmpLineWriter shutUp;
+ zypp::base::LogControl::TmpLineWriter shutUp;
getZYpp()->initializeTarget( sysRoot );
}
getZYpp()->target()->load();
@@ -550,27 +553,21 @@ try {
///////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
- if ( 0 )
- {
- PoolItem pi ( getPi<Patch>("xorg-x11-Xvnc") );
- MIL << pi << endl;
- if ( pi )
- {
- Patch::constPtr p( pi->asKind<Patch>() );
- INT << p->contents() << endl;
- }
- }
-
- SEC << "baseproduct: " << getZYpp()->target()->baseProduct() << endl;
+ dumpRange( MIL, pool.byKindBegin<Product>(), pool.byKindEnd<Product>() ) << endl;
+ //getZYpp()->resolver()->addConflict( Capability("product:openSUSE.i586") );
+ //getZYpp()->resolver()->addConflict( Capability("openSUSE-release") );
+ getZYpp()->resolver()->addRequire( Capability("product:openSUSE.i586") );
+ //getZYpp()->resolver()->addRequire( Capability("openSUSE-release") );
-#if 0
- getZYpp()->resolver()->addRequire( Capability("amarok") );
+ vdumpPoolStats( USR << "Transacting:"<< endl,
+ make_filter_beginresfilter::ByTransact(pool),
+ make_filter_endresfilter::ByTransact(pool) ) << endl;
solve();
vdumpPoolStats( USR << "Transacting:"<< endl,
make_filter_beginresfilter::ByTransact(pool),
make_filter_endresfilter::ByTransact(pool) ) << endl;
-#endif
+
//////////////////////////////////////////////////////////////////
INT << "===[END]============================================" << endl << endl;
@@ -583,5 +580,3 @@ catch ( const Exception & exp )
}
catch (...)
{}
-
-
diff --git a/devel/devel.ma/Tools.h b/devel/devel.ma/Tools.h
index ba50a65..1d9d9d6 100644
--- a/devel/devel.ma/Tools.h
+++ b/devel/devel.ma/Tools.h
@@ -165,7 +165,7 @@ ui::Selectable::Ptr getSel( const std::string & name_r )
template<class _Res>
-PoolItem getPi( const std::string & alias_r, const std::string & name_r, const Edition & ed_r, const Arch & arch_r )
+PoolItem getPi( const std::string & alias_r, const std::string & name_r, const Edition & ed_r=Edition(), const Arch & arch_r=Arch_empty )
{
PoolItem ret;
ResPool pool( getZYpp()->pool() );
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org