packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/pull: Only look for cookie files for non-local remotes 

Just noticed this while reading an strace.

Closes: https://github.com/ostreedev/ostree/issues/1139

Closes: #1145
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-09-06 21:30:13 -04:00 committed by Atomic Bot
parent 11179e30bd
commit db6135f5b3
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2743,18 +2743,19 @@ _ostree_repo_remote_new_fetcher (OstreeRepo *self,
_ostree_fetcher_set_proxy (fetcher, http_proxy); _ostree_fetcher_set_proxy (fetcher, http_proxy);
} }
{ if (!_ostree_repo_remote_name_is_file (remote_name))
g_autofree char *cookie_file = g_strdup_printf ("%s.cookies.txt", remote_name); {
/* TODO; port away from this; a bit hard since both libsoup and libcurl g_autofree char *cookie_file = g_strdup_printf ("%s.cookies.txt", remote_name);
* expect a file. Doing ot_fdrel_to_gfile() works for now though. /* TODO; port away from this; a bit hard since both libsoup and libcurl
*/ * expect a file. Doing ot_fdrel_to_gfile() works for now though.
GFile*repo_path = ostree_repo_get_path (self); */
g_autofree char *jar_path = GFile*repo_path = ostree_repo_get_path (self);
g_build_filename (gs_file_get_path_cached (repo_path), cookie_file, NULL); g_autofree char *jar_path =
g_build_filename (gs_file_get_path_cached (repo_path), cookie_file, NULL);
if (g_file_test (jar_path, G_FILE_TEST_IS_REGULAR)) if (g_file_test (jar_path, G_FILE_TEST_IS_REGULAR))
_ostree_fetcher_set_cookie_jar (fetcher, jar_path); _ostree_fetcher_set_cookie_jar (fetcher, jar_path);
} }
success = TRUE; success = TRUE;