diff options
| author | Alexander Larsson <alexl@redhat.com> | 2016-04-19 13:31:55 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2016-04-19 13:31:55 +0200 |
| commit | 1c1bc4acca467bdb15e8c75f3ef3f802d9cafea0 (patch) | |
| tree | 14b0be70e44041df33629047371fc82c9f03e80c /app | |
| parent | 18bb0868e9e9ca169e1fcdf8a2a9a3fe54dcef5b (diff) | |
| download | xdg-app-1c1bc4acca467bdb15e8c75f3ef3f802d9cafea0.tar.gz | |
common: Move xdg_app_dir_pull_from_bundle to xdg_app_pull_from_bundle
The only difference is it takes an OstreeRepo, not a XdgAppDir, so we
can use it at a lower level too.
Diffstat (limited to 'app')
| -rw-r--r-- | app/xdg-app-builtins-install.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/app/xdg-app-builtins-install.c b/app/xdg-app-builtins-install.c index e8634a6..66aaf1d 100644 --- a/app/xdg-app-builtins-install.c +++ b/app/xdg-app-builtins-install.c @@ -171,13 +171,16 @@ install_bundle (XdgAppDir *dir, /* From here we need to goto out on error, to clean up */ added_remote = TRUE; - if (!xdg_app_dir_pull_from_bundle (dir, - file, - remote, - ref, - gpg_data != NULL, - cancellable, - error)) + if (!xdg_app_dir_ensure_repo (dir, cancellable, error)) + goto out; + + if (!xdg_app_pull_from_bundle (xdg_app_dir_get_repo (dir), + file, + remote, + ref, + gpg_data != NULL, + cancellable, + error)) goto out; if (!xdg_app_dir_lock (dir, &lock, |