chiark / gitweb /
import: improve logging
authorLennart Poettering <lennart@poettering.net>
Wed, 21 Jan 2015 02:02:23 +0000 (03:02 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 21 Jan 2015 03:03:54 +0000 (04:03 +0100)
src/import/import-tar.c
src/import/import.c

index 08839ca..e8afc26 100644 (file)
@@ -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);
         }
 
index 62e3118..d9cff3e 100644 (file)
@@ -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) {