Take arch into account for --skip-if-unchanged

This fixes https://github.com/flatpak/flatpak-builder/issues/130

Closes: #197
Approved by: alexlarsson
auto
Alexander Larsson 2018-08-08 14:16:52 +02:00 committed by Atomic Bot
parent b9584e7fb1
commit 42d4a14af4
1 changed files with 4 additions and 2 deletions

View File

@ -460,7 +460,8 @@ char *
builder_context_get_checksum_for (BuilderContext *self,
const char *name)
{
g_autoptr(GFile) checksum_file = g_file_get_child (self->checksums_dir, name);
g_autofree char *checksum_name = g_strdup_printf ("%s-%s", builder_context_get_arch (self), name);
g_autoptr(GFile) checksum_file = g_file_get_child (self->checksums_dir, checksum_name);
g_autofree gchar *checksum = NULL;
if (!g_file_get_contents (flatpak_file_get_path_cached (checksum_file), &checksum, NULL, NULL))
@ -475,7 +476,8 @@ builder_context_set_checksum_for (BuilderContext *self,
const char *checksum,
GError **error)
{
g_autoptr(GFile) checksum_file = g_file_get_child (self->checksums_dir, name);
g_autofree char *checksum_name = g_strdup_printf ("%s-%s", builder_context_get_arch (self), name);
g_autoptr(GFile) checksum_file = g_file_get_child (self->checksums_dir, checksum_name);
if (!flatpak_mkdir_p (self->checksums_dir,
NULL, error))