From 024c307c5d127ec57afd1dd113c6138a9d50d192 Mon Sep 17 00:00:00 2001 From: si-gui <245140120@qq.com> Date: Tue, 27 Oct 2020 17:48:24 +0800 Subject: [PATCH] File not found should be ignored silently --- ...not-found-should-be-ignored-silently.patch | 45 +++++++++++++++++++ tcl.spec | 9 +++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 File-not-found-should-be-ignored-silently.patch diff --git a/File-not-found-should-be-ignored-silently.patch b/File-not-found-should-be-ignored-silently.patch new file mode 100644 index 0000000..408772f --- /dev/null +++ b/File-not-found-should-be-ignored-silently.patch @@ -0,0 +1,45 @@ +From 00f8160e2d52e8df57744c3b02ddda3f8a65d149 Mon Sep 17 00:00:00 2001 +From: "jan.nijtmans" +Date: Sat, 24 Nov 2018 14:59:04 +0000 +Subject: [PATCH] If a pkgIndex file is encountered which produces an error, + continue. This shoud fix the Travis build for 9.0 (But same fix should be in + 8.7 as well) + +--- + library/package.tcl | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/library/package.tcl b/library/package.tcl +index c72fbfbbe41..974cbf07956 100644 +--- a/library/package.tcl ++++ b/library/package.tcl +@@ -493,7 +493,8 @@ proc tclPkgUnknown {name args} { + # $file was not readable; silently ignore + continue + } on error msg { +- tclLog "error reading package index file $file: $msg" ++ # $file is not usable; silently ignore ++ continue + } on ok {} { + set procdDirs($dir) 1 + } +@@ -511,7 +512,8 @@ proc tclPkgUnknown {name args} { + # $file was not readable; silently ignore + continue + } on error msg { +- tclLog "error reading package index file $file: $msg" ++ # $file is not usable; silently ignore ++ continue + } on ok {} { + set procdDirs($dir) 1 + } +@@ -595,7 +597,8 @@ proc tcl::MacOSXPkgUnknown {original name args} { + # $file was not readable; silently ignore + continue + } on error msg { +- tclLog "error reading package index file $file: $msg" ++ # $file is not usable; silently ignore ++ continue + } on ok {} { + set procdDirs($dir) 1 + } diff --git a/tcl.spec b/tcl.spec index fd2dd97..ebad026 100644 --- a/tcl.spec +++ b/tcl.spec @@ -2,7 +2,7 @@ Name: tcl Version: 8.6.10 -Release: 1 +Release: 2 Epoch: 1 Summary: The Tool Command Language implementation License: BSD @@ -25,6 +25,7 @@ Patch7: Fix-11ae2be95d-tip-389-branch-string-range-errors-wi.patch Patch8: Improved-overflow-prevention-1.patch Patch9: Improved-overflow-prevention-2.patch Patch10: fix-exec-test-error.patch +Patch11: File-not-found-should-be-ignored-silently.patch %description Tcl(Tool Command Language) provides a powerful platform for creating integration applications @@ -126,6 +127,12 @@ make test %{_mandir}/mann/* %changelog +* Tue Oct 27 2020 Guoshuai Sun - 1:8.6.10.2 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: File not found should be ignored silently + * Wed Jul 29 2020 zhangxingliang - 1:8.6.10.1 - Type:enhancement - ID:NA -- Gitee