shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-03-14 04:59:00 +03:00
Code Issues Projects Releases Wiki Activity

pull: Don't try to cache summaries for pull-local

Browse Source 
Not only does this not make sense from a performance perspective, but
it also doesn't work because we can't use a url as a path element.

Closes: 
Approved by: cgwalters
This commit is contained in:
Alexander Larsson 2016-04-04 14:26:53 +02:00 committed by Colin Walters (automation)
parent 4e81548447
commit eabb4e3545
1 changed files with 10 additions and 7 deletions

17
src/libostree/ostree-repo-pull.c

@ -2107,12 +2107,14 @@ ostree_repo_pull_with_options (OstreeRepo *self,
soup_uri_free (uri);
}
if (bytes_sig && !_ostree_repo_load_cache_summary_if_same_sig (self,
remote_name_or_baseurl,
bytes_sig,
&bytes_summary,
cancellable,
error))
if (bytes_sig &&
!_ostree_repo_remote_name_is_file (remote_name_or_baseurl) &&
!_ostree_repo_load_cache_summary_if_same_sig (self,
remote_name_or_baseurl,
bytes_sig,
&bytes_summary,
cancellable,
error))
goto out;
if (bytes_summary)
@ -2160,7 +2162,8 @@ ostree_repo_pull_with_options (OstreeRepo *self,
if (!summary_from_cache && bytes_summary && bytes_sig)
{
if (!_ostree_repo_cache_summary (self,
if (!_ostree_repo_remote_name_is_file (remote_name_or_baseurl) &&
!_ostree_repo_cache_summary (self,
remote_name_or_baseurl,
bytes_summary,
bytes_sig,