merge 8.5

2 files changed, 15 insertions, 2 deletions

diff --git a/library/init.tcl b/library/init.tcl
index 5cda0d9..5cc0fee 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -57,13 +57,13 @@ namespace eval tcl {
     if {$Dir ni $::auto_path} {
 	lappend ::auto_path $Dir
     }
-    catch {
+    if {[info exists ::tcl_pkgPath]} { catch {
 	foreach Dir $::tcl_pkgPath {
 	    if {$Dir ni $::auto_path} {
 		lappend ::auto_path $Dir
 	    }
 	}
-    }
+    }}
 
     if {![interp issafe]} {
         variable Path [encoding dirs]
diff --git a/tests/init.test b/tests/init.test
index 639389f..1d838ef 100644
--- a/tests/init.test
+++ b/tests/init.test
@@ -18,6 +18,19 @@ if {"::tcltest" ni [namespace children]} {
 # Clear out any namespaces called test_ns_*
 catch {namespace delete {*}[namespace children :: test_ns_*]}
 
+test init-0.1 {no error on initialization phase (init.tcl)} -setup {
+    interp create slave
+} -body {
+    slave eval {
+	list [set v [info exists ::errorInfo]] \
+		[if {$v} {set ::errorInfo}] \
+	     [set v [info exists ::errorCode]] \
+		[if {$v} {set ::errorCode}]
+    }
+} -cleanup {
+    interp delete slave
+} -result {0 {} 0 {}}
+
 # Six cases - white box testing
 
 test init-1.1 {auto_qualify - absolute cmd - namespace} {