Change id reporting API to return ExitCode

Because this API only errors when write!() errors occur, we can return
the exit code as an error here.

This way the user of the API can immediately exit if there was an IO
error, but the API automatically takes care of the right return value,
returning (exiting) with zero (0) if there was an "Broken pipe" error
and with one (1) otherwise, which is the expected behaviour here.

All calls to that API were changed accordingly.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

1 files changed, 4 insertions, 10 deletions

diff --git a/bin/domain/imag-habit/src/main.rs b/bin/domain/imag-habit/src/main.rs
index 5c7f8a75..3a822ee3 100644
--- a/bin/domain/imag-habit/src/main.rs
+++ b/bin/domain/imag-habit/src/main.rs
@@ -155,7 +155,7 @@ fn create(rt: &Runtime) {
     debug!("Builder = {:?}", hb);
 
     let fle = hb.build(rt.store()).map_err_trace_exit_unwrap(1);
-    let _   = rt.report_touched(fle.get_location()).map_err_trace_exit_unwrap(1);
+    let _   = rt.report_touched(fle.get_location()).unwrap_or_exit();
 }
 
 fn delete(rt: &Runtime) {
@@ -441,9 +441,7 @@ fn list(rt: &Runtime) {
             let mut list = lister_fn(&e);
 
             {
-                let _ = rt
-                    .report_touched(e.get_location())
-                    .map_err_trace_exit_unwrap(1);
+                let _ = rt.report_touched(e.get_location()).unwrap_or_exit();
             }
 
             v.append(&mut list);
@@ -520,9 +518,7 @@ fn show(rt: &Runtime) {
                     let mut instances = instance_lister_fn(&e);
 
                     {
-                        let _ = rt
-                            .report_touched(e.get_location())
-                            .map_err_trace_exit_unwrap(1);
+                        let _ = rt.report_touched(e.get_location()).unwrap_or_exit();
                     }
 
                     v.append(&mut instances);
@@ -582,9 +578,7 @@ fn done(rt: &Runtime) {
         }
 
         {
-            let _ = rt
-                .report_touched(r.get_location())
-                .map_err_trace_exit_unwrap(1);
+            let _ = rt.report_touched(r.get_location()).unwrap_or_exit();
         }
 
     }