mirror of
https://github.com/flatpak/flatpak.git
synced 2026-06-19 22:11:01 -04:00
Handle FLATPAK_CONFIG_DIR/remotes.d not existing
OSTree does not like being given a nonexisting directory here, so check and pass NULL if thats the case. Closes: #2534 Approved by: alexlarsson
This commit is contained in:
committed by
Atomic Bot
parent
3f717cfb83
commit
7ba9af1e24
@@ -61,6 +61,7 @@
|
||||
|
||||
#define SYSCONF_INSTALLATIONS_DIR "installations.d"
|
||||
#define SYSCONF_INSTALLATIONS_FILE_EXT ".conf"
|
||||
#define SYSCONF_REMOTES_DIR "remotes.d"
|
||||
|
||||
#define SYSTEM_DIR_DEFAULT_ID "default"
|
||||
#define SYSTEM_DIR_DEFAULT_DISPLAY_NAME "Default system directory"
|
||||
@@ -1516,11 +1517,14 @@ system_ostree_repo_new (GFile *repodir)
|
||||
|
||||
config_dir = g_strdup_printf ("%s/%s",
|
||||
get_config_dir_location (),
|
||||
"/remotes.d");
|
||||
SYSCONF_REMOTES_DIR);
|
||||
|
||||
return g_object_new (OSTREE_TYPE_REPO, "path", repodir,
|
||||
"remotes-config-dir",
|
||||
config_dir,
|
||||
if (!g_file_test (config_dir, G_FILE_TEST_IS_DIR))
|
||||
g_clear_pointer (&config_dir, g_free);
|
||||
|
||||
return g_object_new (OSTREE_TYPE_REPO,
|
||||
"path", repodir,
|
||||
"remotes-config-dir", config_dir,
|
||||
NULL);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user