about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--support/temp_file.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c9a9a89827..2d489f041a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2017-03-15  Florian Weimer  <fweimer@redhat.com>
 
+	[BZ #21243]
+	* support/temp_file.c (support_delete_temp_files): Add comment
+	about ignored errors.
+
+2017-03-15  Florian Weimer  <fweimer@redhat.com>
+
 	[BZ #21244]
 	* support/xclose.c: New file.
 	* support/Makefile (libsupport-routines): Add xclose.
diff --git a/support/temp_file.c b/support/temp_file.c
index f06647a467..5950aec06b 100644
--- a/support/temp_file.c
+++ b/support/temp_file.c
@@ -99,7 +99,10 @@ support_delete_temp_files (void)
 {
   while (temp_name_list != NULL)
     {
-      remove (temp_name_list->name);
+      /* For some tests, the temporary file removal runs multiple
+	 times (in the parent processes and the subprocess), so do not
+	 report a failed removal attempt.  */
+      (void) remove (temp_name_list->name);
       free (temp_name_list->name);
 
       struct temp_name_list *next