gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

CLI2: No longer attempts to canonicalize rc:<file> and rc.<name>:<value>

Browse Source
This commit is contained in:
Paul Beckingham
2015-07-06 12:14:52 -04:00
parent dcb13bd2b4
commit 0ee26a0cae
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/CLI2.cpp
View File

@@ -869,13 +869,23 @@ void CLI2::canonicalizeNames ()
{ {
if (a._lextype == Lexer::Type::pair) if (a._lextype == Lexer::Type::pair)
{ {
std::string name = a.attribute ("name"); std::string raw = a.attribute ("raw");
std::string canonical; if (raw.substr (0, 3) != "rc:" &&
if (canonicalize (canonical, "pseudo", name) || raw.substr (0, 3) != "rc.")
canonicalize (canonical, "attribute", name) ||
canonicalize (canonical, "uda", name))
{ {
a.attribute ("canonical", canonical); std::string name = a.attribute ("name");
std::string canonical;
if (canonicalize (canonical, "pseudo", name) ||
canonicalize (canonical, "attribute", name) ||
canonicalize (canonical, "uda", name))
{
a.attribute ("canonical", canonical);
}
else
{
a._lextype = Lexer::Type::word;
}
changes = true; changes = true;
} }
} }