Attachment 89418 Details for Bug 71393 – Quieten warnings, otherwise we get warnings for vendor overrides

Quieten warnings, otherwise we get warnings for vendor overrides

0002-Don-t-warn-for-files-other-than-xml-files-in-the-int.patch (text/plain), 1.19 KB, created by Iain Lane on 2013-11-18 17:31:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Iain Lane

Created: 2013-11-18 17:31:33 UTC

Size: 1.19 KB

patch

obsolete

>From 996182773379f14c4974ddf1c965d3bfbc91a99e Mon Sep 17 00:00:00 2001
>From: Iain Lane <iain.lane@canonical.com>
>Date: Tue, 12 Nov 2013 13:15:35 +0000
>Subject: [PATCH 2/2] Don't warn for files other than xml files in the
> interface directory
>
>It's where the override files can be put. No point warning unless we
>think it's a vendor extension.
>---
> src/extensions.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/src/extensions.c b/src/extensions.c
>index 705967e..ad2b3ef 100644
>--- a/src/extensions.c
>+++ b/src/extensions.c
>@@ -120,6 +120,10 @@ daemon_read_extension_directory (GHashTable  *ifaces,
>                 filename = g_build_filename (path, name, NULL);
>                 symlink = g_file_read_link (filename, NULL);
> 
>+                /* We might have other files here; only concern ourselves with DBus interfaces. */
>+                if (!g_str_has_suffix (filename, ".xml"))
>+                    continue;
>+
>                 if (!symlink) {
>                         g_warning ("Found accounts service vendor extension file %s, but file must be a symlink to "
>                                    "'../../dbus-1/interfaces/%s' for forwards-compatibility reasons.", filename, name);
>-- 
>1.8.4.3
>

Actions: View

Attachments on bug 71393: 89417 | 89418

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.