diff options
| author | Alexander Larsson <alexl@redhat.com> | 2016-04-21 09:50:01 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2016-04-21 09:50:01 +0200 |
| commit | 0b1bc5bc4eea05049726b6197b37f9dd3ac990a1 (patch) | |
| tree | 0c12468206242ddf30a6c4cd6dc9e435cd3aec75 /app | |
| parent | 9171c9466236beecda837c04d7d72c75111bb375 (diff) | |
| download | xdg-app-0b1bc5bc4eea05049726b6197b37f9dd3ac990a1.tar.gz | |
build-bundle: Move the gpg_data local to the right function
This was unused in the main function, something which was missed
when the build_bundle() helper was split out.
Diffstat (limited to 'app')
| -rw-r--r-- | app/xdg-app-builtins-build-bundle.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/xdg-app-builtins-build-bundle.c b/app/xdg-app-builtins-build-bundle.c index f20c324..dd12163 100644 --- a/app/xdg-app-builtins-build-bundle.c +++ b/app/xdg-app-builtins-build-bundle.c @@ -93,7 +93,6 @@ read_gpg_data (GCancellable *cancellable, static gboolean build_bundle (OstreeRepo *repo, GFile *file, const char *name, const char *full_branch, - GBytes *gpg_data, GCancellable *cancellable, GError **error) { GVariantBuilder metadata_builder; @@ -101,13 +100,13 @@ build_bundle (OstreeRepo *repo, GFile *file, g_autoptr(GKeyFile) keyfile = NULL; g_autoptr(GFile) xmls_dir = NULL; g_autoptr(GFile) metadata_file = NULL; - g_autoptr(XdgAppXml) xml_root = NULL; g_autoptr(GFile) appstream_file = NULL; g_autofree char *appstream_basename = NULL; g_autoptr(GInputStream) in = NULL; g_autoptr(GInputStream) xml_in = NULL; g_autoptr(GFile) root = NULL; g_autofree char *commit_checksum = NULL; + g_autoptr(GBytes) gpg_data = NULL; if (!ostree_repo_resolve_rev (repo, full_branch, FALSE, &commit_checksum, error)) return FALSE; @@ -252,7 +251,6 @@ xdg_app_builtin_build_bundle (int argc, char **argv, GCancellable *cancellable, g_autoptr(GFile) file = NULL; g_autoptr(GFile) repofile = NULL; g_autoptr(OstreeRepo) repo = NULL; - g_autoptr(GBytes) gpg_data = NULL; const char *location; const char *filename; const char *name; @@ -301,7 +299,7 @@ xdg_app_builtin_build_bundle (int argc, char **argv, GCancellable *cancellable, if (!ostree_repo_open (repo, cancellable, error)) return FALSE; - if (!build_bundle (repo, file, name, full_branch, gpg_data, cancellable, error)) + if (!build_bundle (repo, file, name, full_branch, cancellable, error)) return FALSE; return TRUE; |