From ba60127df7bcc8263ae94092aca972b9f11c70ec Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 16 Jul 2020 16:04:35 +0200 Subject: [PATCH] udev: accept OPTIONS+= without any fuss There is no reason to consider this wrong. In fact one could argue that += is more appropriate, because we always add to options, and not replace previous assignments. If we output a debug message, we implicitly ask people to "fix" this, and we shouldn't. Also, all our rules use += right now. --- src/udev/udev-rules.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index c9c01fcc59..2a1cc21166 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -809,10 +809,8 @@ static int parse_token(UdevRules *rules, const char *key, char *attr, UdevRuleOp return log_token_invalid_attr(rules, key); if (is_match || op == OP_REMOVE) return log_token_invalid_op(rules, key); - if (op == OP_ADD) { - log_token_debug(rules, "Operator '+=' is specified to %s key, assuming '='.", key); + if (op == OP_ADD) op = OP_ASSIGN; - } if (streq(value, "string_escape=none")) r = rule_line_add_token(rule_line, TK_A_OPTIONS_STRING_ESCAPE_NONE, op, NULL, NULL); -- 2.25.1