~udeshike/apt/apt-ishan

« back to all changes in this revision

Viewing changes to apt-pkg/policy.cc

  • Committer: David Kalnischkies
  • Date: 2011-03-08 18:32:35 UTC
  • mto: This revision was merged to the branch mainline in revision 2091.
  • Revision ID: kalnischkies@gmail.com-20110308183235-zxpdc9aby7rurhjs
Remove the "pseudopackage" handling of Architecture: all packages for
Multi-Arch; instead, Arch: all packages only satisfy dependencies for
the native arch, except where the Arch: all package is declared
Multi-Arch: foreign.  (Closes: #613584)

This has the sideeffect that arch:all packages internally show up as
coming from the native arch - so packages with the architecture "all"
doesn't exist any longer in the pkgcache

Show diffs side-by-side

added added

removed removed

Lines of Context:
152
152
   {
153
153
      /* Lets see if this version is the installed version */
154
154
      bool instVer = (Pkg.CurrentVer() == Ver);
155
 
      if (Ver.Pseudo() == true && instVer == false)
156
 
      {
157
 
         pkgCache::PkgIterator const allPkg = Ver.ParentPkg().Group().FindPkg("all");
158
 
         if (allPkg->CurrentVer != 0 && allPkg.CurrentVer()->Hash == Ver->Hash &&
159
 
             strcmp(allPkg.CurVersion(), Ver.VerStr()) == 0)
160
 
            instVer = true;
161
 
      }
162
155
 
163
156
      for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; VF++)
164
157
      {