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

Merge pull request #182 from mbarnes/rebase-tolerant-cleanup

Browse Source 
Don't fail during rebase cleanup
This commit is contained in:
Colin Walters 2015-11-16 15:43:29 -05:00
commit 37ef92b966
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -878,23 +878,18 @@ rebase_transaction_execute (RpmostreedTransaction *transaction,
if (!self->skip_purge)
{
g_autofree gchar *remote = NULL;
g_autofree gchar *ref = NULL;
g_autofree char *remote = NULL;
g_autofree char *ref = NULL;
if (!ostree_parse_refspec (old_refspec, &remote, &ref, error))
goto out;
if (!ostree_repo_prepare_transaction (repo, NULL, cancellable, error))
goto out;
ostree_repo_transaction_set_ref (repo, remote, ref, NULL);
rpmostreed_transaction_emit_message_printf (transaction,
"Deleting ref '%s'",
old_refspec);
if (!ostree_repo_commit_transaction (repo, NULL, cancellable, error))
goto out;
/* The actual rebase has already succeeded, so ignore errors. */
if (ostree_parse_refspec (old_refspec, &remote, &ref, NULL))
{
/* Note: In some cases the source origin ref may not actually
* exist; say the admin did a cleanup, or the OS expects post-
* install configuration like subscription-manager. */
(void) ostree_repo_set_ref_immediate (repo, remote, ref, NULL,
cancellable, NULL);
}
}
if (self->reboot)