From: Simon McVittie Date: Fri, 22 Jun 2018 00:10:55 +0000 (+0100) Subject: avahi: Fail immediately if we can't talk to D-Bus or Avahi X-Git-Tag: archive/raspbian/2018.6-3+rpi1^2~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f5de762126cf4d9108ad1eb4ebd25b0137bbd239;p=ostree.git avahi: Fail immediately if we can't talk to D-Bus or Avahi We special-case AVAHI_ERR_NO_DAEMON to not cause warnings, but if we pass AVAHI_CLIENT_NO_FAIL to avahi_client_new, we never actually see AVAHI_ERR_NO_DAEMON. Instead, we will get AVAHI_ERR_BAD_STATE when we try to use the client. Bug: https://github.com/ostreedev/ostree/issues/1618 Signed-off-by: Simon McVittie Forwarded: https://github.com/ostreedev/ostree/pull/1639 Applied-upstream: 2018.7, commit:https://github.com/ostreedev/ostree/commit/e120a6b1198aaa785533c76316898f15a804dae1 Gbp-Pq: Name avahi-Fail-immediately-if-we-can-t-talk-to-D-Bus-or-Avahi.patch --- diff --git a/src/libostree/ostree-repo-finder-avahi.c b/src/libostree/ostree-repo-finder-avahi.c index 223d8f0a..bc383769 100644 --- a/src/libostree/ostree-repo-finder-avahi.c +++ b/src/libostree/ostree-repo-finder-avahi.c @@ -1432,8 +1432,7 @@ ostree_repo_finder_avahi_start (OstreeRepoFinderAvahi *self, g_assert (self->client == NULL); - client = avahi_client_new (avahi_glib_poll_get (self->poll), - AVAHI_CLIENT_NO_FAIL, + client = avahi_client_new (avahi_glib_poll_get (self->poll), 0, client_cb, self, &failure); if (client == NULL)