Merge pull request #1306 from matthiasbeyer/minor

Minor patches

bin/core/imag/src/main.rs

@@ -198,7 +198,7 @@ fn main() {
                     .map(|v| v.stdout)
                 {
                     Ok(s) => match String::from_utf8(s) {
-                        Ok(s) => format!("{:10} -> {}", command, s),
+                        Ok(s) => format!("{:15} -> {}", command, s),
                         Err(e) => format!("UTF8 Error while working with output of imag{}: {:?}", command, e),
                     },
                     Err(e) => format!("Failed calling imag-{} -> {:?}", command, e),

doc/src/09020-changelog.md

@@ -52,6 +52,12 @@ This section contains the changelog from the last release to the next release.
       For that, `libimagerror` got a `Result` extension which can translate
       errors into exit codes and one for unwrapping or exiting with the
       `Err(i32)` from the result.
+    * `libimagdiary` did not add the header markers on diary entries.
+    * `imag-diary` used the default diary rather than the CLI setting. Now it
+      rather uses the CLI setting and only if that is not present, it uses the
+      default.
+    * `libimagerror` printed errors with `write!()` rather than `writeln!()`
+      when tracing.
 
 
 ## 0.6.1

lib/domain/libimagdiary/src/diary.rs

@@ -88,6 +88,7 @@ impl Diary for Store {
 
     // Get an iterator for iterating over all entries
     fn entries(&self, diary_name: &str) -> Result<DiaryEntryIterator> {
+        debug!("Building iterator for module 'diary' with diary name = '{}'", diary_name);
         self.retrieve_for_module("diary")
             .map(|iter| DiaryEntryIterator::new(self, String::from(diary_name), iter))
             .chain_err(|| DEK::StoreReadError)

lib/domain/libimagdiary/src/is_in_diary.rs

@@ -43,6 +43,7 @@ impl IsInDiary for Entry {
 impl IsInDiary for StoreId {
 
     fn is_in_diary(&self, name: &str) -> bool {
+        debug!("Check: is in diary '{}'", name);
         self.is_in_collection(&["diary", name])
     }