]> git.saurik.com Git - apt.git/commitdiff
use proper warning for automatic pipeline disable
authorDavid Kalnischkies <david@kalnischkies.de>
Wed, 27 Jul 2016 06:08:50 +0000 (08:08 +0200)
committerDavid Kalnischkies <david@kalnischkies.de>
Wed, 27 Jul 2016 07:23:18 +0000 (09:23 +0200)
Also fixes message itself to mention the correct option name as noticed
in #832113.

methods/server.cc

index 5ab97a66037c1dcc8f56a6d6d1a45b4a03eadb85..4611433881a4959b3da109ce1e4d2cc2cc00c83c 100644 (file)
@@ -637,10 +637,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