From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sat, 26 Jun 2010 07:03:26 +0000 (+0200)
Subject: * apt-pkg/aptconfiguration.cc:
X-Git-Tag: 0.8.0~9^2~22^2~25
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/9f9717fa6bca13817cf9cf84d513e59d258af154

* apt-pkg/aptconfiguration.cc:
  - show a deprecation notice for APT::Acquire::Translation
---

diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index 0c050d9dc..44f1f318a 100644
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -10,6 +10,7 @@
 // Include Files							/*{{{*/
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/macros.h>
 #include <apt-pkg/strutl.h>
@@ -196,6 +197,9 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
 	// it was undocumented and so it should be not very widthly used
 	string const oldAcquire = _config->Find("APT::Acquire::Translation","");
 	if (oldAcquire.empty() == false && oldAcquire != "environment") {
+		// TRANSLATORS: the two %s are APT configuration options
+		_error->Notice("Option '%s' is deprecated. Please use '%s' instead, see 'man 5 apt.conf' for details.",
+				"APT::Acquire::Translation", "Acquire::Languages");
 		if (oldAcquire != "none")
 			codes.push_back(oldAcquire);
 		codes.push_back("en");
diff --git a/debian/changelog b/debian/changelog
index 46e371165..06bde48fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,10 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low
     - complete rewrite but use the same API
     - add NOTICE and DEBUG as new types of a message
     - add a simple stack handling to be able to delay error handling
+  * apt-pkg/aptconfiguration.cc:
+    - show a deprecation notice for APT::Acquire::Translation
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 25 Jun 2010 19:15:21 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 26 Jun 2010 09:01:40 +0200
 
 apt (0.7.26~exp7) experimental; urgency=low