From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 20 Feb 2016 23:10:55 +0000 (+0100)
Subject: import: don't claim we had copied a settings file if we didn't
X-Git-Tag: v231~594^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=33859a6bf5fd2b62a562a751a509708617e19776;p=platform%2Fupstream%2Fsystemd.git

import: don't claim we had copied a settings file if we didn't
---

diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c
index 8a16602..8993402 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 afb1336..8c61c46 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;