diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-02-21 00:10:55 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-02-21 20:40:57 +0100 |
| commit | 33859a6bf5fd2b62a562a751a509708617e19776 (patch) | |
| tree | a308ca8645b0a42599e94af8871ad518584efe86 | |
| parent | f479d3baa74d99f3caeb14569fa588e0b7ff67fc (diff) | |
import: don't claim we had copied a settings file if we didn't
| -rw-r--r-- | src/import/pull-raw.c | 6 | ||||
| -rw-r--r-- | src/import/pull-tar.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c index 8a16602c3..899340282 100644 --- a/src/import/pull-raw.c +++ b/src/import/pull-raw.c @@ -355,10 +355,12 @@ static int raw_pull_make_local_copy(RawPull *i) { r = copy_file_atomic(i->settings_path, local_settings, 0644, i->force_local, 0); if (r == -EEXIST) log_warning_errno(r, "Settings file %s already exists, not replacing.", local_settings); - else if (r < 0 && r != -ENOENT) + else if (r == -ENOENT) + log_debug_errno(r, "Skipping creation of settings file, since none was found."); + else if (r < 0) 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); + log_info("Created new settings file %s.", local_settings); } return 0; diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c index afb13366f..8c61c46f7 100644 --- a/src/import/pull-tar.c +++ b/src/import/pull-tar.c @@ -251,10 +251,12 @@ static int tar_pull_make_local_copy(TarPull *i) { r = copy_file_atomic(i->settings_path, local_settings, 0664, i->force_local, 0); if (r == -EEXIST) log_warning_errno(r, "Settings file %s already exists, not replacing.", local_settings); - else if (r < 0 && r != -ENOENT) + else if (r == -ENOENT) + log_debug_errno(r, "Skipping creation of settings file, since none was found."); + else if (r < 0) 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); + log_info("Created new settings file %s.", local_settings); } return 0; |