Allow to pass the architecture of the testsetup to load.

diff --git a/tests/lib/TestSetup.h b/tests/lib/TestSetup.h
index 86ceac3..3015ddd 100644 (file)
--- 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 (file)
--- 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() )
       {