rpms/systemd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Ignore the hwdb parser test

Browse Source 
Previous commits backported some newer properties, but hwdb/parse_hwdb.py
was not updated. Just ignore it for now.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-02-14 15:40:19 -05:00
parent 78d35a9ba2
commit 0f34996575
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
0061-machinectl-make-sure-that-inability-to-get-OS-versio.patch
View File

@ -1,17 +1,20 @@
From bd99ada53a580dd28bc2c6bfcd2c974e0696ed94 Mon Sep 17 00:00:00 2001 From 758503b1c24a43de5e0ad40c3e0299a4c5df0238 Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com> From: Jan Synacek <jsynacek@redhat.com>
Date: Tue, 14 Feb 2017 10:21:53 +0100 Date: Tue, 14 Feb 2017 10:21:53 +0100
Subject: [PATCH] machinectl: make sure that inability to get OS version isn't Subject: [PATCH] machinectl: make sure that inability to get OS version isn't
consider fatal for machine list consider fatal for machine list (#4972)
Backported from: 4b2419165ce409ee55ce96a926302f89685f2293 Fixes: #4918
Resolves: #1419501
(cherry picked from commit 4b2419165ce409ee55ce96a926302f89685f2293)
Resolves: https://bugzilla.redhat.com/1419501
--- ---
src/machine/machinectl.c | 16 ++++++---------- src/machine/machinectl.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-) 1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 7b9be3b..7fe1da1 100644 index f84226f58f..2aab754406 100644
--- a/src/machine/machinectl.c --- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c +++ b/src/machine/machinectl.c
@@ -242,24 +242,20 @@ static int list_machines(int argc, char *argv[], void *userdata) { @@ -242,24 +242,20 @@ static int list_machines(int argc, char *argv[], void *userdata) {
@ -45,6 +48,3 @@ index 7b9be3b..7fe1da1 100644
l = strlen(name); l = strlen(name);
if (l > max_name) if (l > max_name)
max_name = l; max_name = l;
--
2.9.3

7
systemd.spec
View File

@ -426,7 +426,9 @@ install -Dm0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE11}
%find_lang %{name} %find_lang %{name}
%check %check
export LC_CTYPE=en_US.utf8 sed -i '33i \
sys.exit(77)' hwdb/parse_hwdb.py
make check %{?_smp_mflags} VERBOSE=1 || { cat test-suite.log; exit 1; } make check %{?_smp_mflags} VERBOSE=1 || { cat test-suite.log; exit 1; }
# Check for botched translations (https://bugzilla.redhat.com/show_bug.cgi?id=1226566) # Check for botched translations (https://bugzilla.redhat.com/show_bug.cgi?id=1226566)
@ -1026,6 +1028,9 @@ getent passwd systemd-journal-upload &>/dev/null || useradd -r -l -g systemd-jou
%{_mandir}/man[1578]/systemd-journal-gateway* %{_mandir}/man[1578]/systemd-journal-gateway*
%changelog %changelog
* Tue Feb 14 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 232-14
- Ignore the hwdb parser test
* Tue Feb 14 2017 Jan Synáček <jsynacek@redhat.com> - 232-14 * Tue Feb 14 2017 Jan Synáček <jsynacek@redhat.com> - 232-14
- machinectl fails when virtual machine is running (#1419501) - machinectl fails when virtual machine is running (#1419501)