- back to multilibbing only rpmdb packages, for repos its way too wacky
authorpmatilai <pmatilai>
Tue, 17 Jan 2006 19:44:49 +0000 (19:44 +0000)
committerpmatilai <pmatilai>
Tue, 17 Jan 2006 19:44:49 +0000 (19:44 +0000)
apt-pkg/rpm/rpmlistparser.cc

index f4cfbd1..25715e3 100644 (file)
@@ -47,19 +47,17 @@ rpmListParser::rpmListParser(RPMHandler *Handler)
    {
 #ifdef WITH_HASH_MAP
       SeenPackages = new SeenPackagesType(517);
+      SeenMultiPackages = new SeenMultiPackagesType(517);
 #else
       SeenPackages = new SeenPackagesType;
+      SeenMultiPackages = new SeenMultiPackagesType;
 #endif
    }
    else
+   {
       SeenPackages = NULL;
-
-#ifdef WITH_HASH_MAP
-   SeenMultiPackages = new SeenMultiPackagesType(517);
-#else
-   SeenMultiPackages = new SeenMultiPackagesType;
-#endif
-
+      SeenMultiPackages = NULL;
+   }
    RpmData = RPMPackageData::Singleton();
 }
                                                                         /*}}}*/
@@ -132,7 +130,6 @@ string rpmListParser::Package()
    else if (SeenMultiPackages != NULL) {
       if (SeenMultiPackages->find(Name.c_str()) != SeenMultiPackages->end())
       {
-        // cout << "make multipkg " << Name << " " << Architecture() << endl;
         RpmData->SetMultiArchPackage(Name);
         MultiArchPackage(Name);
         IsMulti = true;