Add xdg_app_dir_install/update helpers

These don't do much atm, but will let us clean up the child_repo handling

1 files changed, 8 insertions, 19 deletions

diff --git a/lib/xdg-app-installation.c b/lib/xdg-app-installation.c
index 3da464f..788b333 100644
--- a/lib/xdg-app-installation.c
+++ b/lib/xdg-app-installation.c
@@ -958,12 +958,8 @@ xdg_app_installation_install (XdgAppInstallation  *self,
       g_object_set_data (G_OBJECT (ostree_progress), "last_progress", GUINT_TO_POINTER(0));
     }
 
-  if (!xdg_app_dir_pull (dir_clone, remote_name, ref, NULL,
-                         ostree_progress, cancellable, error))
-    goto out;
-
-  if (!xdg_app_dir_deploy_install (dir_clone, ref, remote_name, NULL,
-                                   cancellable, error))
+  if (!xdg_app_dir_install (dir_clone, FALSE, FALSE, ref, remote_name, NULL,
+                            ostree_progress, cancellable, error))
     goto out;
 
   result = get_ref (self, ref, cancellable);
@@ -1052,19 +1048,12 @@ xdg_app_installation_update (XdgAppInstallation  *self,
       g_object_set_data (G_OBJECT (ostree_progress), "last_progress", GUINT_TO_POINTER(0));
     }
 
-  if ((flags & XDG_APP_UPDATE_FLAGS_NO_PULL) == 0)
-    {
-      if (!xdg_app_dir_pull (dir_clone, remote_name, ref, subpaths,
-                             ostree_progress, cancellable, error))
-        goto out;
-    }
-
-  if ((flags & XDG_APP_UPDATE_FLAGS_NO_DEPLOY) == 0)
-    {
-      if (!xdg_app_dir_deploy_update (dir_clone, ref, remote_name, NULL,
-                                      cancellable, error))
-        goto out;
-    }
+  if (!xdg_app_dir_update (dir_clone,
+                           (flags & XDG_APP_UPDATE_FLAGS_NO_PULL) != 0,
+                           (flags & XDG_APP_UPDATE_FLAGS_NO_DEPLOY) != 0,
+                           remote_name, ref, NULL, subpaths,
+                           ostree_progress, cancellable, error))
+    goto out;
 
   result = get_ref (self, ref, cancellable);