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

main: Fix previous commit to find repo in cwd over /ostree/repo 

The tests when run inside gnome-ostree broke, and this is better
behavior.
This commit is contained in:
Colin Walters 2013-07-24 14:46:53 -04:00
parent 187c75eae5
commit 89430bbe71
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,11 +110,6 @@ 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)
repo = argv[1] + strlen ("--repo=");
else if (g_file_test (host_repo_path, G_FILE_TEST_EXISTS))
repo = host_repo_path;
if (!have_repo_arg) if (!have_repo_arg)
{ {
arg_off = 2; arg_off = 2;
@ -143,13 +138,15 @@ ostree_run (int argc,
g_set_prgname (g_strdup_printf ("ostree %s", cmd)); g_set_prgname (g_strdup_printf ("ostree %s", cmd));
if (repo == NULL && !(command->flags & OSTREE_BUILTIN_FLAG_NO_REPO)) if (!(command->flags & OSTREE_BUILTIN_FLAG_NO_REPO))
{ {
if (g_file_test ("objects", G_FILE_TEST_IS_DIR) if (have_repo_arg)
repo = argv[1] + strlen ("--repo=");
else if (g_file_test ("objects", G_FILE_TEST_IS_DIR)
&& g_file_test ("config", G_FILE_TEST_IS_REGULAR)) && g_file_test ("config", G_FILE_TEST_IS_REGULAR))
{
repo = "."; repo = ".";
} else if (g_file_test (host_repo_path, G_FILE_TEST_EXISTS))
repo = host_repo_path;
else else
{ {
g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED, g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED,