From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 16 Jul 2020 14:04:35 +0000 (+0200)
Subject: udev: accept OPTIONS+= without any fuss
X-Git-Tag: v246-rc2~53^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba60127df7bcc8263ae94092aca972b9f11c70ec;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index c9c01fcc599..2a1cc211669 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);