diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-07-27 08:08:50 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-08-31 14:16:10 +0200 |
| commit | a8c30aa78bf30586ffa47aa9b9a3ff97f763690a (patch) | |
| tree | f79276384939851db9f05897dd8616095df19dfc | |
| parent | e6b75e6e89a72edfc7d71ea0269f3ad8041da0b2 (diff) | |
use proper warning for automatic pipeline disable
Also fixes message itself to mention the correct option name as noticed
in #832113.
(cherry picked from commit b9c20219dc17db1d29eaf297263a4b008bd1b90b)
| -rw-r--r-- | methods/server.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/methods/server.cc b/methods/server.cc index 63c7486dd..2dc0b54b8 100644 --- a/methods/server.cc +++ b/methods/server.cc @@ -608,10 +608,7 @@ int ServerMethod::Loop() // yes, he did! Disable pipelining and rewrite queue if (Server->Pipeline == true) { - // FIXME: fake a warning message as we have no proper way of communicating here - std::string out; - strprintf(out, _("Automatically disabled %s due to incorrect response from server/proxy. (man 5 apt.conf)"), "Acquire::http::PipelineDepth"); - std::cerr << "W: " << out << std::endl; + Warning(_("Automatically disabled %s due to incorrect response from server/proxy. (man 5 apt.conf)"), "Acquire::http::Pipeline-Depth"); Server->Pipeline = false; Server->PipelineAllowed = false; // we keep the PipelineDepth value so that the rest of the queue can be fixed up as well |