mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-02 11:38:07 -07:00
3e53eb66d7
Don't error for close_stream failure if the config line begins with "-" Closes: https://bugs.gentoo.org/969014 Bug: https://gitlab.com/procps-ng/procps/-/issues/410 Signed-off-by: Ulrich Müller <ulm@gentoo.org>
22 lines
774 B
Diff
22 lines
774 B
Diff
Don't error for close_stream failure if the config line begins with "-"
|
|
https://bugs.gentoo.org/969014
|
|
https://gitlab.com/procps-ng/procps/-/issues/410
|
|
|
|
--- procps-ng-4.0.5/src/sysctl.c
|
|
+++ procps-ng-4.0.5/src/sysctl.c
|
|
@@ -623,9 +623,12 @@ static int WriteSetting(
|
|
if (0 < fprintf(fp, "%s\n", value))
|
|
rc = EXIT_SUCCESS;
|
|
if (close_stream(fp) != 0) {
|
|
- xwarn(_("setting key \"%s\""), dotted_key);
|
|
+ xwarn(_("setting key \"%s\"%s"),
|
|
+ dotted_key, (ignore_failure?_(", ignoring"):""));
|
|
free(dotted_key);
|
|
- return EXIT_FAILURE;
|
|
+ if (!ignore_failure)
|
|
+ rc = EXIT_FAILURE;
|
|
+ return rc;
|
|
}
|
|
}
|
|
}
|