From 0852362efa5e18466a90b5f81c70ecd4780b857b Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 16 May 2013 15:37:49 -0400 Subject: [PATCH] upgrade: Actually deploy upgraded tree again I need a brown paper bag for this one... --- src/ostree/ot-admin-builtin-upgrade.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ostree/ot-admin-builtin-upgrade.c b/src/ostree/ot-admin-builtin-upgrade.c index b060fbb9..829e1beb 100644 --- a/src/ostree/ot-admin-builtin-upgrade.c +++ b/src/ostree/ot-admin-builtin-upgrade.c @@ -89,8 +89,10 @@ ot_admin_builtin_upgrade (int argc, char **argv, OtAdminBuiltinOpts *admin_opts, gs_file_get_path_cached (ostree_dir), NULL); - if (!ot_admin_pull (ostree_dir, osname, cancellable, error)) - goto out; + if (!gs_subprocess_simple_run_sync (gs_file_get_path_cached (ostree_dir), + GS_SUBPROCESS_STREAM_DISPOSITION_INHERIT, + cancellable, error, + "ostree", "admin", ostree_dir_arg, "pull-deploy", osname, NULL)) if (!gs_subprocess_simple_run_sync (gs_file_get_path_cached (ostree_dir), GS_SUBPROCESS_STREAM_DISPOSITION_INHERIT,