packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

repo: Simplify sign_data() a little 

Use ot_gpgme_data_output() to wrapper a GOutputStream.
This commit is contained in:
Matthew Barnes 2015-05-07 17:50:22 -04:00
parent 239f05ecdd
commit d0edf63346
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libostree/ostree-repo.c
View File

@ -3108,7 +3108,6 @@ sign_data (OstreeRepo *self,
gpgme_key_t key = NULL;
gpgme_data_t commit_buffer = NULL;
gpgme_data_t signature_buffer = NULL;
int signature_fd = -1;
GMappedFile *signature_file = NULL;
if (!gs_file_open_in_tmpdir (self->tmp_dir, 0644,
@ -3179,22 +3178,9 @@ sign_data (OstreeRepo *self,
goto out;
}
}
signature_fd = g_file_descriptor_based_get_fd ((GFileDescriptorBased*)tmp_signature_output);
if (signature_fd < 0)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Unable to open signature file");
goto out;
}
if ((err = gpgme_data_new_from_fd (&signature_buffer, signature_fd)) != GPG_ERR_NO_ERROR)
{
ot_gpgme_error_to_gio_error (err, error);
g_prefix_error (error, "Failed to create buffer for signature file: ");
goto out;
}
signature_buffer = ot_gpgme_data_output (tmp_signature_output);
if ((err = gpgme_op_sign (context, commit_buffer, signature_buffer, GPGME_SIG_MODE_DETACH))
!= GPG_ERR_NO_ERROR)
{