Fix rule-update-target exclusions for plain (non-regex) variables

This commit is contained in:
martinhsv
2020-02-05 06:57:01 -08:00
committed by Felipe Zimmerle
parent f7e4c1d9f5
commit 1b1fdc055b
5 changed files with 92 additions and 8 deletions

View File

@@ -697,7 +697,7 @@ bool Rule::evaluate(Transaction *trans,
const std::string &value = v->getValue();
const std::string &key = v->getKeyWithCollection();
if (exclusion.contains(v->getKey()) ||
if (exclusion.contains(v) ||
std::find_if(trans->m_ruleRemoveTargetById.begin(),
trans->m_ruleRemoveTargetById.end(),
[&, v, this](std::pair<int, std::string> &m) -> bool {
@@ -708,7 +708,7 @@ bool Rule::evaluate(Transaction *trans,
v = NULL;
continue;
}
if (exclusion.contains(v->getKey()) ||
if (exclusion.contains(v) ||
std::find_if(trans->m_ruleRemoveTargetByTag.begin(),
trans->m_ruleRemoveTargetByTag.end(),
[&, v, trans, this](std::pair<std::string, std::string> &m) -> bool {