summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib/error.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-07-29 16:33:29 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-07-29 16:33:29 +0200
commiteb9306cce92c97e571706febfc0a7ecb5ddd3dcb (patch)
tree28d3f20459af2fda59b68cda9a50261791d6d772 /apt-pkg/contrib/error.cc
parent15240f4b681ca35c669d2b2e6e34f8ee3f6c06d9 (diff)
parent86f88a491b867359b2288cfff04536f80ce17c33 (diff)
merged with current debian-experimental-ma branch
Diffstat (limited to 'apt-pkg/contrib/error.cc')
-rw-r--r--apt-pkg/contrib/error.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index fbb6e4636..d63b06d13 100644
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -180,7 +180,7 @@ bool GlobalError::PopMessage(std::string &Text) {
}
/*}}}*/
// GlobalError::DumpErrors - Dump all of the errors/warns to cerr /*{{{*/
-void GlobalError::DumpErrors(std::ostream &out, MsgType const &trashhold,
+void GlobalError::DumpErrors(std::ostream &out, MsgType const &threshold,
bool const &mergeStack) {
if (mergeStack == true)
for (std::list<MsgStack>::const_reverse_iterator s = Stacks.rbegin();
@@ -189,7 +189,7 @@ void GlobalError::DumpErrors(std::ostream &out, MsgType const &trashhold,
for (std::list<Item>::const_iterator m = Messages.begin();
m != Messages.end(); m++)
- if (m->Type >= trashhold)
+ if (m->Type >= threshold)
out << (*m) << std::endl;
Discard();
}