~udeshike/apt/apt-ishan

Viewing changes to apt-pkg/cacheiterators.h

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

http://bugs.debian.org/613584

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

apt-pkg/cacheiterators.h

206

inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;};

207

inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;};

208

inline const char *Arch() const {

209

if(S->MultiArch == pkgCache::Version::All)

210

return "all";

211

209

return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch;

212

210

};

213

inline const char *Arch(bool const pseudo) const {

214

if(pseudo == false)

215

return Arch();

211

__deprecated inline const char *Arch(bool const pseudo) const {

216

212

return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch;

217

213

};

218

214

inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);};

227

223

string RelStr() const;

228

224

229

225

bool Automatic() const;

230

bool Pseudo() const;

226

__deprecated bool Pseudo() const;

231

227

VerFileIterator NewestFile() const;

232

228

233

229

inline VerIterator(pkgCache &Owner,Version *Trg = 0) : Iterator<Version, VerIterator>(Owner, Trg) {

Older »