|
From: Jeff R. <dv...@us...> - 2012-05-11 17:22:07
|
Update of /cvsroot/aolserver/aolserver/nsd
In directory vz-cvs-4.sog:/tmp/cvs-serv7638/nsd
Modified Files:
init.tcl
Log Message:
merge patch
Index: init.tcl
===================================================================
RCS file: /cvsroot/aolserver/aolserver/nsd/init.tcl,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** init.tcl 13 Dec 2011 22:51:13 -0000 1.38
--- init.tcl 11 May 2012 17:22:04 -0000 1.39
***************
*** 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]
--- 590,593 ----
|