diff options
| author | Daniel Hartwig <mandyke@gmail.com> | 2012-06-14 19:14:55 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2012-06-14 19:14:55 +0200 |
| commit | 0952aee667274d8d7986bc2d03597fdc6bde9584 (patch) | |
| tree | ace07f0b3cd3f31f836af4383903dd14870f3fb8 | |
| parent | 01f520ce27c7f466dc6191c45507ace79d685725 (diff) | |
* apt-pkg/pkgcachegen.cc:
- always reset _error->StackCount in MakeStatusCache (Closes: #677175)
| -rw-r--r-- | apt-pkg/pkgcachegen.cc | 5 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 538d10b35..f70cbd02a 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -1316,10 +1316,11 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress } _error->RevertToStack(); } - else if (Debug == true) + else { _error->MergeWithStack(); - std::clog << "Open filebased MMap" << std::endl; + if (Debug == true) + std::clog << "Open filebased MMap" << std::endl; } } if (Writeable == false || CacheFile.empty() == true) diff --git a/debian/changelog b/debian/changelog index ca49a7ace..69f4778f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ apt (0.9.6.1) UNRELEASED; urgency=low + [ Daniel Hartwig ] + * apt-pkg/pkgcachegen.cc: + - always reset _error->StackCount in MakeStatusCache (Closes: #677175) + [ David Kalnischkies ] * apt-pkg/deb/deblistparser.cc: - ensure that mixed positive/negative architecture wildcards |