shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-10 05:18:30 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2293 from ostreedev/fix-file-uri-decoding

Browse Source 
Fix translation of file:// URIs into paths
This commit is contained in:
OpenShift Merge Robot 2021-03-10 21:14:51 +01:00 committed by GitHub
commit 31e19935b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/libostree/ostree-repo-pull.c
View File

@ -4104,24 +4104,25 @@ ostree_repo_pull_with_options (OstreeRepo *self,
&configured_branches, error)) &configured_branches, error))
goto out; goto out;
/* TODO reindent later */ /* Handle file:// URIs */
{ OstreeFetcherURI *first_uri = pull_data->meta_mirrorlist->pdata[0]; {
OstreeFetcherURI *first_uri = pull_data->meta_mirrorlist->pdata[0];
g_autofree char *first_scheme = _ostree_fetcher_uri_get_scheme (first_uri); g_autofree char *first_scheme = _ostree_fetcher_uri_get_scheme (first_uri);
/* NB: we don't support local mirrors in mirrorlists, so if this passes, it /* NB: we don't support local mirrors in mirrorlists, so if this passes, it
* means that we're not using mirrorlists (see also fetch_mirrorlist()) * means that we're not using mirrorlists (see also fetch_mirrorlist())
* Also, we explicitly disable the "local repo" path if static deltas * Also, we explicitly disable the "local repo" path if static deltas
* were explicitly requested to be required; this is going to happen * were explicitly requested to be required; this is going to happen
* most often for testing deltas without setting up a HTTP server. * most often for testing deltas without setting up a HTTP server.
*/ */
if (g_str_equal (first_scheme, "file") && !pull_data->require_static_deltas) if (g_str_equal (first_scheme, "file") && !pull_data->require_static_deltas)
{ {
g_autofree char *path = _ostree_fetcher_uri_get_path (first_uri); g_autofree char *uri = _ostree_fetcher_uri_to_string (first_uri);
g_autoptr(GFile) remote_repo_path = g_file_new_for_path (path); g_autoptr(GFile) remote_repo_path = g_file_new_for_uri (uri);
pull_data->remote_repo_local = ostree_repo_new (remote_repo_path); pull_data->remote_repo_local = ostree_repo_new (remote_repo_path);
if (!ostree_repo_open (pull_data->remote_repo_local, cancellable, error)) if (!ostree_repo_open (pull_data->remote_repo_local, cancellable, error))
goto out; goto out;
} }
} }
/* Change some option defaults if we're actually pulling from a local /* Change some option defaults if we're actually pulling from a local