packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: Use default /sysroot/ostree/repo or just /ostree/repo as appropriate 

The old logic was just weird, special casing root, and we can easily
autodetect the case where we need /ostree/repo.
This commit is contained in:
Colin Walters 2013-02-24 10:00:23 -05:00
parent 02217ba74a
commit 202c5e35c9
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ostree/ot-main.c
View File

@ -84,12 +84,13 @@ ostree_run (int argc,
GError *error = NULL; GError *error = NULL;
int cmd_argc; int cmd_argc;
char **cmd_argv = NULL; char **cmd_argv = NULL;
gboolean am_root;
gboolean have_repo_arg; gboolean have_repo_arg;
const char *binname = NULL; const char *binname = NULL;
const char *slash = NULL; const char *slash = NULL;
const char *cmd = NULL; const char *cmd = NULL;
const char *repo = NULL; const char *repo = NULL;
const char *sysroot_repo_path = "/sysroot/ostree/repo";
const char *host_repo_path = "/ostree/repo";
GFile *repo_file = NULL; GFile *repo_file = NULL;
int arg_off; int arg_off;
@ -103,15 +104,19 @@ ostree_run (int argc,
if (argc < 2) if (argc < 2)
return ostree_usage (argv, commands, TRUE); return ostree_usage (argv, commands, TRUE);
am_root = getuid () == 0;
have_repo_arg = g_str_has_prefix (argv[1], "--repo="); have_repo_arg = g_str_has_prefix (argv[1], "--repo=");
if (!have_repo_arg && am_root) if (have_repo_arg)
repo = "/sysroot/ostree/repo"; {
else if (have_repo_arg) repo = argv[1] + strlen ("--repo=");
repo = argv[1] + strlen ("--repo="); }
else else
repo = NULL; {
if (g_file_test (sysroot_repo_path, G_FILE_TEST_EXISTS))
repo = sysroot_repo_path;
else if (g_file_test (host_repo_path, G_FILE_TEST_EXISTS))
repo = host_repo_path;
}
if (repo) if (repo)
repo_file = g_file_new_for_path (repo); repo_file = g_file_new_for_path (repo);