Regenerate main crate

This commit is contained in:
Felix Krull 2019-08-28 23:25:35 +02:00 committed by Colin Walters
parent 377b7ae202
commit e6a1fddc8c
3 changed files with 18 additions and 2 deletions

View File

@ -69,6 +69,8 @@ pub enum GpgSignatureAttr {
UserName,
UserEmail,
FingerprintPrimary,
KeyExpTimestamp,
KeyExpTimestampPrimary,
#[doc(hidden)]
__Unknown(i32),
}
@ -89,6 +91,8 @@ impl fmt::Display for GpgSignatureAttr {
GpgSignatureAttr::UserName => "UserName",
GpgSignatureAttr::UserEmail => "UserEmail",
GpgSignatureAttr::FingerprintPrimary => "FingerprintPrimary",
GpgSignatureAttr::KeyExpTimestamp => "KeyExpTimestamp",
GpgSignatureAttr::KeyExpTimestampPrimary => "KeyExpTimestampPrimary",
_ => "Unknown",
})
}
@ -113,6 +117,8 @@ impl ToGlib for GpgSignatureAttr {
GpgSignatureAttr::UserName => ostree_sys::OSTREE_GPG_SIGNATURE_ATTR_USER_NAME,
GpgSignatureAttr::UserEmail => ostree_sys::OSTREE_GPG_SIGNATURE_ATTR_USER_EMAIL,
GpgSignatureAttr::FingerprintPrimary => ostree_sys::OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT_PRIMARY,
GpgSignatureAttr::KeyExpTimestamp => ostree_sys::OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP,
GpgSignatureAttr::KeyExpTimestampPrimary => ostree_sys::OSTREE_GPG_SIGNATURE_ATTR_KEY_EXP_TIMESTAMP_PRIMARY,
GpgSignatureAttr::__Unknown(value) => value
}
}
@ -135,6 +141,8 @@ impl FromGlib<ostree_sys::OstreeGpgSignatureAttr> for GpgSignatureAttr {
10 => GpgSignatureAttr::UserName,
11 => GpgSignatureAttr::UserEmail,
12 => GpgSignatureAttr::FingerprintPrimary,
13 => GpgSignatureAttr::KeyExpTimestamp,
14 => GpgSignatureAttr::KeyExpTimestampPrimary,
value => GpgSignatureAttr::__Unknown(value),
}
}

View File

@ -60,7 +60,7 @@ pub trait MutableTreeExt: 'static {
fn get_metadata_checksum(&self) -> Option<GString>;
//fn get_subdirs(&self) -> /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 28 }/TypeId { ns_id: 1, id: 37 };
//fn get_subdirs(&self) -> /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 28 }/TypeId { ns_id: 1, id: 38 };
fn lookup(&self, name: &str) -> Result<(GString, MutableTree), Error>;
@ -122,7 +122,7 @@ impl<O: IsA<MutableTree>> MutableTreeExt for O {
}
}
//fn get_subdirs(&self) -> /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 28 }/TypeId { ns_id: 1, id: 37 } {
//fn get_subdirs(&self) -> /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 28 }/TypeId { ns_id: 1, id: 38 } {
// unsafe { TODO: call ostree_sys:ostree_mutable_tree_get_subdirs() }
//}

View File

@ -848,6 +848,14 @@ impl Repo {
}
}
pub fn write_archive_to_mtree_from_fd<P: IsA<MutableTree>, Q: IsA<gio::Cancellable>>(&self, fd: i32, mtree: &P, modifier: Option<&RepoCommitModifier>, autocreate_parents: bool, cancellable: Option<&Q>) -> Result<(), Error> {
unsafe {
let mut error = ptr::null_mut();
let _ = ostree_sys::ostree_repo_write_archive_to_mtree_from_fd(self.to_glib_none().0, fd, mtree.as_ref().to_glib_none().0, modifier.to_glib_none().0, autocreate_parents.to_glib(), cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error);
if error.is_null() { Ok(()) } else { Err(from_glib_full(error)) }
}
}
pub fn write_commit<P: IsA<RepoFile>, Q: IsA<gio::Cancellable>>(&self, parent: Option<&str>, subject: Option<&str>, body: Option<&str>, metadata: Option<&glib::Variant>, root: &P, cancellable: Option<&Q>) -> Result<GString, Error> {
unsafe {
let mut out_commit = ptr::null_mut();