ref: refs/heads/SuSE-Code-11-Branch
commit 1a34dbb4ed1e1a42ba584486e02589eda3e63f13
Author: Michael Andres
Date: Tue Feb 3 17:31:14 2009 +0100
backup
---
devel/devel.ma/CMakeLists.txt | 2 +-
devel/devel.ma/CommitCb.cc | 46 ++++++++++++++++-------------------------
devel/devel.ma/Main.cc | 18 ----------------
devel/devel.ma/NewPool.cc | 18 +++------------
devel/devel.ma/Tools.h | 17 ++++++++++++++-
devel/devel.ma/ma_test | 2 +-
devel/devel.ma/main.cc | 44 +++++++++++++-------------------------
7 files changed, 55 insertions(+), 92 deletions(-)
diff --git a/devel/devel.ma/CMakeLists.txt b/devel/devel.ma/CMakeLists.txt
index 425f469..08d375d 100644
--- a/devel/devel.ma/CMakeLists.txt
+++ b/devel/devel.ma/CMakeLists.txt
@@ -24,7 +24,7 @@ ADD_CUSTOM_TARGET( ma_test
## ############################################################
-FOREACH( loop_var MaTest NewPool DumpSolv Iorder Xml Ex Main FakePool AOUT Parse Test Basic Sat TransList)
+FOREACH( loop_var MaTest NewPool CommitCb DumpSolv Iorder Xml Ex main Main FakePool AOUT Parse Test Basic Sat TransList)
ADD_EXECUTABLE( ${loop_var}
${loop_var}.cc
)
diff --git a/devel/devel.ma/CommitCb.cc b/devel/devel.ma/CommitCb.cc
index a0990ba..7ed90d4 100644
--- a/devel/devel.ma/CommitCb.cc
+++ b/devel/devel.ma/CommitCb.cc
@@ -37,28 +37,17 @@ struct IRR : public zypp::callback::ReceiveReportzypp::target::rpm::RemoveResolvableReport
@@ -85,17 +74,17 @@ struct RRR : public zypp::callback::ReceiveReportcommit( pol ) << endl;
diff --git a/devel/devel.ma/Main.cc b/devel/devel.ma/Main.cc
index 8201ed3..0aa3c3e 100644
--- a/devel/devel.ma/Main.cc
+++ b/devel/devel.ma/Main.cc
@@ -9,10 +9,6 @@
#include "zypp/TmpPath.h"
-#include "zypp/RepoManager.h"
-#include "zypp/RepoInfo.h"
-#include "zypp/repo/PackageProvider.h"
-
#include "zypp/ResPoolProxy.h"
using std::endl;
@@ -40,20 +36,6 @@ bool solve()
return true;
}
-ManagedFile providePkg( const PoolItem & pi )
-{
- Package::constPtr p = asKind<Package>( pi.resolvable() );
- if ( ! pi )
- return ManagedFile();
-
- repo::RepoMediaAccess access;
- std::list<Repository> repos;
- repo::DeltaCandidates deltas( repos );
- repo::PackageProvider pkgProvider( access, p, deltas );
-
- return pkgProvider.providePackage();
-}
-
/******************************************************************
**
** FUNCTION NAME : main
diff --git a/devel/devel.ma/NewPool.cc b/devel/devel.ma/NewPool.cc
index b72bea5..2cc6d32 100644
--- a/devel/devel.ma/NewPool.cc
+++ b/devel/devel.ma/NewPool.cc
@@ -54,7 +54,7 @@ using namespace zypp::ui;
///////////////////////////////////////////////////////////////////
-static const Pathname sysRoot( getenv("SYSROOT") ? getenv("SYSROOT") : "/Local/ROOT" );
+static const Pathname sysRoot( getenv("SYSROOT") ? getenv("SYSROOT") : "/Loacl/ROOT" );
///////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
@@ -553,20 +553,10 @@ try {
///////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
- dumpRange( MIL, pool.byKindBegin<Product>(), pool.byKindEnd<Product>() ) << endl;
- //getZYpp()->resolver()->addConflict( Capability("product:openSUSE.i586") );
- //getZYpp()->resolver()->addConflict( Capability("openSUSE-release") );
+ dumpRange( MIL, pool.byKindBegin<Package>(), pool.byKindEnd<Package>() ) << endl;
- getZYpp()->resolver()->addRequire( Capability("product:openSUSE.i586") );
- //getZYpp()->resolver()->addRequire( Capability("openSUSE-release") );
-
- 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;
+ ManagedFile f( repoProvidePackage( *pool.byKindBegin<Package>() ) );
+ USR << f << endl;
//////////////////////////////////////////////////////////////////
diff --git a/devel/devel.ma/Tools.h b/devel/devel.ma/Tools.h
index 1d9d9d6..53e32d9 100644
--- a/devel/devel.ma/Tools.h
+++ b/devel/devel.ma/Tools.h
@@ -30,7 +30,8 @@
#include "zypp/ui/Selectable.h"
#include
#include
-
+#include "zypp/RepoInfo.h"
+#include "zypp/repo/PackageProvider.h"
using namespace zypp;
using zypp::debug::Measure;
@@ -148,6 +149,20 @@ inline RepoManager makeRepoManager( const Pathname & mgrdir_r )
return RepoManager();
}
+ManagedFile providePkg( const PoolItem & pi )
+{
+ Package::constPtr p = asKind<Package>( pi.resolvable() );
+ if ( ! pi )
+ return ManagedFile();
+
+ repo::RepoMediaAccess access;
+ std::list<Repository> repos;
+ repo::DeltaCandidates deltas( repos );
+ repo::PackageProvider pkgProvider( access, p, deltas );
+
+ return pkgProvider.providePackage();
+}
+
///////////////////////////////////////////////////////////////////
template<class _Res>
diff --git a/devel/devel.ma/ma_test b/devel/devel.ma/ma_test
index 680d02a..4baea41 100755
--- a/devel/devel.ma/ma_test
+++ b/devel/devel.ma/ma_test
@@ -5,7 +5,7 @@
PRG=Main
SUDO=
if [ "$1" = -su ]; then
- SUDO=sudo
+ SUDO="sudo -E"
shift
fi
diff --git a/devel/devel.ma/main.cc b/devel/devel.ma/main.cc
index 9e85f45..8cef44f 100644
--- a/devel/devel.ma/main.cc
+++ b/devel/devel.ma/main.cc
@@ -1,23 +1,10 @@
#include "Tools.h"
#include "zypp/pool/GetResolvablesToInsDel.h"
-static TestSetup test( Arch_x86_64 ); // use x86_64 as system arch
+#include "zypp/parser/plaindir/RepoParser.h"
-bool solve()
-{
- bool rres = false;
- {
- //zypp::base::LogControl::TmpLineWriter shutUp;
- rres = test.resolver().resolvePool();
- }
- if ( ! rres )
- {
- ERR << "resolve " << rres << endl;
- return false;
- }
- MIL << "resolve " << rres << endl;
- return true;
-}
+static TestSetup test( "/tmp/ToolScanRepos", Arch_x86_64 ); // use x86_64 as system arch
+//static TestSetup test( Arch_x86_64 ); // use x86_64 as system arch
int main( int argc, char * argv[] )
try {
@@ -26,22 +13,21 @@ try {
zypp::base::LogControl::instance().logToStdErr();
INT << "===[START]==========================================" << endl;
- test.loadTarget(); // initialize and load target
- test.loadRepo( Url("iso:/?iso=/mounts/dist/install/openSUSE-11.1-Beta2-DONTUSE/kiwi.out.dvd-i586.iso") );
+ test.loadRepos();
+ ResPool pool( test.pool() );
- ResPool pool( test.pool() );
- Resolver & resolver( test.resolver() );
+ static const sat::SolvAttr susetagsDatadir( "susetags:datadir" );
+ sat::LookupRepoAttr q( susetagsDatadir );
+ dumpRange(SEC << q << " ", q.begin(), q.end() ) << endl;
- resolver.addRequire( Capability("glibc") );
- resolver.addRequire( Capability("zlib") );
- resolver.addRequire( Capability("lsb-buildenv") );
- solve();
- vdumpPoolStats( USR << "Transacting:"<< endl,
- make_filter_beginresfilter::ByTransact(pool),
- make_filter_endresfilter::ByTransact(pool) ) << endl;
+ for_( it, pool.byKindBegin<Package>(), pool.byKindEnd<Package>() )
+ {
+ ManagedFile p( providePkg( *it ) );
+ PathInfo pi( p );
+ (pi.isFile() ? USR : INT) << pi << endl;
+ break;
+ }
- pool::GetResolvablesToInsDel collect( pool, pool::GetResolvablesToInsDel::ORDER_BY_MEDIANR );
- MIL << "GetResolvablesToInsDel:" << endl << collect << endl;
///////////////////////////////////////////////////////////////////
INT << "===[END]============================================" << endl << endl;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org