From c6328d793c582fa7b27af72398b7e314f1937f26 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sun, 25 Nov 2018 17:29:56 +0000 Subject: Slightly better than previous commit: In case of a version conflict, ignore pkgIndex file. Otherwise report the error normally --- library/package.tcl | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/library/package.tcl b/library/package.tcl index 974cbf0..6c87ec1 100644 --- a/library/package.tcl +++ b/library/package.tcl @@ -493,8 +493,11 @@ proc tclPkgUnknown {name args} { # $file was not readable; silently ignore continue } on error msg { - # $file is not usable; silently ignore - continue + if {[regexp {version conflict for package} $msg]} { + # In case of version conflict, silently ignore + continue + } + tclLog "error reading package index file $file: $msg" } on ok {} { set procdDirs($dir) 1 } @@ -512,8 +515,11 @@ proc tclPkgUnknown {name args} { # $file was not readable; silently ignore continue } on error msg { - # $file is not usable; silently ignore - continue + if {[regexp {version conflict for package} $msg]} { + # In case of version conflict, silently ignore + continue + } + tclLog "error reading package index file $file: $msg" } on ok {} { set procdDirs($dir) 1 } @@ -597,8 +603,11 @@ proc tcl::MacOSXPkgUnknown {original name args} { # $file was not readable; silently ignore continue } on error msg { - # $file is not usable; silently ignore - continue + if {[regexp {version conflict for package} $msg]} { + # In case of version conflict, silently ignore + continue + } + tclLog "error reading package index file $file: $msg" } on ok {} { set procdDirs($dir) 1 } -- cgit v0.12