diff options
author | Michael Vogt <mvo@debian.org> | 2014-09-29 09:58:38 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-09-29 09:58:38 +0200 |
commit | 4c333a25a88b1afac2ed50bf1b9af61dc5b09343 (patch) | |
tree | d4b90a7bc46e9da364efb74365a0af604b38e424 /apt-private/private-cachefile.cc | |
parent | bca84917c326fa3158e120147c8aecebe0789b47 (diff) | |
parent | 6eb377fb9fba6b7f17f635143e9201f0d62a50fb (diff) |
Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans
Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
methods/gpgv.cc
Diffstat (limited to 'apt-private/private-cachefile.cc')
-rw-r--r-- | apt-private/private-cachefile.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apt-private/private-cachefile.cc b/apt-private/private-cachefile.cc index 5e955ac39..29e665245 100644 --- a/apt-private/private-cachefile.cc +++ b/apt-private/private-cachefile.cc @@ -32,8 +32,10 @@ int CacheFile::NameComp(const void *a,const void *b) const pkgCache::Package &A = **(pkgCache::Package **)a; const pkgCache::Package &B = **(pkgCache::Package **)b; + const pkgCache::Group * const GA = SortCache->GrpP + A.Group; + const pkgCache::Group * const GB = SortCache->GrpP + B.Group; - return strcmp(SortCache->StrP + A.Name,SortCache->StrP + B.Name); + return strcmp(SortCache->StrP + GA->Name,SortCache->StrP + GB->Name); } /*}}}*/ // CacheFile::Sort - Sort by name /*{{{*/ |