[ostree] main: Don't look for /sysroot/ostree too
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] main: Don't look for /sysroot/ostree too
- Date: Thu, 11 Jul 2013 00:33:13 +0000 (UTC)
commit be2bebaf3e3000ee64d1fcd71a18006e7141b22c
Author: Colin Walters <walters verbum org>
Date: Wed Jul 10 18:13:55 2013 -0400
main: Don't look for /sysroot/ostree too
No longer necessary now that we expect OS/ trees to have
/ostree -> /sysroot/ostree.
src/ostree/ot-main.c | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c
index 54c2398..5e297eb 100644
--- a/src/ostree/ot-main.c
+++ b/src/ostree/ot-main.c
@@ -97,7 +97,6 @@ ostree_run (int argc,
const char *slash = NULL;
const char *cmd = NULL;
const char *repo = NULL;
- const char *sysroot_repo_path = "/sysroot/ostree/repo";
const char *host_repo_path = "/ostree/repo";
GFile *repo_file = NULL;
int arg_off;
@@ -128,16 +127,9 @@ ostree_run (int argc,
have_repo_arg = g_str_has_prefix (argv[1], "--repo=");
if (have_repo_arg)
- {
- 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))
- repo = host_repo_path;
- }
+ repo = argv[1] + strlen ("--repo=");
+ else if (g_file_test (host_repo_path, G_FILE_TEST_EXISTS))
+ repo = host_repo_path;
if (repo)
repo_file = g_file_new_for_path (repo);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]