* apt-pkg/contrib/configuration.cc:

  - error out if #clear directive has no argument

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 7588b041c5f537800dabb2e6f349c2e224868fdd..9129d92f02a1f35b6e8d6e84217d61e161d552f8 100644 (file)
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -773,6 +773,8 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool const &AsSectio
               else
                  return _error->Error(_("Syntax error %s:%u: Unsupported directive '%s'"),FName.c_str(),CurLine,Tag.c_str());
            }
+           else if (Tag.empty() == true && NoWord == false && Word == "#clear")
+              return _error->Error(_("Syntax error %s:%u: clear directive requires an option tree as argument"),FName.c_str(),CurLine);
            else
            {
               // Set the item in the configuration class

diff --git a/debian/changelog b/debian/changelog
index f78f809360b35f9d0805d0eb7046289ebc44ae53..ee2be291b38f9c5ad841bfba2099a6bb76c00ef5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ apt (0.7.26~exp4) experimental; urgency=low
     - correct typos in german apt_preferences manpage, thanks Chris Leick!
   * apt-pkg/sourcelist.cc:
     - be less strict and accept [option=value] as well
+  * apt-pkg/contrib/configuration.cc:
+    - error out if #clear directive has no argument
 
   [ Jari Aalto ]
   * cmdline/apt-get.cc: