From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 24 Dec 2014 15:43:20 +0000 (+0100)
Subject: import: print friendly error messages on errors
X-Git-Tag: v219~849
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=a36544cd45d607ee7f075157f55e7f646df1d34f

import: print friendly error messages on errors
---

diff --git a/src/import/import-dkr.c b/src/import/import-dkr.c
index e7dbe0f66..05b10621b 100644
--- a/src/import/import-dkr.c
+++ b/src/import/import-dkr.c
@@ -822,7 +822,7 @@ static size_t dkr_import_job_write_callback(void *contents, size_t size, size_t
 
                 l = fwrite(contents, size, nmemb, j->tar_stream);
                 if (l != nmemb) {
-                        r = -errno;
+                        r = log_error_errno(errno, "Failed to write to tar: %m");
                         goto fail;
                 }
 
@@ -830,13 +830,14 @@ static size_t dkr_import_job_write_callback(void *contents, size_t size, size_t
         }
 
         if (j->payload_size + sz > PAYLOAD_MAX) {
+                log_error("Payload too large.");
                 r = -EFBIG;
                 goto fail;
         }
 
         p = realloc(j->payload, j->payload_size + sz);
         if (!p) {
-                r = -ENOMEM;
+                r = log_oom();
                 goto fail;
         }