From d4d4cbda7afd99d69e2d18e4edb82053f06cdffc Mon Sep 17 00:00:00 2001 From: James Antill Date: Wed, 18 Jun 2014 02:57:19 -0400 Subject: [PATCH] core: Fix g_file_get_uri/get_parse_name for non-root ostree files --- src/libostree/ostree-repo-file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libostree/ostree-repo-file.c b/src/libostree/ostree-repo-file.c index 49857099..454b523b 100644 --- a/src/libostree/ostree-repo-file.c +++ b/src/libostree/ostree-repo-file.c @@ -495,12 +495,13 @@ ostree_repo_file_get_uri (GFile *file) const char *path; char *uri_path; char *ret; + OstreeRepoFile *root = ostree_repo_file_get_root (self); path = gs_file_get_path_cached (file); uri_path = g_filename_to_uri (path, NULL, NULL); g_assert (g_str_has_prefix (uri_path, "file://")); ret = g_strconcat ("ostree://", - self->tree_contents_checksum, "/", self->tree_metadata_checksum, + root->tree_contents_checksum, "/", root->tree_metadata_checksum, uri_path+strlen("file://"), NULL); g_free (uri_path);