rustifying dc_continue_key_transfer and fix master-conflict

This commit is contained in:
holger krekel
2019-09-25 17:19:44 +02:00
parent d5383aecc9
commit 6cd3580263
4 changed files with 27 additions and 39 deletions

View File

@@ -446,9 +446,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
!arg1.is_empty() && !arg2.is_empty(),
"Arguments <msg-id> <setup-code> expected"
);
if !dc_continue_key_transfer(context, arg1.parse()?, &arg2) {
bail!("Continue key transfer failed");
}
dc_continue_key_transfer(context, arg1.parse()?, &arg2)?;
}
"has-backup" => {
dc_imex_has_backup(context, blobdir)?;