From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 10 Oct 2018 14:47:38 +0000 (+0200)
Subject: import: use generic word 'transfer' instead of 'import'
X-Git-Tag: v240~175^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b71c27b427a612df7f677f2d20585c845451149;p=thirdparty%2Fsystemd.git

import: use generic word 'transfer' instead of 'import'

After all, these lines are also printed for exports/pulls...
---

diff --git a/src/import/importd.c b/src/import/importd.c
index 29951d2d27b..37b6859af9c 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -301,17 +301,16 @@ static int transfer_on_pid(sd_event_source *s, const siginfo_t *si, void *userda
 
         if (si->si_code == CLD_EXITED) {
                 if (si->si_status != 0)
-                        log_error("Import process failed with exit code %i.", si->si_status);
+                        log_error("Transfer process failed with exit code %i.", si->si_status);
                 else {
-                        log_debug("Import process succeeded.");
+                        log_debug("Transfer process succeeded.");
                         success = true;
                 }
 
         } else if (IN_SET(si->si_code, CLD_KILLED, CLD_DUMPED))
-
-                log_error("Import process terminated by signal %s.", signal_to_string(si->si_status));
+                log_error("Transfer process terminated by signal %s.", signal_to_string(si->si_status));
         else
-                log_error("Import process failed due to unknown reason.");
+                log_error("Transfer process failed due to unknown reason.");
 
         t->pid = 0;