[AOLSERVER-COMMITS] aolserver/nsd init.tcl,1.37,1.38

[Jeff R. <dv...@us...>]

Update of /cvsroot/aolserver/aolserver/nsd
In directory vz-cvs-4.sog:/tmp/cvs-serv16138/nsd

Modified Files:
	init.tcl 
Log Message:
merge changes from 4.5.2 branch

Index: init.tcl
===================================================================
RCS file: /cvsroot/aolserver/aolserver/nsd/init.tcl,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** init.tcl	28 May 2011 00:35:47 -0000	1.37
--- init.tcl	13 Dec 2011 22:51:13 -0000	1.38
***************
*** 574,577 ****
--- 574,581 ----
                  # procedure imported from other namespace
                  ::append _import [::list namespace import -force $_orig] \n
+ 		# renamed after import
+ 		::if {[::namespace tail $_orig] != $_proc} {
+ 		    ::append _import [::list rename [::namespace tail $_orig] $_proc] \n
+ 		}
              }
          }
***************
*** 586,589 ****
--- 590,597 ----
                      && $_orig != [::namespace which -command $_cmnd]} {
                  ::append _import [::list namespace import -force $_orig] \n
+ 		# renamed after import
+ 		::if {[::namespace tail $_orig] != [::namespace tail $_cmnd]} {
+ 		    ::append _import [::list rename [::namespace current]::[::namespace tail $_orig] $_cmnd] \n
+ 		}
              }
  	    ::append _import [_ns_getensemble $_cmnd]