pull: Also fix misplaced remote name handling

We want to set the remote name only if we're operating on a remote
URL.
This commit is contained in:
Colin Walters 2015-06-29 11:20:41 -04:00
parent 536d6fb083
commit c8c239f94c
1 changed files with 1 additions and 1 deletions

View File

@ -1684,7 +1684,6 @@ ostree_repo_pull_with_options (OstreeRepo *self,
if (_ostree_repo_remote_name_is_file (remote_name_or_baseurl)) if (_ostree_repo_remote_name_is_file (remote_name_or_baseurl))
{ {
pull_data->remote_name = g_strdup (remote_name_or_baseurl);
/* For compatibility with pull-local, don't gpg verify local /* For compatibility with pull-local, don't gpg verify local
* pulls. * pulls.
*/ */
@ -1693,6 +1692,7 @@ ostree_repo_pull_with_options (OstreeRepo *self,
} }
else else
{ {
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, remote_name_or_baseurl,
&pull_data->gpg_verify, error)) &pull_data->gpg_verify, error))
goto out; goto out;