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

* apt-pkg/contrib/configuration.cc:
- error out if #clear directive has no argument

David Kalnischkies лет назад: 16
Родитель
Сommit
c3a3a1b1b6
2 измененных файлов с 4 добавлено и 0 удалено
  1. 2 0
      apt-pkg/contrib/configuration.cc
  2. 2 0
      debian/changelog

+ 2 - 0
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

+ 2 - 0
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: