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

pull: More consistently use remote_repo_local for local repos 

I think it's cleaner if we use `remote_repo_local` to know
that we have a local repo.  In reality, it might be nicest
if we didn't even create an `OstreeFetcher` for this case,
but untangling the code is tricky.

Closes: #239
Approved by: alexlarsson
This commit is contained in:
Colin Walters 2016-04-05 15:37:32 -04:00 committed by Colin Walters (automation)
parent b69fd11487
commit 594162f16a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1990,10 +1990,10 @@ ostree_repo_pull_with_options (OstreeRepo *self,
else else
{ {
pull_data->remote_name = g_strdup (remote_name_or_baseurl); pull_data->remote_name = g_strdup (remote_name_or_baseurl);
if (!ostree_repo_remote_get_gpg_verify (self, remote_name_or_baseurl, if (!ostree_repo_remote_get_gpg_verify (self, pull_data->remote_name,
&pull_data->gpg_verify, error)) &pull_data->gpg_verify, error))
goto out; goto out;
if (!ostree_repo_remote_get_gpg_verify_summary (self, remote_name_or_baseurl, if (!ostree_repo_remote_get_gpg_verify_summary (self, pull_data->remote_name,
&pull_data->gpg_verify_summary, error)) &pull_data->gpg_verify_summary, error))
goto out; goto out;
} }
@ -2123,7 +2123,7 @@ ostree_repo_pull_with_options (OstreeRepo *self,
} }
if (bytes_sig && if (bytes_sig &&
!_ostree_repo_remote_name_is_file (remote_name_or_baseurl) && !pull_data->remote_repo_local &&
!_ostree_repo_load_cache_summary_if_same_sig (self, !_ostree_repo_load_cache_summary_if_same_sig (self,
remote_name_or_baseurl, remote_name_or_baseurl,
bytes_sig, bytes_sig,
@ -2177,7 +2177,7 @@ ostree_repo_pull_with_options (OstreeRepo *self,
if (!summary_from_cache && bytes_summary && bytes_sig) if (!summary_from_cache && bytes_summary && bytes_sig)
{ {
if (!_ostree_repo_remote_name_is_file (remote_name_or_baseurl) && if (!pull_data->remote_repo_local &&
!_ostree_repo_cache_summary (self, !_ostree_repo_cache_summary (self,
remote_name_or_baseurl, remote_name_or_baseurl,
bytes_summary, bytes_summary,