import: improve logging

diff --git a/src/import/import-tar.c b/src/import/import-tar.c
index 08839caae76a281fec8af7fb5f893f9ffc32f9ab..e8afc269b757a41dde589206bf68096fffe1da4f 100644 (file)
--- a/src/import/import-tar.c
+++ b/src/import/import-tar.c
@@ -262,6 +262,7 @@ static int tar_import_job_on_open_disk(ImportJob *j) {
                         safe_close(null_fd);
 
                 execlp("tar", "tar", "--numeric-owner", "-C", i->temp_path, "-px", NULL);
+                log_error_errno(errno, "Failed to execute tar: %m");
                 _exit(EXIT_FAILURE);
         }
 

diff --git a/src/import/import.c b/src/import/import.c
index 62e3118a7fab2d905bc24c46939e5062906c8210..d9cff3e239be2aa2fd3330785b9aab8148bdd36b 100644 (file)
--- a/src/import/import.c
+++ b/src/import/import.c
@@ -42,10 +42,8 @@ static void on_tar_finished(TarImport *import, int error, void *userdata) {
 
         if (error == 0)
                 log_info("Operation completed successfully.");
-        else
-                log_error_errno(error, "Operation failed: %m");
 
-        sd_event_exit(event, error);
+        sd_event_exit(event, EXIT_FAILURE);
 }
 
 static int strip_tar_suffixes(const char *name, char **ret) {
@@ -147,7 +145,7 @@ static int pull_tar(int argc, char *argv[], void *userdata) {
 
         log_info("Exiting.");
 
-        return 0;
+        return r;
 }
 
 static void on_raw_finished(RawImport *import, int error, void *userdata) {
@@ -156,10 +154,8 @@ static void on_raw_finished(RawImport *import, int error, void *userdata) {
 
         if (error == 0)
                 log_info("Operation completed successfully.");
-        else
-                log_error_errno(error, "Operation failed: %m");
 
-        sd_event_exit(event, error);
+        sd_event_exit(event, EXIT_FAILURE);
 }
 
 static int strip_raw_suffixes(const char *p, char **ret) {
@@ -275,7 +271,7 @@ static int pull_raw(int argc, char *argv[], void *userdata) {
 
         log_info("Exiting.");
 
-        return 0;
+        return r;
 }
 
 static void on_dkr_finished(DkrImport *import, int error, void *userdata) {