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

upgrader: Avoid cleaning system repo twice

Browse Source 
We need to manage our baselayer refs independently of the deployment
being written by libostree, so suppress the default clean; we'll do
it in rpm-ostree.

I noticed the `Freed objects:` message twice and always wondered why
until today.

Closes: #437
Approved by: jlebon
This commit is contained in:
Colin Walters 2016-08-29 15:15:05 -04:00 committed by Atomic Bot
parent 2bc8d7cccb
commit 363e213f18
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/daemon/rpmostree-sysroot-upgrader.c
View File

@ -1444,11 +1444,6 @@ sysroot_upgrader_cleanup (RpmOstreeSysrootUpgrader *self,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
glnx_unref_object OstreeRepo *pkgcache_repo = NULL;
if (!get_pkgcache_repo (repo, &pkgcache_repo, cancellable, error))
return FALSE;
/* regenerate the baselayer refs in case we just kicked out an ancient layered /* regenerate the baselayer refs in case we just kicked out an ancient layered
* deployment whose base layer is not needed anymore */ * deployment whose base layer is not needed anymore */
if (!generate_baselayer_refs (self, repo, cancellable, error)) if (!generate_baselayer_refs (self, repo, cancellable, error))
@ -1526,15 +1521,10 @@ rpmostree_sysroot_upgrader_deploy (RpmOstreeSysrootUpgrader *self,
if (!ostree_sysroot_simple_write_deployment (self->sysroot, self->osname, if (!ostree_sysroot_simple_write_deployment (self->sysroot, self->osname,
new_deployment, new_deployment,
self->merge_deployment, self->merge_deployment,
0, OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN,
cancellable, error)) cancellable, error))
goto out; goto out;
/* regenerate the baselayer refs in case we just kicked out an ancient layered
* deployment whose base layer is not needed anymore */
if (!generate_baselayer_refs (self, repo, cancellable, error))
goto out;
if (!sysroot_upgrader_cleanup (self, repo, cancellable, error)) if (!sysroot_upgrader_cleanup (self, repo, cancellable, error))
goto out; goto out;