summaryrefslogtreecommitdiff
path: root/apt-pkg/acquire-method.cc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-10-08 08:05:18 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-10-08 08:05:18 +0200
commit676700504710013d6737f79bf6ad12003d55c30d (patch)
tree4b5713e0c880750b35ee7f5ba9285917361e4926 /apt-pkg/acquire-method.cc
parentee27950632c149bb14c9c490e92147579ba4fc2a (diff)
parentf9a3c4bde867e70e8c89b6ed5924ab9fab517096 (diff)
Merge remote-tracking branch 'donkult/feature/acq-trans' into feature/expected-size
Diffstat (limited to 'apt-pkg/acquire-method.cc')
-rw-r--r--apt-pkg/acquire-method.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 9c0558223..c78e95e58 100644
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -102,7 +102,10 @@ void pkgAcqMethod::Fail(string Err,bool Transient)
if (Queue != 0)
{
std::cout << "400 URI Failure\nURI: " << Queue->Uri << "\n"
- << "Message: " << Err << " " << IP << "\n";
+ << "Message: " << Err;
+ if (IP.empty() == false && _config->FindB("Acquire::Failure::ShowIP", true) == true)
+ std::cout << " " << IP;
+ std::cout << "\n";
Dequeue();
}
else