lib/repo: Minor cleanup to object import function

We have a lot of layers of abstraction here; let's fold in the `trusted`
conditional into the call, since that's all the public API we're using does
anyways.

Prep for a future patch around object copying during imports.

Closes: #1187
Approved by: jlebon

src/libostree/ostree-repo.c

@@ -3598,24 +3598,13 @@ ostree_repo_import_object_from_with_trust (OstreeRepo           *self,
                                      &variant, error))
         return FALSE;
 
-      if (trusted)
-        {
-          if (!ostree_repo_write_metadata_trusted (self, objtype,
-                                                   checksum, variant,
-                                                   cancellable, error))
-            return FALSE;
-        }
-      else
-        {
       g_autofree guchar *real_csum = NULL;
-
       if (!ostree_repo_write_metadata (self, objtype,
                                        checksum, variant,
-                                           &real_csum,
+                                       trusted ? NULL : &real_csum,
                                        cancellable, error))
         return FALSE;
     }
-    }
   else
     {
       /* Content object */
@@ -3627,23 +3616,13 @@ ostree_repo_import_object_from_with_trust (OstreeRepo           *self,
                                            cancellable, error))
         return FALSE;
 
-      if (trusted)
-        {
-          if (!ostree_repo_write_content_trusted (self, checksum,
-                                                  object_stream, length,
-                                                  cancellable, error))
-            return FALSE;
-        }
-      else
-        {
       g_autofree guchar *real_csum = NULL;
       if (!ostree_repo_write_content (self, checksum,
                                       object_stream, length,
-                                          &real_csum,
+                                      trusted ? NULL : &real_csum,
                                       cancellable, error))
         return FALSE;
     }
-    }
 
   return TRUE;
 }