diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-07-28 10:21:58 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-07-28 10:21:58 +0200 |
| commit | c6ec544822a6a5db9f8a507b08381f19c8787761 (patch) | |
| tree | f4cf7c2f2a21d29642bf13e87b792cbb9df688a3 /apt-pkg/pkgcachegen.cc | |
| parent | f448075d89fedde182e6c2a59c89808e403b7f66 (diff) | |
| parent | a2cba9cca24762c090ee6988f14ae40f92a6441f (diff) | |
merged from debian-experimental
Diffstat (limited to 'apt-pkg/pkgcachegen.cc')
| -rw-r--r-- | apt-pkg/pkgcachegen.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 8f9737e26..70dcd9de9 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -98,6 +98,7 @@ pkgCacheGenerator::~pkgCacheGenerator() return; Cache.HeaderP->Dirty = false; + Cache.HeaderP->CacheFileSize = Map.Size(); Map.Sync(0,sizeof(pkgCache::Header)); } /*}}}*/ @@ -642,7 +643,7 @@ bool pkgCacheGenerator::FinishCache(OpProgress *Progress) bool const coInstall = ((V->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same); for (vector<string>::const_iterator A = archs.begin(); A != archs.end(); ++A) { - if (*A == Arch) + if (Arch == 0 || *A == Arch) continue; /* We allow only one installed arch at the time per group, therefore each group member conflicts |