Update of /cvsroot/aolserver/aolserver/nsd
In directory vz-cvs-4.sog:/tmp/cvs-serv20320/nsd
Modified Files:
Tag: aolserver_v45_r2
init.tcl
Log Message:
merge trunk changes to release branch
Index: init.tcl
===================================================================
RCS file: /cvsroot/aolserver/aolserver/nsd/init.tcl,v
retrieving revision 1.37.2.2
retrieving revision 1.37.2.3
diff -C2 -d -r1.37.2.2 -r1.37.2.3
*** init.tcl 11 May 2012 17:13:37 -0000 1.37.2.2
--- init.tcl 18 Sep 2012 00:29:50 -0000 1.37.2.3
***************
*** 327,333 ****
foreach n $nslist {
foreach {ns_script ns_import} [_ns_getscript $n] {
! append script [list namespace eval $n $ns_script] \n
if {$ns_import != ""} {
! append import [list namespace eval $n $ns_import] \n
}
}
--- 327,333 ----
foreach n $nslist {
foreach {ns_script ns_import} [_ns_getscript $n] {
! append script [list ::namespace eval $n $ns_script] \n
if {$ns_import != ""} {
! append import [list ::namespace eval $n $ns_import] \n
}
}
***************
*** 429,432 ****
--- 429,434 ----
lappend list $top
foreach c [namespace children $top] {
+ # skip built-in namespaces
+ if {$c in {::oo}} continue
_ns_getnamespaces list $c
}
***************
*** 457,463 ****
proc _ns_create_or_config_ensemble {cmd cfg} {
if {[info command $cmd] eq $cmd && [namespace ensemble exists $cmd]} {
! uplevel 1 [list namespace ensemble configure $cmd {*}$cfg]
} else {
! uplevel 1 [list namespace ensemble create -command $cmd {*}$cfg]
}
}
--- 459,465 ----
proc _ns_create_or_config_ensemble {cmd cfg} {
if {[info command $cmd] eq $cmd && [namespace ensemble exists $cmd]} {
! uplevel 1 [list ::namespace ensemble configure $cmd {*}$cfg]
} else {
! uplevel 1 [list ::namespace ensemble create -command $cmd {*}$cfg]
}
}
***************
*** 468,472 ****
::unset _cfg(-namespace)
::set _encmd [::list ::_ns_create_or_config_ensemble $cmd [::array get _cfg]]
! return [::list namespace eval $_enns $_encmd]\n
}
}
--- 470,474 ----
::unset _cfg(-namespace)
::set _encmd [::list ::_ns_create_or_config_ensemble $cmd [::array get _cfg]]
! return [::list ::namespace eval $_enns $_encmd]\n
}
}
***************
*** 573,577 ****
} else {
# procedure imported from other namespace
! ::append _import [::list namespace import -force $_orig] \n
# renamed after import
::if {[::namespace tail $_orig] != $_proc} {
--- 575,579 ----
} else {
# procedure imported from other namespace
! ::append _import [::list ::namespace import -force $_orig] \n
# renamed after import
::if {[::namespace tail $_orig] != $_proc} {
***************
*** 589,593 ****
::if {[::info exists _prcs($_cmnd)] == 0
&& $_orig != [::namespace which -command $_cmnd]} {
! ::append _import [::list namespace import -force $_orig] \n
}
::append _import [_ns_getensemble $_cmnd]
--- 591,595 ----
::if {[::info exists _prcs($_cmnd)] == 0
&& $_orig != [::namespace which -command $_cmnd]} {
! ::append _import [::list ::namespace import -force $_orig] \n
}
::append _import [_ns_getensemble $_cmnd]
***************
*** 601,605 ****
::set _exp [::namespace export]
if {[::llength $_exp]} {
! ::append _script [::concat namespace export $_exp] \n
}
--- 603,607 ----
::set _exp [::namespace export]
if {[::llength $_exp]} {
! ::append _script [::concat ::namespace export $_exp] \n
}
|
