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.1.exp9~140^2~50
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/f4c7a238f4c29ac9b1e1172f103ab7dec5c5807d

hide first pdiff merge failure debug message

The sibling of this message are all guarded as debug messages, just this
one had it missing an subsequently causes display issues if triggered.

Git-Dch: Ignore
---

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 750e7daca..00862fe23 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1044,7 +1044,8 @@ void pkgAcqIndexMergeDiffs::Failed(string Message,pkgAcquire::MethodConfig * Cnf
 
    // 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, TransactionManager, Target, ExpectedHashes, MetaIndexParser);
 }
 									/*}}}*/