public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Anthony G. Basile" <blueness@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/eudev:master commit in: src/udev/
Date: Tue,  9 Feb 2021 19:08:05 +0000 (UTC)	[thread overview]
Message-ID: <1612897654.9d4010a3629ebc1d915b7f2d3e2d7be83d79b4f4.blueness@gentoo> (raw)

commit:     9d4010a3629ebc1d915b7f2d3e2d7be83d79b4f4
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  9 12:22:37 2021 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 19:07:34 2021 +0000
URL:        https://gitweb.gentoo.org/proj/eudev.git/commit/?id=9d4010a3

udevadm: hwdb: allow empty properties

Backport of https://github.com/systemd/systemd/commit/afe87974dd57741f74dd87165b251886f24c859f.

Will address shown error

> Error, empty key or value ' XKB_FIXED_VARIANT' in '/usr/lib/udev/hwdb.d/60-keyboard.hwdb'

caued by recent changes in sys-apps/hwids-20201207 [Link 1].

Link 1: https://github.com/gentoo/hwids/commit/f30071bbebc0685c645783024cae0f9f213a1458#diff-7b9ba9c30888b1b5b1fa008f185e4efaff34eaff2c13f35c38b2ae0416cd891eR1840
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 src/udev/udevadm-hwdb.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
index 6bc108783..53b1b15c7 100644
--- a/src/udev/udevadm-hwdb.c
+++ b/src/udev/udevadm-hwdb.c
@@ -441,9 +441,8 @@ static int insert_data(struct trie *trie, struct udev_list *match_list,
         while (isblank(line[0]) && isblank(line[1]))
                 line++;
 
-        if (isempty(line + 1) || isempty(value)) {
-                log_error("Warning, empty %s in \"%s=%s\", ignoring",
-                          isempty(line + 1) ? "key" : "value",
+        if (isempty(line + 1)) {
+                log_error("Warning, empty key in \"%s=%s\", ignoring",
                           line, value);
                 return -EINVAL;
         }


             reply	other threads:[~2021-02-09 19:08 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-09 19:08 Anthony G. Basile [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-02-09 19:08 [gentoo-commits] proj/eudev:master commit in: src/udev/ Anthony G. Basile
2021-08-23 15:55 Anthony G. Basile
2021-08-23 16:03 Anthony G. Basile
2021-08-23 16:06 Anthony G. Basile

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1612897654.9d4010a3629ebc1d915b7f2d3e2d7be83d79b4f4.blueness@gentoo \
    --to=blueness@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox