From: Daniel Hartwig <mandyke@gmail.com>
Date: Thu, 14 Jun 2012 17:14:55 +0000 (+0200)
Subject: * apt-pkg/pkgcachegen.cc:
X-Git-Tag: 0.9.7~1^2~4
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/0952aee667274d8d7986bc2d03597fdc6bde9584

* 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 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