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

lib/pull: Drop direct use of ->repodir 

Prep for `ostree_repo_new_at()`.  Down the line perhaps
we should extend libcurl to accept a file descriptor for cookies,
but this works OK for now.

Closes: #1010
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-07-17 20:50:55 -04:00 committed by Atomic Bot
parent 9430b8ad75
commit efd460782a
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2697,16 +2697,16 @@ _ostree_repo_remote_new_fetcher (OstreeRepo *self,
} }
{ {
g_autofree char *jar_path = NULL; g_autofree char *cookie_file = g_strdup_printf ("%s.cookies.txt", remote_name);
g_autofree char *cookie_file = g_strdup_printf ("%s.cookies.txt", /* TODO; port away from this; a bit hard since both libsoup and libcurl
remote_name); * 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 =
g_build_filename (gs_file_get_path_cached (repo_path), cookie_file, NULL);
jar_path = g_build_filename (gs_file_get_path_cached (self->repodir), cookie_file, if (g_file_test (jar_path, G_FILE_TEST_IS_REGULAR))
NULL);
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;

14
src/ostree/ot-remote-cookie-util.c
View File

@ -153,13 +153,13 @@ ot_add_cookie_at (int dfd, const char *jar_path,
/* Adapted from soup-cookie-jar-text.c:write_cookie() */ /* Adapted from soup-cookie-jar-text.c:write_cookie() */
g_autofree char *buf = g_strdup_printf ("%s\t%s\t%s\t%s\t%llu\t%s\t%s\n", g_autofree char *buf = g_strdup_printf ("%s\t%s\t%s\t%s\t%llu\t%s\t%s\n",
domain, domain,
*domain == '.' ? "TRUE" : "FALSE", *domain == '.' ? "TRUE" : "FALSE",
path, path,
"FALSE", "FALSE",
(long long unsigned)g_date_time_to_unix (expires), (long long unsigned)g_date_time_to_unix (expires),
name, name,
value); value);
if (glnx_loop_write (fd, buf, strlen (buf)) < 0) if (glnx_loop_write (fd, buf, strlen (buf)) < 0)
return glnx_throw_errno_prefix (error, "write"); return glnx_throw_errno_prefix (error, "write");
return TRUE; return TRUE;