projects
/
systemd
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7705a40
)
import: correct handling if .nspawn file could not be downloaded
author
Lennart Poettering
<lennart@poettering.net>
Wed, 21 Oct 2015 22:39:09 +0000
(
00:39
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 21 Oct 2015 23:59:25 +0000
(
01:59
+0200)
src/import/pull-common.c
patch
|
blob
|
history
diff --git
a/src/import/pull-common.c
b/src/import/pull-common.c
index 90d28f04d9c7485520d13969bfe92783d370b029..edebb915568f15a6ce3cac8486e1de12c0cb4705 100644
(file)
--- 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) {