ref: refs/heads/ma-misc
commit 7f94452158b144831fa94ef339e35fa46b393166
Author: Michael Andres
Date: Tue Sep 22 16:26:15 2009 +0200
Allow to pass the architecture of the testsetup to load.
---
tests/lib/TestSetup.h | 5 +++--
tools/NameReqPrv.cc | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/lib/TestSetup.h b/tests/lib/TestSetup.h
index 86ceac3..3015ddd 100644
--- a/tests/lib/TestSetup.h
+++ b/tests/lib/TestSetup.h
@@ -313,7 +313,7 @@ class TestSetup
* a TestSetup system or a real system. The provided repostitories are
* loaded into the pool (without refresh).
*/
- static void LoadSystemAt( const Pathname & sysRoot )
+ static void LoadSystemAt( const Pathname & sysRoot, const Arch & _testSetupArch_r = Arch_x86_64 )
{
if ( ! PathInfo( sysRoot ).isDir() )
ZYPP_THROW( Exception("sysRoot argument needs to be a directory") );
@@ -327,7 +327,8 @@ class TestSetup
else if ( TestSetup::isTestSetup( sysRoot ) )
{
USR << str::form( "*** Load TestSetup from '%s'", sysRoot.c_str() ) << endl;
- TestSetup test( sysRoot, Arch_x86_64 );
+
+ TestSetup test( sysRoot, _testSetupArch_r );
test.loadRepos();
Pathname solvCachePath( RepoManagerOptions::makeTestSetup( test.root() ).repoSolvCachePath );
diff --git a/tools/NameReqPrv.cc b/tools/NameReqPrv.cc
index 31fc7dc..65e7bfd 100644
--- a/tools/NameReqPrv.cc
+++ b/tools/NameReqPrv.cc
@@ -199,7 +199,7 @@ int main( int argc, char * argv[] )
for_( it, q.begin(), q.end() )
{
- tableOut( str::numstring( it->id() ), it->asString(), it->repository().alias(), it->vendor().asString(),
+ tableOut( str::numstring( it->id() ), it->asString(), it->repository().name(), it->vendor().asString(),
str::numstring( PoolItem(*it)->buildtime() ) );
if ( ! it.matchesEmpty() )
{
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
