diff options
author | Michael Vogt <mvo@ubuntu.com> | 2014-10-08 08:36:53 +0200 |
---|---|---|
committer | Michael Vogt <mvo@ubuntu.com> | 2014-10-08 08:36:53 +0200 |
commit | a943fbf21ca0b9b58b8f1492fc518679b1d7c749 (patch) | |
tree | 8db7050b025ca3918ff3e5ebad00f3a7f339a7d2 /apt-pkg/acquire-method.cc | |
parent | 8f45798d532223adc378a4ad9ecfc64b3be26e4f (diff) | |
parent | f9a3c4bde867e70e8c89b6ed5924ab9fab517096 (diff) |
Merge remote-tracking branch 'mvo/feature/acq-trans' into debian/experimental
Diffstat (limited to 'apt-pkg/acquire-method.cc')
-rw-r--r-- | apt-pkg/acquire-method.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index d116994e6..8533e319f 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 |