Merge branch 'error-output'

3 files changed, 5 insertions, 11 deletions

diff --git a/src/package/script.rs b/src/package/script.rs
index 9935ee2..30b198f 100644
--- a/src/package/script.rs
+++ b/src/package/script.rs
@@ -232,7 +232,9 @@ impl<'a> ScriptBuilder<'a> {
         hb.register_helper("join", Box::new(JoinHelper));
         hb.register_helper("joinwith", Box::new(JoinWithHelper));
         hb.set_strict_mode(strict_mode);
-        hb.render("script", package).map_err(Error::from)
+        hb.render("script", package)
+            .with_context(|| anyhow!("Rendering script for package {} {} failed", package.name(), package.version()))
+            .map_err(Error::from)
     }
 }
 
diff --git a/src/package/source.rs b/src/package/source.rs
index a9ee083..94270ca 100644
--- a/src/package/source.rs
+++ b/src/package/source.rs
@@ -105,18 +105,15 @@ impl HashType {
                 trace!("SHA1 hashing buffer");
                 let mut m = sha1::Sha1::new();
                 loop {
-                    trace!("Reading");
                     let count = reader.read(&mut buffer)
                         .await
                         .context("Reading buffer failed")?;
-                    trace!("Read {} bytes", count);
 
                     if count == 0 {
                         trace!("ready");
                         break;
                     }
 
-                    trace!("Updating buffer");
                     m.update(&buffer[..count]);
                 }
                 Ok(HashValue(format!("{:x}", m.finalize())))
@@ -127,18 +124,15 @@ impl HashType {
                 trace!("SHA256 hashing buffer");
                 let mut m = sha2::Sha256::new();
                 loop {
-                    trace!("Reading");
                     let count = reader.read(&mut buffer)
                         .await
                         .context("Reading buffer failed")?;
-                    trace!("Read {} bytes", count);
 
                     if count == 0 {
                         trace!("ready");
                         break;
                     }
 
-                    trace!("Updating buffer");
                     m.update(&buffer[..count]);
                 }
                 let h = format!("{:x}", m.finalize());
@@ -151,18 +145,15 @@ impl HashType {
                 trace!("SHA512 hashing buffer");
                 let mut m = sha2::Sha512::new();
                 loop {
-                    trace!("Reading");
                     let count = reader.read(&mut buffer)
                         .await
                         .context("Reading buffer failed")?;
-                    trace!("Read {} bytes", count);
 
                     if count == 0 {
                         trace!("ready");
                         break;
                     }
 
-                    trace!("Updating buffer");
                     m.update(&buffer[..count]);
                 }
                 Ok(HashValue(String::from_utf8(m.finalize()[..].to_vec())?))
diff --git a/src/ui.rs b/src/ui.rs
index fda8f5b..0d08cd6 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -16,6 +16,7 @@ use std::path::Path;
 use std::path::PathBuf;
 
 use anyhow::anyhow;
+use anyhow::Context;
 use anyhow::Error;
 use anyhow::Result;
 use handlebars::Handlebars;
@@ -114,7 +115,7 @@ fn print_package(
         package,
         config.available_phases(),
         *config.strict_script_interpolation(),
-    )?;
+    ).context("Rendering script for printing it failed")?;
 
     let script = crate::ui::script_to_printable(
         &script,