From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 21 Oct 2015 22:39:09 +0000 (+0200)
Subject: import: correct handling if .nspawn file could not be downloaded
X-Git-Tag: v228~164^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f9aa80a59e581dee9fc886eb6d7f3ca40bc609a;p=thirdparty%2Fsystemd.git

import: correct handling if .nspawn file could not be downloaded
---

diff --git a/src/import/pull-common.c b/src/import/pull-common.c
index 90d28f04d9c..edebb915568 100644
--- a/src/import/pull-common.c
+++ b/src/import/pull-common.c
@@ -366,9 +366,10 @@ int pull_verify(PullJob *main_job,
 
         log_info("SHA256 checksum of %s is valid.", main_job->url);
 
-        assert(!settings_job || settings_job->state == PULL_JOB_DONE);
+        assert(!settings_job || IN_SET(settings_job->state, PULL_JOB_DONE, PULL_JOB_FAILED));
 
         if (settings_job &&
+            settings_job->state == PULL_JOB_DONE &&
             settings_job->error == 0 &&
             !settings_job->etag_exists) {