marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build-finish: Fix exports 

This was reading an unintialized variable
tingping/wmclass
Alexander Larsson 2016-01-19 16:53:11 +01:00
parent 1d89c2fcab
commit 6189fd3f7a
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/xdg-app-builtins-build-finish.c
View File

@ -341,7 +341,7 @@ xdg_app_builtin_build_finish (int argc, char **argv, GCancellable *cancellable,
g_autoptr(GFile) metadata_file = NULL;
g_autofree char *metadata_contents = NULL;
g_autofree char *id = NULL;
gboolean is_runtime;
gboolean is_runtime = FALSE;
gsize metadata_size;
const char *directory;
g_autoptr(GKeyFile) metakey = NULL;

6
builder/builder-manifest.c
View File

@ -765,7 +765,7 @@ builder_manifest_checksum_for_cleanup (BuilderManifest *self,
{
GList *l;
builder_cache_checksum_str (cache, BUILDER_MANIFEST_CHECKSUM_VERSION);
builder_cache_checksum_str (cache, BUILDER_MANIFEST_CHECKSUM_CLEANUP_VERSION);
builder_cache_checksum_strv (cache, self->cleanup);
builder_cache_checksum_strv (cache, self->cleanup_commands);
builder_cache_checksum_str (cache, self->rename_desktop_file);
@ -787,7 +787,7 @@ builder_manifest_checksum_for_finish (BuilderManifest *self,
BuilderCache *cache,
BuilderContext *context)
{
builder_cache_checksum_str (cache, BUILDER_MANIFEST_CHECKSUM_VERSION);
builder_cache_checksum_str (cache, BUILDER_MANIFEST_CHECKSUM_FINISH_VERSION);
builder_cache_checksum_strv (cache, self->finish_args);
builder_cache_checksum_str (cache, self->command);
@ -812,7 +812,7 @@ builder_manifest_checksum_for_platform (BuilderManifest *self,
BuilderCache *cache,
BuilderContext *context)
{
builder_cache_checksum_str (cache, BUILDER_MANIFEST_CHECKSUM_VERSION);
builder_cache_checksum_str (cache, BUILDER_MANIFEST_CHECKSUM_PLATFORM_VERSION);
builder_cache_checksum_str (cache, self->id_platform);
builder_cache_checksum_str (cache, self->metadata);
builder_cache_checksum_strv (cache, self->cleanup_platform);

3
builder/builder-manifest.h
View File

@ -37,6 +37,9 @@ typedef struct BuilderManifest BuilderManifest;
/* Bump this if format changes in incompatible ways to force rebuild */
#define BUILDER_MANIFEST_CHECKSUM_VERSION "1"
#define BUILDER_MANIFEST_CHECKSUM_CLEANUP_VERSION "1"
#define BUILDER_MANIFEST_CHECKSUM_FINISH_VERSION "2"
#define BUILDER_MANIFEST_CHECKSUM_PLATFORM_VERSION "1"
GType builder_manifest_get_type (void);