diff options
| author | Colin Walters <walters@verbum.org> | 2012-04-11 15:18:34 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2012-04-11 22:27:59 -0400 |
| commit | 38ef75e6e04f7ec19844f9a1c178e6066682d13d (patch) | |
| tree | 0fae1911e95124d61cd272ac34302676f56c72bf /src/ostree/ot-builtin-show.c | |
| parent | f15c1845842bd892add6c4524410f696a152b962 (diff) | |
| download | ostree-38ef75e6e04f7ec19844f9a1c178e6066682d13d.tar.gz | |
core: Re-unify on one OSTREE_OBJECT_TYPE_FILE
Having the archived vs not distinction in the object system wasn't
useful in light of pack files. In fact, we should probably move
towards generating a pack file per commit by default.
Diffstat (limited to 'src/ostree/ot-builtin-show.c')
| -rw-r--r-- | src/ostree/ot-builtin-show.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/ostree/ot-builtin-show.c b/src/ostree/ot-builtin-show.c index 6711981f..ea85cc1a 100644 --- a/src/ostree/ot-builtin-show.c +++ b/src/ostree/ot-builtin-show.c @@ -91,7 +91,7 @@ show_repo_meta (OstreeRepo *repo, ot_lobj GFile *object_path = NULL; ot_lobj GInputStream *in = NULL; - for (objtype = OSTREE_OBJECT_TYPE_RAW_FILE; objtype <= OSTREE_OBJECT_TYPE_COMMIT; objtype++) + for (objtype = OSTREE_OBJECT_TYPE_FILE; objtype <= OSTREE_OBJECT_TYPE_COMMIT; objtype++) { g_clear_object (&object_path); @@ -109,7 +109,7 @@ show_repo_meta (OstreeRepo *repo, print_variant (variant); break; } - else if (objtype == OSTREE_OBJECT_TYPE_RAW_FILE) + else if (objtype == OSTREE_OBJECT_TYPE_FILE) { in = (GInputStream*)g_file_read (object_path, NULL, error); if (!in) @@ -121,12 +121,6 @@ show_repo_meta (OstreeRepo *repo, g_print ("%s", buf); } while (bytes_read > 0); } - else if (objtype == OSTREE_OBJECT_TYPE_ARCHIVED_FILE_CONTENT) - { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, - "Can't show archived files yet"); - goto out; - } else g_assert_not_reached (); } |