From a8c30aa78bf30586ffa47aa9b9a3ff97f763690a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 27 Jul 2016 08:08:50 +0200 Subject: 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) --- methods/server.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'methods') 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 -- cgit v1.2.3