ahill/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-01-26 14:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix whitespace issues (remove TAB usage)

Browse Source 
Signed-off-by: Gunnar Andersson <gandersson@genivi.org>

Closes: #1107
Approved by: mwleeds
This commit is contained in:
Gunnar Andersson 2017-10-16 18:09:52 +02:00 committed by Atomic Bot
parent 87ed5378db
commit 98c21473fc
7 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -490,7 +490,7 @@ update_metadata (GFile *base, FlatpakContext *arg_context, gboolean is_runtime,
if (opt_extension_prio != G_MININT)
g_key_file_set_integer (keyfile, FLATPAK_METADATA_GROUP_EXTENSION_OF,
FLATPAK_METADATA_KEY_PRIORITY, opt_extension_prio);
FLATPAK_METADATA_KEY_PRIORITY, opt_extension_prio);
if (!g_key_file_save_to_file (keyfile, path, error))
goto out;

4
buildutil/tap-test
View File

@ -12,9 +12,9 @@ tempdir=$(mktemp -d /var/tmp/tap-test.XXXXXX)
touch ${tempdir}/.testtmp
function cleanup () {
if test -n "${TEST_SKIP_CLEANUP:-}"; then
echo "Skipping cleanup of ${tempdir}"
echo "Skipping cleanup of ${tempdir}"
else if test -f ${tempdir}/.testtmp; then
rm "${tempdir}" -rf
rm "${tempdir}" -rf
fi
fi
}

6
common/flatpak-run.c
View File

