marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Inherit min-percent-free-space from system repo into child repo 

This way you can at least work around the free space check in *some*
way.
See https://github.com/flatpak/flatpak/issues/975
tingping/wmclass
Alexander Larsson 2017-08-23 11:12:42 +02:00
parent 503b2f8b4c
commit 706d13895e
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/flatpak-dir.c
View File

@ -5370,12 +5370,16 @@ flatpak_dir_create_system_child_repo (FlatpakDir *self,
const char *mode_str = "bare-user";
g_autofree char *current_mode = NULL;
const char *mode_env = g_getenv ("FLATPAK_OSTREE_REPO_MODE");
GKeyFile *orig_config = NULL;
g_autofree char *orig_min_free_space_percent = NULL;
g_assert (!self->user);
if (!flatpak_dir_ensure_repo (self, NULL, error))
return NULL;
orig_config = ostree_repo_get_config (self->repo);
cache_dir = flatpak_ensure_user_cache_dir_location (error);
if (cache_dir == NULL)
return NULL;
@ -5441,6 +5445,11 @@ flatpak_dir_create_system_child_repo (FlatpakDir *self,
g_key_file_set_string (config, "core", "parent",
flatpak_file_get_path_cached (ostree_repo_get_path (self->repo)));
/* Copy the min space percent value so it affects the temporary repo too */
orig_min_free_space_percent = g_key_file_get_value (orig_config, "core", "min-free-space-percent", NULL);
if (orig_min_free_space_percent)
g_key_file_set_value (config, "core", "min-free-space-percent", orig_min_free_space_percent);
if (!ostree_repo_write_config (new_repo, config, error))
return NULL;