* tests/safe.test (safe-2.1): Disabled senseless test. [Bug 999612]

        * library/auto.tcl (auto_reset):  Removed "protected" list of commands
        from [auto_reset].  All entries in the auto_index can be re-loaded.
        * library/package.tcl: Updated comment to reflect 2004-07-28 commit.

4 files changed, 14 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index e01c52d..24cd4f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-07-30  Don Porter  <dgp@users.sourceforge.net>
 
+	* tests/safe.test (safe-2.1):  Disabled senseless test.  [Bug 999612]
+
+	* library/auto.tcl (auto_reset):  Removed "protected" list of commands 
+	from [auto_reset].  All entries in the auto_index can be re-loaded.
+	* library/package.tcl: Updated comment to reflect 2004-07-28 commit.
+
 	* generic/tclEvent.c (Tcl_Finalize):	Re-organized Tcl_Finalize
 	so that Tcl_ExitProc's that call Tcl_Finalize recursively do not
 	cause deadlock.  [Patch 999084 fixes Tk Bug 714956]
diff --git a/library/auto.tcl b/library/auto.tcl
index 0f0cb58..9df91f4 100644
--- a/library/auto.tcl
+++ b/library/auto.tcl
@@ -3,7 +3,7 @@
 # utility procs formerly in init.tcl dealing with auto execution
 # of commands and can be auto loaded themselves.
 #
-# RCS: @(#) $Id: auto.tcl,v 1.16 2004/06/16 21:20:42 dgp Exp $
+# RCS: @(#) $Id: auto.tcl,v 1.17 2004/07/30 16:54:04 dgp Exp $
 #
 # Copyright (c) 1991-1993 The Regents of the University of California.
 # Copyright (c) 1994-1998 Sun Microsystems, Inc.
@@ -26,10 +26,7 @@ proc auto_reset {} {
     variable ::tcl::auto_oldpath
     global auto_execs auto_index 
     foreach p [info procs] {
-	if {[info exists auto_index($p)] && ![string match auto_* $p]
-		&& ([lsearch -exact {unknown pkg_mkIndex tclPkgSetup
-			tcl_findLibrary pkg_compareExtension
-			tclPkgUnknown tcl::MacOSXPkgUnknown} $p] < 0)} {
+	if {[info exists auto_index($p)]} {
 	    rename $p {}
 	}
     }
diff --git a/library/package.tcl b/library/package.tcl
index 5d478c9..739f6a2 100644
--- a/library/package.tcl
+++ b/library/package.tcl
@@ -3,7 +3,7 @@
 # utility procs formerly in init.tcl which can be loaded on demand
 # for package management.
 #
-# RCS: @(#) $Id: package.tcl,v 1.30 2004/07/29 15:55:04 dgp Exp $
+# RCS: @(#) $Id: package.tcl,v 1.31 2004/07/30 16:54:04 dgp Exp $
 #
 # Copyright (c) 1991-1993 The Regents of the University of California.
 # Copyright (c) 1994-1998 Sun Microsystems, Inc.
@@ -47,7 +47,7 @@ proc tcl::Pkg::CompareExtension { fileName {ext {}} } {
 	    # The current extension does not match; if it is not a numeric
 	    # value, quit, as we are only looking to ignore version number
 	    # extensions.  Otherwise we might return 1 in this case:
-	    #		pkg_compareExtension foo.so.bar .so
+	    #		tcl::Pkg::CompareExtension foo.so.bar .so
 	    # which should not match.
 
 	    if { ![string is integer -strict [string range $currExt 1 end]] } {
diff --git a/tests/safe.test b/tests/safe.test
index ba6812f..67c2655 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: safe.test,v 1.14 2004/05/19 20:15:32 dkf Exp $
+# RCS: @(#) $Id: safe.test,v 1.15 2004/07/30 16:54:04 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -51,8 +51,9 @@ test safe-1.3 {safe::interpInit syntax} {
     slave name () name of the slave}}
 
 
-test safe-2.1 {creating interpreters, should have no aliases} {
-    interp aliases
+test safe-2.1 {creating interpreters, should have no aliases} empty {
+    # Disabled this test.  It tests nothing sensible.  [Bug 999612]
+    # interp aliases
 } ""
 test safe-2.2 {creating interpreters, should have no aliases} {
     catch {safe::interpDelete a}