@ -2014,7 +2014,7 @@ flatpak_run_add_x11_args (GPtrArray *argv_array,
FILE *output = fdopen (xauth_tmpf.fd, "wb");
if (output != NULL)
{
/* fd is now owned by output, steal it from the tmpfile */
/* fd is now owned by output, steal it from the tmpfile */
int tmp_fd = dup (glnx_steal_fd (&xauth_tmpf.fd));
if (tmp_fd != -1)
{
@ -3804,10 +3804,10 @@ flatpak_run_add_app_info_args (GPtrArray *argv_array,
GArray *fd_array,
GFile *app_files,
GVariant *app_deploy_data,
const char *app_extensions,
const char *app_extensions,
GFile *runtime_files,
GVariant *runtime_deploy_data,
const char *runtime_extensions,
const char *runtime_extensions,
const char *app_id,
const char *app_branch,
const char *runtime_ref,

4
common/flatpak-run.h
View File

@ -204,10 +204,10 @@ gboolean flatpak_run_add_app_info_args (GPtrArray *argv_array,
GArray *fd_array,
GFile *app_files,
GVariant *app_deploy_data,
const char *app_extensions,
const char *app_extensions,
GFile *runtime_files,
GVariant *runtime_deploy_data,
const char *runtime_extensions,
const char *runtime_extensions,
const char *app_id,
const char *app_branch,
const char *runtime_ref,

12
common/flatpak-utils.c
View File

@ -4156,7 +4156,7 @@ flatpak_extension_new (const char *id,
const char *subdir_suffix,
char **merge_dirs,
GFile *files,
GFile *deploy_dir,
GFile *deploy_dir,
gboolean is_unmaintained)
{
FlatpakExtension *ext = g_new0 (FlatpakExtension, 1);
@ -4176,7 +4176,7 @@ flatpak_extension_new (const char *id,
{
deploy_data = flatpak_load_deploy_data (deploy_dir, NULL, NULL);
if (deploy_data)
ext->commit = g_strdup (flatpak_deploy_data_get_commit (deploy_data));
ext->commit = g_strdup (flatpak_deploy_data_get_commit (deploy_data));
}
if (is_unmaintained)
@ -4297,11 +4297,11 @@ add_extension (GKeyFile *metakey,
{
g_autofree char *extended_dir = g_build_filename (directory, refs[j] + strlen (prefix), NULL);
g_autofree char *dir_ref = g_build_filename ("runtime", refs[j], arch, branch, NULL);
g_autoptr(GFile) subdir_deploy_dir = NULL;
g_autoptr(GFile) subdir_deploy_dir = NULL;
g_autoptr(GFile) subdir_files = NULL;
subdir_deploy_dir = flatpak_find_deploy_dir_for_ref (dir_ref, NULL, NULL, NULL);
if (subdir_deploy_dir)
subdir_files = g_file_get_child (subdir_deploy_dir, "files");
subdir_deploy_dir = flatpak_find_deploy_dir_for_ref (dir_ref, NULL, NULL, NULL);
if (subdir_deploy_dir)
subdir_files = g_file_get_child (subdir_deploy_dir, "files");
if (subdir_files && flatpak_extension_matches_reason (refs[j], enable_if, TRUE))
{

26
dbus-proxy/flatpak-proxy.c
View File

@ -2058,10 +2058,10 @@ got_buffer_from_client (FlatpakProxyClient *client, ProxySide *side, Buffer *buf
case HANDLE_PASS:
handle_pass:
if (client_message_generates_reply (header))
{
if (expecting_reply == EXPECTED_REPLY_NONE)
expecting_reply = EXPECTED_REPLY_NORMAL;
}
{
if (expecting_reply == EXPECTED_REPLY_NONE)
expecting_reply = EXPECTED_REPLY_NORMAL;
}
break;
@ -2083,7 +2083,7 @@ handle_hide:
error = "org.freedesktop.DBus.Error.ServiceUnknown";
buffer = get_error_for_roundtrip (client, header, error);
expecting_reply = EXPECTED_REPLY_REWRITE;
expecting_reply = EXPECTED_REPLY_REWRITE;
}
else
{
@ -2103,8 +2103,8 @@ handle_deny:
g_print ("*DENIED* (ping)\n");
buffer = get_error_for_roundtrip (client, header,
"org.freedesktop.DBus.Error.AccessDenied");
expecting_reply = EXPECTED_REPLY_REWRITE;
"org.freedesktop.DBus.Error.AccessDenied");
expecting_reply = EXPECTED_REPLY_REWRITE;
}
else
{
@ -2272,12 +2272,12 @@ got_buffer_from_bus (FlatpakProxyClient *client, ProxySide *side, Buffer *buffer
}
/* We filter all NameOwnerChanged signal according to the policy */
if (message_is_name_owner_changed (client, header))
{
if (should_filter_name_owner_changed (client, buffer))
g_clear_pointer (&buffer, buffer_unref);
}
}
if (message_is_name_owner_changed (client, header))
{
if (should_filter_name_owner_changed (client, buffer))
g_clear_pointer (&buffer, buffer_unref);
}
}
/* All incoming broadcast signals are filtered according to policy */
if (header->type == G_DBUS_MESSAGE_TYPE_SIGNAL && header->destination == NULL)

14
tests/libtest.sh
View File

@ -19,15 +19,15 @@
# Boston, MA 02111-1307, USA.
if [ -n "${G_TEST_SRCDIR:-}" ]; then
test_srcdir="${G_TEST_SRCDIR}"
test_srcdir="${G_TEST_SRCDIR}"
else
test_srcdir=$(dirname $0)
test_srcdir=$(dirname $0)
fi
if [ -n "${G_TEST_BUILDDIR:-}" ]; then
test_builddir="${G_TEST_BUILDDIR}"
test_builddir="${G_TEST_BUILDDIR}"
else
test_builddir=$(dirname $0)
test_builddir=$(dirname $0)
fi
assert_not_reached () {
@ -42,8 +42,8 @@ test_tmpdir=$(pwd)
if ! test -f .testtmp; then
files=$(ls)
if test -n "${files}"; then
ls -l
assert_not_reached "test tmpdir=${test_tmpdir} is not empty; run this test via \`make check TESTS=\`, not directly"
ls -l
assert_not_reached "test tmpdir=${test_tmpdir} is not empty; run this test via \`make check TESTS=\`, not directly"
fi
# Remember that this is an acceptable test $(pwd), for the benefit of
# C and JS tests which may source this file again
@ -151,7 +151,7 @@ assert_file_has_mode () {
assert_not_has_dir () {
if test -d "$1"; then
echo 1>&2 "Directory '$1' exists"; exit 1
echo 1>&2 "Directory '$1' exists"; exit 1
fi
}