matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Fix for broken pipe errors

Browse source
This commit is contained in:
Matthias Beyer 2018-02-14 18:03:01 +01:00
parent 013fc75d85
commit eb2f6fbbe2
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bin/domain/imag-contact/src/main.rs
View file

@ -52,6 +52,7 @@ extern crate libimagentryedit;
use std::process::exit; use std::process::exit;
use std::path::PathBuf; use std::path::PathBuf;
use std::io::Write;
use handlebars::Handlebars; use handlebars::Handlebars;
use clap::ArgMatches; use clap::ArgMatches;
@ -63,6 +64,8 @@ use libimagrt::runtime::Runtime;
use libimagrt::setup::generate_runtime_setup; use libimagrt::setup::generate_runtime_setup;
use libimagerror::str::ErrFromStr; use libimagerror::str::ErrFromStr;
use libimagerror::trace::MapErrTrace; use libimagerror::trace::MapErrTrace;
use libimagerror::io::ToExitCode;
use libimagerror::exit::ExitUnwrap;
use libimagcontact::store::ContactStore; use libimagcontact::store::ContactStore;
use libimagcontact::error::ContactError as CE; use libimagcontact::error::ContactError as CE;
use libimagcontact::contact::Contact; use libimagcontact::contact::Contact;
@ -105,6 +108,7 @@ fn main() {
fn list(rt: &Runtime) { fn list(rt: &Runtime) {
let scmd = rt.cli().subcommand_matches("list").unwrap(); let scmd = rt.cli().subcommand_matches("list").unwrap();
let list_format = get_contact_print_format("contact.list_format", rt, &scmd); let list_format = get_contact_print_format("contact.list_format", rt, &scmd);
let mut out = ::std::io::stdout();
let _ = rt let _ = rt
.store() .store()
@ -138,7 +142,8 @@ fn list(rt: &Runtime) {
.err_from_str() .err_from_str()
.map_err(CE::from) .map_err(CE::from)
.map_err_trace_exit_unwrap(1); .map_err_trace_exit_unwrap(1);
println!("{}", s);
writeln!(out, "{}", s).to_exit_code().unwrap_or_exit()
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
} }
@ -206,7 +211,7 @@ fn show(rt: &Runtime) {
.err_from_str() .err_from_str()
.map_err(CE::from) .map_err(CE::from)
.map_err_trace_exit_unwrap(1); .map_err_trace_exit_unwrap(1);
println!("{}", s); let _ = writeln!(::std::io::stdout(), "{}", s).to_exit_code().unwrap_or_exit();
} }
fn get_contact_print_format(config_value_path: &'static str, rt: &Runtime, scmd: &ArgMatches) -> Handlebars { fn get_contact_print_format(config_value_path: &'static str, rt: &Runtime, scmd: &ArgMatches) -> Handlebars {