mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-05-19 14:22:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

common/dir: Port to min-free-space-size

Browse Source 
Use min-free-space-size as a replacement for min-free-space-percent.

Previously, flatpak used to disable min-free-space-percent by re-writing
the config with min-free-space-percent=0. As the new version of ostree (2018.7)
now supports min-free-space-size, we should use that and migrate from -percent
option in existing repos to -size=500MB.

Config is rewritten with min-free-space-size in case of:
1) It has min-free-space-percent=0 only. (That is probably from the
   previous re-writes).
2) If there are no min-free-space-* options.

Other than that, the config remains unchanged and the co-existence(if any)
of these options is governed by ostree.

https://github.com/flatpak/flatpak/issues/1826

Closes: #1912
Approved by: alexlarsson
This commit is contained in:
Umang Jain
2018-07-18 13:22:20 +05:30
committed by Atomic Bot
parent d34d117ae4
commit 13610e3ed3
2 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
common/flatpak-dir.c
View File

@@ -2193,20 +2193,51 @@ _flatpak_dir_ensure_repo (FlatpakDir *self,
}
}
/* Reset min-free-space-percent to 0, this keeps being a problem for a lot of people */
/* Earlier flatpak used to reset min-free-space-percent to 0 everytime, but now we
* favor min-free-space-size instead of it (See below).
*/
if (!flatpak_dir_use_system_helper (self, NULL))
{
GKeyFile *orig_config = NULL;
g_autoptr(GKeyFile) new_config = NULL;
g_autofree char *orig_min_free_space_percent = NULL;
g_autofree char *orig_min_free_space_size = NULL;
const char *min_free_space_size = "500MB";
guint64 min_free_space_percent_int;
orig_config = ostree_repo_get_config (repo);
orig_min_free_space_percent = g_key_file_get_value (orig_config, "core", "min-free-space-percent", NULL);
if (orig_min_free_space_percent == NULL)
{
g_autoptr(GKeyFile) config = ostree_repo_copy_config (repo);
orig_min_free_space_size = g_key_file_get_value (orig_config, "core", "min-free-space-size", NULL);
g_key_file_set_string (config, "core", "min-free-space-percent", "0");
if (!ostree_repo_write_config (repo, config, error))
if (orig_min_free_space_size == NULL)
new_config = ostree_repo_copy_config (repo);
/* Scrap previously written min-free-space-percent=0 and replace it with min-free-space-size */
if (orig_min_free_space_size == NULL &&
orig_min_free_space_percent != NULL &&
flatpak_utils_ascii_string_to_unsigned (orig_min_free_space_percent, 10,
0, G_MAXUINT64,
&min_free_space_percent_int, &my_error))
{
if (min_free_space_percent_int == 0)
{
g_key_file_remove_key (new_config, "core", "min-free-space-percent", NULL);
g_key_file_set_string (new_config, "core", "min-free-space-size", min_free_space_size);
}
}
else if (my_error != NULL)
{
g_propagate_error (error, g_steal_pointer (&my_error));
return FALSE;
}
if (orig_min_free_space_size == NULL &&
orig_min_free_space_percent == NULL)
g_key_file_set_string (new_config, "core", "min-free-space-size", min_free_space_size);
if (new_config != NULL)
{
if (!ostree_repo_write_config (repo, new_config, error))
return FALSE;
if (!ostree_repo_reload_config (repo, cancellable, error))

2
configure.ac
View File

@@ -31,7 +31,7 @@ AC_INIT([Flatpak],
GLIB_REQS=2.44
SYSTEM_BWRAP_REQS=0.2.1
OSTREE_REQS=2018.6
OSTREE_REQS=2018.7
AC_USE_SYSTEM_EXTENSIONS
AC_SYS_LARGEFILE