Просмотр исходного кода

* apt-pkg/pkgcachegen.cc:
- always reset _error->StackCount in MakeStatusCache (Closes: #677175)

Daniel Hartwig лет назад: 14
Родитель
Сommit
0952aee667
2 измененных файлов с 7 добавлено и 2 удалено
  1. 3 2
      apt-pkg/pkgcachegen.cc
  2. 4 0
      debian/changelog

+ 3 - 2
apt-pkg/pkgcachegen.cc

@@ -1316,10 +1316,11 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
 	 }
 	 }
 	 _error->RevertToStack();
 	 _error->RevertToStack();
       }
       }
-      else if (Debug == true)
+      else
       {
       {
 	 _error->MergeWithStack();
 	 _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)
    if (Writeable == false || CacheFile.empty() == true)

+ 4 - 0
debian/changelog

@@ -1,5 +1,9 @@
 apt (0.9.6.1) UNRELEASED; urgency=low
 apt (0.9.6.1) UNRELEASED; urgency=low
 
 
+  [ Daniel Hartwig ]
+  * apt-pkg/pkgcachegen.cc:
+    - always reset _error->StackCount in MakeStatusCache (Closes: #677175)
+
   [ David Kalnischkies ]
   [ David Kalnischkies ]
   * apt-pkg/deb/deblistparser.cc:
   * apt-pkg/deb/deblistparser.cc:
     - ensure that mixed positive/negative architecture wildcards
     - ensure that mixed positive/negative architecture wildcards