Merge pull request #2213 from alexlarsson/summary-bugfixes

Various fixes from the indexed-summaries branch
ostreedev · Oct 8, 2020 · a13509e · a13509e
2 parents cc1c26f + 2e9db80
commit a13509e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
@@ -5372,8 +5372,8 @@ find_remotes_cb (GObject      *obj,
 
       /* Check the metadata in the summary file, especially whether it contains
        * all the @refs we are interested in. */
-      summary_v = g_variant_new_from_bytes (OSTREE_SUMMARY_GVARIANT_FORMAT,
-                                            summary_bytes, FALSE);
+      summary_v = g_variant_ref_sink (g_variant_new_from_bytes (OSTREE_SUMMARY_GVARIANT_FORMAT,
+                                                                summary_bytes, FALSE));
 
       /* Check the summary’s additional metadata and set up @commit_metadata
        * and @refs_and_remotes_table with the refs listed in the summary file,
@@ -6127,7 +6127,7 @@ ostree_repo_remote_fetch_summary_with_options (OstreeRepo    *self,
       (void) g_variant_lookup (options, "override-url", "&s", &url_override);
       (void) g_variant_lookup (options, "http-headers", "@a(ss)", &extra_headers);
       (void) g_variant_lookup (options, "append-user-agent", "&s", &append_user_agent);
-      (void) g_variant_lookup (options, "n-network-retries", "&u", &n_network_retries);
+      (void) g_variant_lookup (options, "n-network-retries", "u", &n_network_retries);
     }
 
   if (!ostree_repo_remote_get_gpg_verify_summary (self, name, &gpg_verify_summary, error))

diff --git a/src/libostree/ostree-sign.c b/src/libostree/ostree-sign.c
@@ -365,7 +365,7 @@ _sign_detached_metadata_append (OstreeSign *self,
                                signature_key,
                                g_variant_builder_end (signature_builder));
 
-  return  g_variant_dict_end (&metadata_dict);
+  return  g_variant_ref_sink (g_variant_dict_end (&metadata_dict));
 }
 
 /**