From 9e9aa738a6ca983f490ef8b4f8559aedd901ebb4 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 8 Aug 2016 18:28:18 +0100
Subject: [PATCH] check-dbus-services: do not special-case com.chaiwala.Updater
This came from the chaiwala-btrfs package, which we haven't shipped
since 15.12.
Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D3897
---
dbus/check-dbus-services | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/dbus/check-dbus-services b/dbus/check-dbus-services
index b6ead02..cb7a0c4 100755
--- a/dbus/check-dbus-services
+++ b/dbus/check-dbus-services
@@ -154,27 +154,12 @@ for service in *.service; do
fail "$name" "matching systemd service $systemd_service not found"
fi
- if [ "${bus}:${bus_name}" = "system:com.chaiwala.Updater" ] &&
- ! [ -e /dev/disk/by-partlabel/flags ]; then
- # LAVA dismantles and reassembles our images, so it does not have
- # the partition layout required by the updater.
- # https://bugs.apertis.org/show_bug.cgi?id=484
- skip "$name" "chaiwala-btrfs-updater is not available on LAVA"
- elif [ "${bus}:${bus_name}" = "system:org.freedesktop.thermald" ] &&
+ if [ "${bus}:${bus_name}" = "system:org.freedesktop.thermald" ] &&
systemd-detect-virt --quiet; then
skip "$name" "thermald does not make sense in a virtual machine"
elif ! run_verbose gdbus call --$bus -d "$bus_name" -o / \
-m org.freedesktop.DBus.Peer.Ping; then
case "${bus}:$bus_name" in
- (system:com.chaiwala.Updater)
- # chaiwala-btrfs-updater currently only responds to user, not root
- xfail "$name" "could not ping $bus_name as root, trying as user"
- if ! sudo -u user gdbus call --$bus -d "$bus_name" -o / \
- -m org.freedesktop.DBus.Peer.Ping; then
- fail "$name" "could not ping $bus_name"
- fi
- ;;
-
(session:ca.desrt.dconf-editor)
# https://bugs.apertis.org/show_bug.cgi?id=431
xfail "$name" "could not ping $bus_name (bug: Apertis #431)"
--
GitLab