Merge branch 'problame/zfs-command-logging-and-status' into problame/holds-release-and-hold-leak-fix-v2

2020-03-29 19:07:18 +02:00
parent bc291e622f bab424021a
commit d09ca2447a
1 changed files with 3 additions and 0 deletions
@@ -59,6 +59,9 @@ func parseHumanFormatterNodate(line string) (l RuntimeLine, err error) {
 			default:
 				return l, errors.Errorf("unknown key %q", k)
 			}
+			if err != nil {
+				return l, err
+			}
 		}
 	}
 	if d.Err() != nil {