arch and basearch working

[platform/upstream/libzypp.git] / zypp / repo / RepoVariables.cc

diff --git a/zypp/repo/RepoVariables.cc b/zypp/repo/RepoVariables.cc
index 445d32c..4e8cb23 100644 (file)
--- a/zypp/repo/RepoVariables.cc
+++ b/zypp/repo/RepoVariables.cc
@@ -62,9 +62,22 @@ std::string RepoVariablesStringReplacer::operator()( const std::string &value )
                    "$arch",
                    ZConfig::instance().systemArchitecture().asString() );
   // $basearch
-  ZConfig::instance().systemArchitecture();
   
-  ZConfig::instance();
+  Arch::CompatSet cset( Arch::compatSet( ZConfig::instance().systemArchitecture() ) );
+  Arch::CompatSet::const_iterator it = cset.end();
+  --it;
+  // now at noarch
+  --it;
+  
+  Arch basearch = *it;
+  if ( basearch == Arch_noarch )
+  {
+    basearch = ZConfig::instance().systemArchitecture();
+  }
+
+  newvalue = gsub( newvalue,
+                   "$basearch",
+                   basearch.asString() );
   return newvalue;
 }