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

main: Don't look for /sysroot/ostree too 

No longer necessary now that we expect OS/ trees to have
/ostree -> /sysroot/ostree.
This commit is contained in:
Colin Walters 2013-07-10 18:13:55 -04:00
parent 124416d832
commit be2bebaf3e
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,7 +97,6 @@ ostree_run (int argc,
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"; const char *host_repo_path = "/ostree/repo";
GFile *repo_file = NULL; GFile *repo_file = NULL;
int arg_off; int arg_off;
@ -128,16 +127,9 @@ ostree_run (int argc,
have_repo_arg = g_str_has_prefix (argv[1], "--repo="); have_repo_arg = g_str_has_prefix (argv[1], "--repo=");
if (have_repo_arg) if (have_repo_arg)
{
repo = argv[1] + strlen ("--repo="); repo = argv[1] + strlen ("--repo=");
}
else
{
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)) else if (g_file_test (host_repo_path, G_FILE_TEST_EXISTS))
repo = host_repo_path; repo = host_repo_path;
}
if (repo) if (repo)
repo_file = g_file_new_for_path (repo); repo_file = g_file_new_for_path (repo);