summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-10-22 00:39:27 +0200
committerLennart Poettering <lennart@poettering.net>2015-10-22 01:59:25 +0200
commit79b6198bb0e694c7572d70ff35ba464dc9d80c52 (patch)
tree231fa9c5a21cea204b887c8d85415978331ca077
parent1f9aa80a59e581dee9fc886eb6d7f3ca40bc609a (diff)
import: don't claim we moved .nspawn file into place when in fact we did not
-rw-r--r--src/import/pull-raw.c6
-rw-r--r--src/import/pull-tar.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c
index 0e77197e34..3e13f4ea9a 100644
--- a/src/import/pull-raw.c
+++ b/src/import/pull-raw.c
@@ -349,9 +349,9 @@ static int raw_pull_make_local_copy(RawPull *i) {
if (r == -EEXIST)
log_warning_errno(r, "Settings file %s already exists, not replacing.", local_settings);
else if (r < 0 && r != -ENOENT)
- log_warning_errno(r, "Failed to copy settings files %s: %m", local_settings);
-
- log_info("Create new settings file '%s.nspawn'", i->local);
+ log_warning_errno(r, "Failed to copy settings files %s, ignoring: %m", local_settings);
+ else
+ log_info("Created new settings file '%s.nspawn'", i->local);
}
return 0;
diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c
index b818382172..bd35f1b842 100644
--- a/src/import/pull-tar.c
+++ b/src/import/pull-tar.c
@@ -247,9 +247,9 @@ static int tar_pull_make_local_copy(TarPull *i) {
if (r == -EEXIST)
log_warning_errno(r, "Settings file %s already exists, not replacing.", local_settings);
else if (r < 0 && r != -ENOENT)
- log_warning_errno(r, "Failed to copy settings files %s: %m", local_settings);
-
- log_info("Create new settings file '%s.nspawn'", i->local);
+ log_warning_errno(r, "Failed to copy settings files %s, ignoring: %m", local_settings);
+ else
+ log_info("Created new settings file '%s.nspawn'", i->local);
}
return 0;