SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6203 from poettering/import-assert

Browse Source 
remove misplaced importd assert
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2017-06-26 20:03:14 -04:00
committed by GitHub
parent 82891136d7 dc38f65a72
commit 8a380e9603
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/import/pull-raw.c
+2 -2
View File
@@ -444,7 +444,7 @@ static int raw_pull_rename_auxiliary_file(
assert(suffix);
assert(path);
/* Regenerate final name for this auxiliary file, we might know the etag of the raw file now, and we shoud
/* Regenerate final name for this auxiliary file, we might know the etag of the file now, and we should
* incorporate it in the file name if we can */
*path = mfree(*path);
r = raw_pull_determine_path(i, suffix, path);
@@ -538,7 +538,7 @@ static void raw_pull_job_on_finished(PullJob *j) {
r = rename_noreplace(AT_FDCWD, i->temp_path, AT_FDCWD, i->final_path);
if (r < 0) {
log_error_errno(r, "Failed to move RAW file into place: %m");
log_error_errno(r, "Failed to rename raw file to %s: %m", i->final_path);
goto finish;
}
src/import/pull-tar.c
+8 -6
View File
@@ -114,6 +114,7 @@ TarPull* tar_pull_unref(TarPull *i) {
free(i->settings_path);
free(i->image_root);
free(i->local);
return mfree(i);
}
@@ -358,7 +359,7 @@ static void tar_pull_job_on_finished(PullJob *j) {
r = rename_noreplace(AT_FDCWD, i->temp_path, AT_FDCWD, i->final_path);
if (r < 0) {
log_error_errno(r, "Failed to rename to final image name: %m");
log_error_errno(r, "Failed to rename to final image name to %s: %m", i->final_path);
goto finish;
}
@@ -367,13 +368,14 @@ static void tar_pull_job_on_finished(PullJob *j) {
if (i->settings_job &&
i->settings_job->error == 0) {
assert(i->settings_temp_path);
assert(i->settings_path);
/* Also move the settings file into place, if it exist. Note that we do so only if we also
/* Also move the settings file into place, if it exists. Note that we do so only if we also
* moved the tar file in place, to keep things strictly in sync. */
assert(i->settings_temp_path);
/* Regenerate final name for this auxiliary file, we might know the etag of the file now, and
* we should incorporate it in the file name if we can */
i->settings_path = mfree(i->settings_path);
r = tar_pull_determine_path(i, ".nspawn", &i->settings_path);
if (r < 0)
goto finish;
@@ -384,7 +386,7 @@ static void tar_pull_job_on_finished(PullJob *j) {
r = rename_noreplace(AT_FDCWD, i->settings_temp_path, AT_FDCWD, i->settings_path);
if (r < 0) {
log_error_errno(r, "Failed to rename settings file: %m");
log_error_errno(r, "Failed to rename settings file to %s: %m", i->settings_path);
goto finish;
}