summaryrefslogtreecommitdiff
path: root/src/libostree/ostree-fetcher-curl.c
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2017-09-14 15:10:54 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2017-09-15 17:01:51 +0000
commit0488b4870e80ef575d8b0edf6f2a9e5ad54bf4df (patch)
tree5e5471a430aa09787c2038e8db6491477eddd681 /src/libostree/ostree-fetcher-curl.c
parentc32f234e9a63396725e98792dc2c4373504b44ac (diff)
downloadostree-0488b4870e80ef575d8b0edf6f2a9e5ad54bf4df.tar.gz
lib/pull: Drop partial fetch code from libsoup backend
Doing this in prep for libglnx tmpdir porting, but I think we should also do this because the partial fetch code IMO was never fully baked; among other things it was never integrated into the scheme we came up with for "boot id sync" that we use for complete/staged objects. There's a lot of complexity here that while we have some coverage for, I think we need to refocus on the core functionality. The libcurl backend doesn't have an equivalent to this today. In particular for small objects, this is simply overly complex. The downside is clearly for large objects like FAH's 61MB initramfs; not being able to resume fetches of those is unfortunate. In practice though, I think most people should be using deltas, and we need to make sure deltas work for large objects anyways. Further ultimately the peer-to-peer work should help a lot for people with truly unreliable connections. Closes: #1176 Approved by: jlebon
Diffstat (limited to 'src/libostree/ostree-fetcher-curl.c')
-rw-r--r--src/libostree/ostree-fetcher-curl.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libostree/ostree-fetcher-curl.c b/src/libostree/ostree-fetcher-curl.c
index 57118f9c..e3fd1a12 100644
--- a/src/libostree/ostree-fetcher-curl.c
+++ b/src/libostree/ostree-fetcher-curl.c
@@ -379,14 +379,13 @@ check_multi_info (OstreeFetcher *fetcher)
g_autoptr(GError) local_error = NULL;
GError **error = &local_error;
- /* TODO - share file naming with soup, and fix it */
g_autofree char *tmpfile_path =
- g_compute_checksum_for_string (G_CHECKSUM_SHA256,
- eff_url, strlen (eff_url));
+ ostree_fetcher_generate_url_tmpname (eff_url);
if (!ensure_tmpfile (req, error))
{
g_task_return_error (task, g_steal_pointer (&local_error));
}
+ /* This should match the libsoup chmod */
else if (fchmod (req->tmpf.fd, 0644) < 0)
{
glnx_set_error_from_errno (error);