keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

daemon: Strip override-commit when upgrading

Browse Source 
Deploy method locks the deployment at a particular commit by adding an
"override-commit" line to the origin file.

Upgrade method must undo the override so we always upgrade to the latest
available commit.
This commit is contained in:
Matthew Barnes 2015-10-28 19:28:14 -04:00
parent 9eabc1ba3c
commit 0a7706c241
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/daemon/rpmostreed-transaction-types.c
View File

@ -659,6 +659,7 @@ upgrade_transaction_execute (RpmostreedTransaction *transaction,
glnx_unref_object OstreeSysrootUpgrader *upgrader = NULL;
glnx_unref_object OstreeRepo *repo = NULL;
glnx_unref_object OstreeAsyncProgress *progress = NULL;
g_autoptr(GKeyFile) origin = NULL;
g_autofree gchar *origin_description = NULL;
@ -684,6 +685,19 @@ upgrade_transaction_execute (RpmostreedTransaction *transaction,
if (!ostree_sysroot_get_repo (sysroot, &repo, cancellable, error))
goto out;
origin = ostree_sysroot_upgrader_dup_origin (upgrader);
if (origin != NULL)
{
/* Strip any override-commit from the origin file so
* we always upgrade to the latest available commit. */
if (g_key_file_remove_key (origin, "origin", "override-commit", NULL))
{
/* XXX GCancellable parameter is not used. */
if (!ostree_sysroot_upgrader_set_origin (upgrader, origin, NULL, error))
goto out;
}
}
if (self->allow_downgrade)
upgrader_pull_flags |= OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_ALLOW_OLDER;