50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From 5a83c73ed859fe3e4bd93a228a4bc8981d649c5e Mon Sep 17 00:00:00 2001
|
|
From: Simon McVittie <smcv@collabora.com>
|
|
Date: Thu, 27 Aug 2020 18:01:12 +0100
|
|
Subject: [PATCH] context: Implement MODE_NONE in unparse_filesystem_flags
|
|
|
|
flatpak doesn't yet use -Wswitch-enum, but perhaps it should at some
|
|
point. Now that FLATPAK_FILESYSTEM_MODE_NONE is a member of the enum,
|
|
it should be handled; and if we're doing that, we might as well make
|
|
the same function fully responsible for it.
|
|
|
|
Signed-off-by: Simon McVittie <smcv@collabora.com>
|
|
|
|
Conflict:NA
|
|
Reference:https://github.com/flatpak/flatpak/commit/5a83c73ed859fe3e4bd93a228a4bc8981d649c5e
|
|
|
|
---
|
|
common/flatpak-context.c | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/common/flatpak-context.c b/common/flatpak-context.c
|
|
index 3a99646..0d53b13 100644
|
|
--- a/common/flatpak-context.c
|
|
+++ b/common/flatpak-context.c
|
|
@@ -697,6 +697,10 @@ unparse_filesystem_flags (const char *path,
|
|
case FLATPAK_FILESYSTEM_MODE_READ_WRITE:
|
|
break;
|
|
|
|
+ case FLATPAK_FILESYSTEM_MODE_NONE:
|
|
+ g_string_insert_c (s, 0, '!');
|
|
+ break;
|
|
+
|
|
default:
|
|
g_warning ("Unexpected filesystem mode %d", mode);
|
|
break;
|
|
@@ -1677,10 +1681,7 @@ flatpak_context_save_metadata (FlatpakContext *context,
|
|
{
|
|
FlatpakFilesystemMode mode = GPOINTER_TO_INT (value);
|
|
|
|
- if (mode != FLATPAK_FILESYSTEM_MODE_NONE)
|
|
- g_ptr_array_add (array, unparse_filesystem_flags (key, mode));
|
|
- else
|
|
- g_ptr_array_add (array, g_strconcat ("!", key, NULL));
|
|
+ g_ptr_array_add (array, unparse_filesystem_flags (key, mode));
|
|
}
|
|
|
|
g_key_file_set_string_list (metakey,
|
|
--
|
|
2.27.0
|
|
|