shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

import: don't claim we moved .nspawn file into place when in fact we did not

Browse Source
This commit is contained in:
Lennart Poettering 2015-10-22 00:39:27 +02:00
parent 1f9aa80a59
commit 79b6198bb0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/import/pull-raw.c
View File

@ -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;

6
src/import/pull-tar.c
View File

@ -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;