← Back to branch summary

~ubuntu-branches/ubuntu/natty/apt/natty

« back to all changes in this revision

Viewing changes to apt-pkg/cacheiterators.h

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2011-04-05 13:19:56 UTC
  • Revision ID: james.westby@ubuntu.com-20110405131956-u6sgfjr30zvy2fr3
Tags: 0.8.13.2ubuntu1
https://launchpad.net/bugs/733741
* merge fixes from debian-sid, most notable the handling of
  arch=all architectures in python-apt (LP: #733741)
* apt-pkg/aptconfiguration.cc:
  - fix comparing for a empty string

Show diffs side-by-side

added added

removed removed

Lines of Context:
apt-pkg/cacheiterators.h
206
206
        inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;};
207
207
        inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;};
208
208
        inline const char *Arch() const {
 
209
                if (S->MultiArch == pkgCache::Version::All ||
 
210
                    S->MultiArch == pkgCache::Version::AllForeign ||
 
211
                    S->MultiArch == pkgCache::Version::AllAllowed)
 
212
                        return "all";
209
213
                return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch;
210
214
        };
211
215
        __deprecated inline const char *Arch(bool const pseudo) const {