"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "app/flatpak-builtins-build-export.c" between
flatpak-1.15.1.tar.xz and flatpak-1.15.2.tar.xz

About: Flatpak is a Linux application sandboxing and distribution framework. Pre-release.

flatpak-builtins-build-export.c  (flatpak-1.15.1.tar.xz)	:	flatpak-builtins-build-export.c  (flatpak-1.15.2.tar.xz)
skipping to change at line 211		skipping to change at line 211
if (mode & S_IXUSR)		if (mode & S_IXUSR)
mode = 0755 | S_IFREG;		mode = 0755 | S_IFREG;
else /* otherwise executable by none */		else /* otherwise executable by none */
mode = 0644 | S_IFREG;		mode = 0644 | S_IFREG;
}		}
g_file_info_set_attribute_uint32 (file_info, "unix::mode", mode);		g_file_info_set_attribute_uint32 (file_info, "unix::mode", mode);
if (matches_patterns (commit_data->exclude, path) &&		if (matches_patterns (commit_data->exclude, path) &&
!matches_patterns (commit_data->include, path))		!matches_patterns (commit_data->include, path))
{		{
g_debug ("Excluding %s", path);		g_info ("Excluding %s", path);
return OSTREE_REPO_COMMIT_FILTER_SKIP;		return OSTREE_REPO_COMMIT_FILTER_SKIP;
}		}
return OSTREE_REPO_COMMIT_FILTER_ALLOW;		return OSTREE_REPO_COMMIT_FILTER_ALLOW;
}		}
static gboolean		static gboolean
add_file_to_mtree (GFile *file,		add_file_to_mtree (GFile *file,
const char *name,		const char *name,
OstreeRepo *repo,		OstreeRepo *repo,
skipping to change at line 398		skipping to change at line 398
else		else
#endif		#endif
add_args (args, validate_icon, "512", "512", name, NULL);		add_args (args, validate_icon, "512", "512", name, NULL);
g_ptr_array_add (args, NULL);		g_ptr_array_add (args, NULL);
if (!g_spawn_sync (NULL, (char **) args->pdata, NULL,		if (!g_spawn_sync (NULL, (char **) args->pdata, NULL,
G_SPAWN_STDOUT_TO_DEV_NULL,		G_SPAWN_STDOUT_TO_DEV_NULL,
NULL, NULL, NULL, &err, &status, error))		NULL, NULL, NULL, &err, &status, error))
{		{
g_debug ("Icon validation: %s", (*error)->message);		g_info ("Icon validation: %s", (*error)->message);
return FALSE;		return FALSE;
}		}
if (!g_spawn_check_exit_status (status, NULL))		if (!g_spawn_check_exit_status (status, NULL))
{		{
g_debug ("Icon validation: %s", err);		g_info ("Icon validation: %s", err);
return flatpak_fail (error, "%s is not a valid icon: %s", name, err);		return flatpak_fail (error, "%s is not a valid icon: %s", name, err);
}		}
return TRUE;		return TRUE;
}		}
static gboolean		static gboolean
validate_exported_icons (GFile *export,		validate_exported_icons (GFile *export,
const char *app_id,		const char *app_id,
GError **error)		GError **error)
skipping to change at line 1154		skipping to change at line 1154
(opt_timestamp != NULL) ? ts.tv_sec : 0, cancellable, error))		(opt_timestamp != NULL) ? ts.tv_sec : 0, cancellable, error))
return FALSE;		return FALSE;
if (!opt_no_update_summary)		if (!opt_no_update_summary)
{		{
FlatpakRepoUpdateFlags flags = FLATPAK_REPO_UPDATE_FLAG_NONE;		FlatpakRepoUpdateFlags flags = FLATPAK_REPO_UPDATE_FLAG_NONE;
if (opt_no_summary_index)		if (opt_no_summary_index)
flags |= FLATPAK_REPO_UPDATE_FLAG_DISABLE_INDEX;		flags |= FLATPAK_REPO_UPDATE_FLAG_DISABLE_INDEX;
g_debug ("Updating summary");		g_info ("Updating summary");
if (!flatpak_repo_update (repo, flags,		if (!flatpak_repo_update (repo, flags,
(const char **) opt_gpg_key_ids,		(const char **) opt_gpg_key_ids,
opt_gpg_homedir,		opt_gpg_homedir,
cancellable,		cancellable,
error))		error))
goto out;		goto out;
}		}
format_size = g_format_size (stats.content_bytes_written);		format_size = g_format_size (stats.content_bytes_written);
End of changes. 4 change blocks.
4 lines changed or deleted		4 lines changed or added

---