From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 21 Oct 2015 22:39:27 +0000 (+0200)
Subject: import: don't claim we moved .nspawn file into place when in fact we did not
X-Git-Tag: v228~164^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=79b6198bb0e694c7572d70ff35ba464dc9d80c52;p=platform%2Fupstream%2Fsystemd.git

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

diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c
index 0e77197..3e13f4e 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 b818382..bd35f1b 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;