From 1f35b60c45319b66403716359b926d67f7d9b328 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Tue, 5 Jul 2005 17:33:06 +0000
Subject:         * generic/tclNamesp.c:  Allow for [namespace import] of a
 command         * tests/namespace.test: over a previous [namespace import] of
 itself         without throwing an error.  [RFE 1230597]

---
 ChangeLog            |  6 ++++++
 generic/tclNamesp.c  | 11 ++++++++++-
 tests/namespace.test |  4 ++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c403367..83de81c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-05  Don Porter  <dgp@users.sourceforge.net>
+
+	* generic/tclNamesp.c:	Allow for [namespace import] of a command
+	* tests/namespace.test:	over a previous [namespace import] of itself
+	without throwing an error.  [RFE 1230597]
+
 2005-07-04  Donal K. Fellows  <dkf@users.sf.net>
 
 	* generic/tclDictObj.c (DictForCmd, DictFilterCmd): Interlocking of
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index 9935f47..f1a86d6 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -21,7 +21,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclNamesp.c,v 1.77 2005/06/07 21:46:18 dgp Exp $
+ * RCS: @(#) $Id: tclNamesp.c,v 1.78 2005/07/05 17:33:06 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -1639,6 +1639,15 @@ DoImport(interp, nsPtr, hPtr, cmdName, pattern, importNsPtr, allowOverwrite)
 	refPtr->nextPtr = cmdPtr->importRefPtr;
 	cmdPtr->importRefPtr = refPtr;
     } else {
+	Command *overwrite = (Command *) Tcl_GetHashValue(found);
+	if (overwrite->deleteProc == DeleteImportedCmd) {
+	    ImportedCmdData *dataPtr =
+		    (ImportedCmdData *) overwrite->objClientData;
+	    if (dataPtr->realCmdPtr == (Command *) Tcl_GetHashValue(hPtr)) {
+		/* Repeated import of same command -- acceptable */
+		return TCL_OK;
+	    }
+	}
 	Tcl_AppendResult(interp, "can't import command \"", cmdName,
 		"\": already exists", (char *) NULL);
 	return TCL_ERROR;
diff --git a/tests/namespace.test b/tests/namespace.test
index 1cae7d9..947beb6 100644
--- a/tests/namespace.test
+++ b/tests/namespace.test
@@ -11,7 +11,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: namespace.test,v 1.45 2005/06/14 13:46:04 dkf Exp $
+# RCS: @(#) $Id: namespace.test,v 1.46 2005/07/05 17:33:07 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -244,7 +244,7 @@ test namespace-9.4 {Tcl_Import, simple import} {
 } {cmd1: 123}
 test namespace-9.5 {Tcl_Import, can't redefine cmd unless allowOverwrite!=0} {
     list [catch {namespace eval test_ns_import {namespace import ::test_ns_export::*}} msg] $msg
-} {1 {can't import command "cmd1": already exists}}
+} {0 {}}
 test namespace-9.6 {Tcl_Import, cmd redefinition ok if allowOverwrite!=0} {
     namespace eval test_ns_import {
         namespace import -force ::test_ns_export::*
-- 
cgit v0.12