diff options
| author |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-06-17 17:35:40 +0100 |
|---|---|---|
| committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-06-17 18:42:45 +0100 |
| commit | cb60c95d527c19246454945e3f35af9fa3425b13 (patch) | |
| tree | 44af638d04c5328d9163edef1baa837e4304fa64 | |
| parent | bb2ba5d1665a34c0cf7b86bb71439a8711993922 (diff) | |
| download | paludis-cb60c95d527c19246454945e3f35af9fa3425b13.tar.gz paludis-cb60c95d527c19246454945e3f35af9fa3425b13.tar.xz | |
Better handling of stupid libtool files
| -rw-r--r-- | paludis/util/config_file.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/paludis/util/config_file.cc b/paludis/util/config_file.cc index 4dc676c..c9c5848 100644 --- a/paludis/util/config_file.cc +++ b/paludis/util/config_file.cc @@ -391,8 +391,9 @@ namespace } else if ((! k.options()[kvcfo_ignore_single_quotes_inside_strings]) && parser.consume(simple_parser::exact("'"))) break; - else if ((k.options()[kvcfo_ignore_single_quotes_inside_strings]) && parser.lookahead(simple_parser::exact("'\n")) - && parser.consume(simple_parser::exact("'"))) + else if ((k.options()[kvcfo_ignore_single_quotes_inside_strings]) && + (parser.lookahead(simple_parser::exact("'\n")) || ! parser.lookahead(simple_parser::any_except(""))) && + parser.consume(simple_parser::exact("'"))) break; else if (parser.consume((simple_parser::any_except("") & *simple_parser::any_except("\\'")) >> s)) result.append(s); |