|
From: Jeff R. <dv...@us...> - 2011-12-13 22:37:09
|
Update of /cvsroot/aolserver/aolserver/nsd
In directory vz-cvs-4.sog:/tmp/cvs-serv14103/nsd
Modified Files:
Tag: aolserver_v45_r2
init.tcl
Log Message:
add logic to ini.tcl to handle imported/renamed commands
Index: init.tcl
===================================================================
RCS file: /cvsroot/aolserver/aolserver/nsd/init.tcl,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -C2 -d -r1.37 -r1.37.2.1
*** init.tcl 28 May 2011 00:35:47 -0000 1.37
--- init.tcl 13 Dec 2011 22:37:07 -0000 1.37.2.1
***************
*** 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]
|