From: David Kalnischkies <david@kalnischkies.de>
Date: Thu, 16 Apr 2015 09:01:37 +0000 (+0200)
Subject: hide first pdiff merge failure debug message
X-Git-Tag: 1.0.9.8.2~7
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/f24736de7e3483124ae3aac0a12d2b12d32e7cd9

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

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);
 }