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

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
This commit is contained in:
William Manley 2018-01-13 15:30:17 +00:00 committed by Atomic Bot
parent ebc104d3c7
commit c5d6725d91
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ostree/ot-admin-builtin-deploy.c
View File

@ -162,7 +162,7 @@ ot_admin_builtin_deploy (int argc, char **argv, OstreeCommandInvocation *invocat
kargs_strv, &new_deployment, cancellable, error)) kargs_strv, &new_deployment, cancellable, error))
return FALSE; return FALSE;
OstreeSysrootSimpleWriteDeploymentFlags flags = 0; OstreeSysrootSimpleWriteDeploymentFlags flags = OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN;
if (opt_retain) if (opt_retain)
flags |= OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN; flags |= OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN;
else else
@ -180,5 +180,10 @@ ot_admin_builtin_deploy (int argc, char **argv, OstreeCommandInvocation *invocat
merge_deployment, flags, cancellable, error)) merge_deployment, flags, cancellable, error))
return FALSE; return FALSE;
/* And finally, cleanup of any leftover data.
*/
if (!ostree_sysroot_cleanup (self, cancellable, error))
return FALSE;
return TRUE; return TRUE;
} }