diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-11-25 17:29:56 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-11-25 17:29:56 (GMT) |
| commit | c6328d793c582fa7b27af72398b7e314f1937f26 (patch) | |
| tree | a481804b713186dcba60acf7fda9eb8ced225f30 | |
| parent | 9fccec3f94495effb3261723c55f41acd31375c2 (diff) | |
| download | tcl-c6328d793c582fa7b27af72398b7e314f1937f26.zip tcl-c6328d793c582fa7b27af72398b7e314f1937f26.tar.gz tcl-c6328d793c582fa7b27af72398b7e314f1937f26.tar.bz2 | |
Slightly better than previous commit: In case of a version conflict, ignore pkgIndex file. Otherwise report the error normally
| -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 } |