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

upgrade: Properly set origin_refspec variable for resolve/printing 

1) We were ignoring the remote, which is broken
2) We were printing NULL later on
This commit is contained in:
Colin Walters 2014-02-26 15:12:46 -05:00
parent c85682cb85
commit 0eb8c37ecb
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ostree/ot-admin-builtin-upgrade.c
View File

@ -50,9 +50,9 @@ ot_admin_builtin_upgrade (int argc, char **argv, OstreeSysroot *sysroot, GCancel
gboolean ret = FALSE; gboolean ret = FALSE;
GOptionContext *context; GOptionContext *context;
gs_unref_object OstreeRepo *repo = NULL; gs_unref_object OstreeRepo *repo = NULL;
gs_free char *origin_refspec = NULL;
gs_free char *origin_remote = NULL; gs_free char *origin_remote = NULL;
gs_free char *origin_ref = NULL; gs_free char *origin_ref = NULL;
gs_free char *origin_refspec = NULL;
gs_free char *new_revision = NULL; gs_free char *new_revision = NULL;
gs_unref_object GFile *deployment_path = NULL; gs_unref_object GFile *deployment_path = NULL;
gs_unref_object GFile *deployment_origin_path = NULL; gs_unref_object GFile *deployment_origin_path = NULL;
@ -98,12 +98,17 @@ ot_admin_builtin_upgrade (int argc, char **argv, OstreeSysroot *sysroot, GCancel
if (!ostree_repo_pull (repo, origin_remote, refs_to_fetch, pullflags, progress, if (!ostree_repo_pull (repo, origin_remote, refs_to_fetch, pullflags, progress,
cancellable, error)) cancellable, error))
goto out; goto out;
origin_refspec = g_strconcat (origin_remote, ":", origin_ref, NULL);
} }
else
origin_refspec = g_strdup (origin_ref);
if (!ostree_repo_resolve_rev (repo, origin_ref, FALSE, &new_revision,
if (!ostree_repo_resolve_rev (repo, origin_refspec, FALSE, &new_revision,
error)) error))
goto out; goto out;
if (strcmp (ostree_deployment_get_csum (merge_deployment), new_revision) == 0) if (strcmp (ostree_deployment_get_csum (merge_deployment), new_revision) == 0)
{ {
g_print ("Refspec %s is unchanged\n", origin_refspec); g_print ("Refspec %s is unchanged\n", origin_refspec);