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

* apt-pkg/sourcelist.cc:
- be less strict and accept [option=value] as well

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

+ 7 - 0
apt-pkg/sourcelist.cc

@@ -94,6 +94,13 @@ bool pkgSourceList::Type::ParseLine(vector<metaIndex *> &List,
 	 if (option.length() < 3)
 	    return _error->Error(_("Malformed line %lu in source list %s ([option] too short)"),CurLine,File.c_str());
 
+	 // accept options even if the last has no space before the ]-end marker
+	 if (option.at(option.length()-1) == ']')
+	 {
+	    for (; *Buffer != ']'; --Buffer);
+	    option.resize(option.length()-1);
+	 }
+
 	 size_t const needle = option.find('=');
 	 if (needle == string::npos)
 	    return _error->Error(_("Malformed line %lu in source list %s ([%s] is not an assignment)"),CurLine,File.c_str(), option.c_str());

+ 2 - 0
debian/changelog

@@ -32,6 +32,8 @@ apt (0.7.26~exp4) experimental; urgency=low
     - Add a note about APT_CONFIG in the -c description (Closes: #578267)
   * doc/po/de.po:
     - correct typos in german apt_preferences manpage, thanks Chris Leick!
+  * apt-pkg/sourcelist.cc:
+    - be less strict and accept [option=value] as well
 
   [ Jari Aalto ]
   * cmdline/apt-get.cc: