diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-11-25 17:31:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-11-25 17:31:49 (GMT) |
| commit | cb7c8145678b8d6f02ebfd40758a071721927fd1 (patch) | |
| tree | 6ed8b1ad8bf567749d76cbfcf01526b369bc2499 /library | |
| parent | 57bea5dfa4f10e72f0a54e2d5df3d603b2e70fc9 (diff) | |
| parent | c6328d793c582fa7b27af72398b7e314f1937f26 (diff) | |
| download | tcl-cb7c8145678b8d6f02ebfd40758a071721927fd1.zip tcl-cb7c8145678b8d6f02ebfd40758a071721927fd1.tar.gz tcl-cb7c8145678b8d6f02ebfd40758a071721927fd1.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'library')
| -rw-r--r-- | library/package.tcl | 21 |
1 files 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 } |