- Fixed problem with command line configuration overrides that had no
  values.
This commit is contained in:
Paul Beckingham 2010-07-23 22:33:02 -07:00
parent 5cecc3d772
commit eeeff7d389
2 changed files with 10 additions and 7 deletions

View file

@ -27,6 +27,8 @@
+ Fixed bug #439, which ignored dateformat.annotation for sparse annotations. + Fixed bug #439, which ignored dateformat.annotation for sparse annotations.
+ Fixed bug #441, which misparsed '/a/a:/' as an attribute, rather than a + Fixed bug #441, which misparsed '/a/a:/' as an attribute, rather than a
substitution (thanks to Michelle Crane). substitution (thanks to Michelle Crane).
+ Fixed problem with command line configuration overrides that had no
values.
------ old releases ------------------------------ ------ old releases ------------------------------

View file

@ -390,17 +390,18 @@ void Context::applyOverrides (
std::string name; std::string name;
std::string value; std::string value;
Nibbler n (*in); Nibbler n (*in);
if (n.getUntil ('.', name) && if (n.getLiteral ("rc.") && // rc.
n.skip ('.') && n.getUntilOneOf (":=", name) && // xxx
n.getUntilOneOf (":=", name) && n.skipN (1)) // :
n.skipN (1) &&
n.getUntilEOS (value))
{ {
n.getUntilEOS (value); // Don't care if it's blank.
config.set (name, value); config.set (name, value);
var_overrides += " " + *in; var_overrides += " " + *in;
footnote (std::string ("Configuration override ") + // TODO i18n footnote ("Configuration override " + in->substr (3));
in->substr (3));
} }
else
footnote ("Problem with override: " + *in);
} }
else else
output.push_back (*in); output.push_back (*in);