Просмотр исходного кода

use proper warning for automatic pipeline disable

Also fixes message itself to mention the correct option name as noticed
in #832113.
David Kalnischkies лет назад: 10
Родитель
Сommit
b9c20219dc
1 измененных файлов с 1 добавлено и 4 удалено
  1. 1 4
      methods/server.cc

+ 1 - 4
methods/server.cc

@@ -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