- use @ as arch separator instead of .
authorpmatilai <pmatilai>
Tue, 17 Jan 2006 01:05:13 +0000 (01:05 +0000)
committerpmatilai <pmatilai>
Tue, 17 Jan 2006 01:05:13 +0000 (01:05 +0000)
apt-pkg/rpm/rpmlistparser.cc

index d78cd04..fed1654 100644 (file)
@@ -137,7 +137,7 @@ string rpmListParser::Package()
    }
    if (IsMulti == true)
    {
-      Name += "." + Architecture();     
+      Name += "@" + Architecture();     
       CurrentName = Name;
       Multilib = true;
       return Name;
@@ -707,7 +707,7 @@ bool rpmListParser::Step()
       string RealName = Package();
 
       if (Multilib == true)
-        RealName = RealName.substr(0,RealName.find('.'));
+        RealName = RealName.substr(0,RealName.find('@'));
       if (Duplicated == true)
         RealName = RealName.substr(0,RealName.find('#'));
       if (RpmData->IgnorePackage(RealName) == true)
@@ -859,7 +859,7 @@ void rpmListParser::MultiArchPackage(string Name)
 
    pkgCache::VerIterator FromVerI = FromPkgI.VersionList();
    while (FromVerI.end() == false) {
-      string MangledName = Name+"."+string(FromVerI.Arch());
+      string MangledName = Name+"@"+string(FromVerI.Arch());
 
       // Get the new package.
       pkgCache::PkgIterator ToPkgI = Owner->GetCache().FindPkg(MangledName);