From c5d6725d9141a5583addcca0caf726e24c430595 Mon Sep 17 00:00:00 2001 From: William Manley Date: Sat, 13 Jan 2018 15:30:17 +0000 Subject: [PATCH] ostree admin deploy: Refactor bringing cleaning into `main` In the next commit I will add --no-prune which will affect cleaning. By doing this refactor we avoid having to add a NO_PRUNE flag. Closes: #1418 Approved by: cgwalters --- src/ostree/ot-admin-builtin-deploy.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ostree/ot-admin-builtin-deploy.c b/src/ostree/ot-admin-builtin-deploy.c index 8da9dbc3..68d17e95 100644 --- a/src/ostree/ot-admin-builtin-deploy.c +++ b/src/ostree/ot-admin-builtin-deploy.c @@ -162,7 +162,7 @@ ot_admin_builtin_deploy (int argc, char **argv, OstreeCommandInvocation *invocat kargs_strv, &new_deployment, cancellable, error)) return FALSE; - OstreeSysrootSimpleWriteDeploymentFlags flags = 0; + OstreeSysrootSimpleWriteDeploymentFlags flags = OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN; if (opt_retain) flags |= OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN; else @@ -180,5 +180,10 @@ ot_admin_builtin_deploy (int argc, char **argv, OstreeCommandInvocation *invocat merge_deployment, flags, cancellable, error)) return FALSE; + /* And finally, cleanup of any leftover data. + */ + if (!ostree_sysroot_cleanup (self, cancellable, error)) + return FALSE; + return TRUE; }