[ostree: 5/19] core: Prefer packed metadata

[Colin Walters <walters src gnome org>]

commit 4f95106cda74d6b71e69130d69e5ec8fa72eacd9
Author: Colin Walters <walters verbum org>
Date:   Mon May 14 22:23:01 2012 -0400

    core: Prefer packed metadata

 src/libostree/ostree-repo.c |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 9012cb8..f40c9a5 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -3975,14 +3975,7 @@ ostree_repo_load_variant (OstreeRepo  *self,
                          cancellable, error))
     goto out;
 
-  /* Prefer loose metadata for now */
-  if (object_path != NULL)
-    {
-      if (!ot_util_variant_map (object_path, ostree_metadata_variant_type (objtype),
-                                TRUE, &ret_variant, error))
-        goto out;
-    }
-  else if (pack_checksum != NULL)
+  if (pack_checksum != NULL)
     {
       if (!ostree_repo_map_pack_file (self, pack_checksum, TRUE, &pack_data, &pack_len,
                                       cancellable, error))
@@ -3994,6 +3987,12 @@ ostree_repo_load_variant (OstreeRepo  *self,
 
       g_variant_get_child (packed_object, 2, "v", &ret_variant);
     }
+  else if (object_path != NULL)
+    {
+      if (!ot_util_variant_map (object_path, ostree_metadata_variant_type (objtype),
+                                TRUE, &ret_variant, error))
+        goto out;
+    }
   else if (priv->parent_repo)
     {
       if (!ostree_repo_load_variant (priv->parent_repo, objtype, sha256, &ret_variant, error))