criss-cross merge with my sid branch

[apt.git] / apt-pkg / deb / deblistparser.cc

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 1948aedf30d90fb156850a229397c70bbb93c461..84eab44a7f16b8201b09264944367cfea6659d8d 100644 (file)
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -17,10 +17,9 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/crc-16.h>
 #include <apt-pkg/md5.h>
+#include <apt-pkg/macros.h>
 
 #include <ctype.h>
-
-#include <system.h>
                                                                        /*}}}*/
 
 static debListParser::WordList PrioList[] = {{"important",pkgCache::State::Important},
@@ -156,9 +155,10 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver)
         to a NOP in the download/install step - this package will ensure that
         it is downloaded only one time and installed only one time -- even if
         the architecture bound versions coming in and out on regular basis. */
+      bool const static multiArch = APT::Configuration::getArchitectures().size() > 1;
       if (strcmp(Ver.Arch(true),"all") == 0)
         return true;
-      else if (Ver.Pseudo() == true)
+      else if (multiArch == true)
       {
         // our pseudo packages have no size to not confuse the fetcher
         Ver->Size = 0;