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

edit-util: improve log messages

Browse Source
This commit is contained in:
Mike Yuan
2023-04-07 16:13:00 +08:00
parent bc6c7a58c2
commit 77c9bb177a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/edit-util.c
+6 -3
View File
@@ -292,7 +292,7 @@ static int strip_edit_temp_file(EditFile *e) {
r = read_full_file(e->temp, &old_contents, NULL);
if (r < 0)
return log_error_errno(r, "Failed to read temporary file \"%s\": %m", e->temp);
return log_error_errno(r, "Failed to read temporary file '%s': %m", e->temp);
if (e->context->marker_start) {
/* Trim out the lines between the two markers */
@@ -326,7 +326,7 @@ static int strip_edit_temp_file(EditFile *e) {
r = write_string_file(e->temp, new_contents, WRITE_STRING_FILE_CREATE | WRITE_STRING_FILE_TRUNCATE | WRITE_STRING_FILE_AVOID_NEWLINE);
if (r < 0)
return log_error_errno(r, "Failed to modify temporary file \"%s\": %m", e->temp);
return log_error_errno(r, "Failed to strip temporary file '%s': %m", e->temp);
return 1; /* Contents have real changes and are changed after stripping */
}
@@ -359,7 +359,10 @@ int do_edit_files_and_install(EditFileContext *context) {
r = RET_NERRNO(rename(i->temp, i->path));
if (r < 0)
return log_error_errno(r, "Failed to rename \"%s\" to \"%s\": %m", i->temp, i->path);
return log_error_errno(r,
"Failed to rename temporary file '%s' to target file '%s': %m",
i->temp,
i->path);
i->temp = mfree(i->temp);
log_info("Successfully installed edited file '%s'.", i->path);