* apt-pkg/pkgcachegen.cc:

  - always reset _error->StackCount in MakeStatusCache (Closes: #677175)

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 538d10b35136616b8563e1710a59f5bd22d59ef5..f70cbd02a67e62b8b4e325c0029d0b3b908dca9c 100644 (file)
--- 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 ca49a7ace9a63579325dbc995ff4080fc0997293..69f4778f3591edc5bdcd6c2dcfef02ff0bf5829a 100644 (file)
--- 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