diff --git a/ChangeLog b/ChangeLog index fb86d9ae4..cfadb9f16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,8 @@ + Fixed bug #439, which ignored dateformat.annotation for sparse annotations. + Fixed bug #441, which misparsed '/a/a:/' as an attribute, rather than a substitution (thanks to Michelle Crane). + + Fixed problem with command line configuration overrides that had no + values. ------ old releases ------------------------------ diff --git a/src/Context.cpp b/src/Context.cpp index 762b8ba33..f7e985803 100644 --- a/src/Context.cpp +++ b/src/Context.cpp @@ -390,17 +390,18 @@ void Context::applyOverrides ( std::string name; std::string value; Nibbler n (*in); - if (n.getUntil ('.', name) && - n.skip ('.') && - n.getUntilOneOf (":=", name) && - n.skipN (1) && - n.getUntilEOS (value)) + if (n.getLiteral ("rc.") && // rc. + n.getUntilOneOf (":=", name) && // xxx + n.skipN (1)) // : { + n.getUntilEOS (value); // Don't care if it's blank. + config.set (name, value); var_overrides += " " + *in; - footnote (std::string ("Configuration override ") + // TODO i18n - in->substr (3)); + footnote ("Configuration override " + in->substr (3)); } + else + footnote ("Problem with override: " + *in); } else output.push_back (*in);