[totem-pl-parser/wip/hadess/fix-ci] ci: Fix problems accessing gvfs




commit a023ed985e55137c03a9f60c86d9ba1be748e894
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Jan 28 11:26:53 2021 +0100

    ci: Fix problems accessing gvfs

 .gitlab-ci.yml            |  9 +++++++--
 plparse/totem-pl-parser.c | 12 +++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73146aa..34c69be 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,14 +12,19 @@ build-fedora:
     - dnf -y update && dnf install -y $DEPENDENCIES
   script:
     - meson _build
+    - ninja -C _build
     - dnf install -y $TEST_DEPS
-    - GIO_USE_VOLUME_MONITOR=unix dbus-run-session ninja -C _build test
+    # gio info https://www.gnome.org
+    # gio: https://www.gnome.org: Operation not supported
+    - dbus-run-session gio info https://www.gnome.org
+    - dbus-run-session ninja -C _build test
     - ninja -C _build install
     # And now with quvi support
     - rm -rf _build
     - dnf install -y $DEPS_QUVI
     - meson _build
-    - GIO_USE_VOLUME_MONITOR=unix dbus-run-session ninja -C _build test
+    - ninja -C _build
+    - dbus-run-session ninja -C _build test
     - ninja -C _build install
     # ABI check
     - dnf install -y $DEPS_ABI_CHECK
diff --git a/plparse/totem-pl-parser.c b/plparse/totem-pl-parser.c
index c1b0600..84e0aa9 100644
--- a/plparse/totem-pl-parser.c
+++ b/plparse/totem-pl-parser.c
@@ -1030,17 +1030,21 @@ totem_pl_parser_resolve_uri (GFile *base_gfile,
        GFile *base_parent_gfile, *resolved_gfile;
 
        if (relative_uri == NULL) {
+               g_debug ("No relative URI, returning URI from base_gfile");
                if (base_gfile == NULL)
                        return NULL;
                return g_file_get_uri (base_gfile);
        }
 
-       if (base_gfile == NULL)
+       if (base_gfile == NULL) {
+               g_debug ("No base_gfile, returning relative URI %s", relative_uri);
                return g_strdup (relative_uri);
+       }
 
        /* If |relative_uri| has a scheme, it's a full URI, just return it */
        scheme = g_uri_parse_scheme (relative_uri);
        if (scheme != NULL) {
+               g_debug ("Relative URI %s is a full URI, returning that", relative_uri);
                g_free (scheme);
                return g_strdup (relative_uri);
        }
@@ -1054,11 +1058,13 @@ totem_pl_parser_resolve_uri (GFile *base_gfile,
        else
                base_parent_gfile = g_object_ref (base_gfile);
        g_free (base_uri);
+       g_debug ("Base parent GFile: %s", base_parent_gfile ? g_file_get_uri (base_parent_gfile) : "");
 
        if (base_parent_gfile == NULL) {
                resolved_gfile = g_file_resolve_relative_path (base_gfile, relative_uri);
                uri = g_file_get_uri (resolved_gfile);
                g_object_unref (resolved_gfile);
+               g_debug ("base_parent_gfile is NULL, returning %s", uri);
                return uri;
        }
 
@@ -1085,6 +1091,8 @@ totem_pl_parser_resolve_uri (GFile *base_gfile,
                g_object_unref (resolved_gfile);
                uri = g_strdup_printf ("%s%s", tmpuri, query);
 
+               g_debug ("new_relative_uri: %s", uri);
+
                g_free (tmpuri);
                g_free (new_relative_uri);
                g_free (query);
@@ -1103,6 +1111,8 @@ totem_pl_parser_resolve_uri (GFile *base_gfile,
                uri = g_file_get_uri (resolved_gfile);
                g_object_unref (resolved_gfile);
 
+               g_debug ("not new_relative_uri: %s", uri);
+
                return uri;
        }
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]