]> 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)
committerJulian Andres Klode <jak@debian.org>
Wed, 31 Aug 2016 12:16:10 +0000 (14:16 +0200)
Also fixes message itself to mention the correct option name as noticed
in #832113.

(cherry picked from commit b9c20219dc17db1d29eaf297263a4b008bd1b90b)

methods/server.cc

index 63c7486dd98cdce754a85dade95d605841e5a120..2dc0b54b8f05ab8941506123a1b2a3aa616cedaa 100644 (file)
@@ -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