diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-04-16 11:01:37 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2015-08-27 19:50:19 +0200 |
| commit | f24736de7e3483124ae3aac0a12d2b12d32e7cd9 (patch) | |
| tree | 9ae3dad568713652491633a23ee4e0b7cc8c64a8 | |
| parent | 1ef5b62dc47245cc3138dc4d73c22b624c20114b (diff) | |
hide first pdiff merge failure debug message
The siblings of this message are all guarded as debug messages, just this
one had it missing and subsequently causes display issues if triggered,
which, given that clog is an alias for cerr, end up on stderr and
therefore are reported as problems by tools only showing the stderr
like our own cron script.
[Backport of f4c7a238f4c29ac9b1e1172f103ab7dec5c5807d]
Closes: 793444
| -rw-r--r-- | apt-pkg/acquire-item.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 0bcafdc5c..3d911a959 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -834,7 +834,8 @@ void pkgAcqIndexMergeDiffs::Failed(string Message,pkgAcquire::MethodConfig * /*C // first failure means we should fallback State = StateErrorDiff; - std::clog << "Falling back to normal index file acquire" << std::endl; + if (Debug) + std::clog << "Falling back to normal index file acquire" << std::endl; new pkgAcqIndex(Owner, RealURI, Description,Desc.ShortDesc, ExpectedHash); } |