[78953] branches/gsoc11-rev-upgrade/base/src/registry2.0/registry.tcl
cal at macports.org
cal at macports.org
Fri May 27 16:17:32 PDT 2011
Revision: 78953
http://trac.macports.org/changeset/78953
Author: cal at macports.org
Date: 2011-05-27 16:17:31 -0700 (Fri, 27 May 2011)
Log Message:
-----------
rev-upgrade: renamed [file command] to [::file command] in registry.tcl, because there now is a file command in the registry namespace
Modified Paths:
--------------
branches/gsoc11-rev-upgrade/base/src/registry2.0/registry.tcl
Modified: branches/gsoc11-rev-upgrade/base/src/registry2.0/registry.tcl
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/registry2.0/registry.tcl 2011-05-27 23:10:57 UTC (rev 78952)
+++ branches/gsoc11-rev-upgrade/base/src/registry2.0/registry.tcl 2011-05-27 23:17:31 UTC (rev 78953)
@@ -319,7 +319,7 @@
# (we won't store the md5 of the target of links since it's meaningless
# and $statvar(mode) tells us that links are links).
if {![catch {file lstat $fname statvar}]} {
- if {[file isfile $fname] && [file type $fname] != "link"} {
+ if {[::file isfile $fname] && [::file type $fname] != "link"} {
if {[catch {md5 file $fname} md5sum] == 0} {
# Create a line that matches md5(1)'s output
# for backwards compatibility
@@ -346,7 +346,7 @@
set rval [list]
foreach file $flist {
if {[string index $file 0] != "/"} {
- set file [file join $prefix $file]
+ set file [::file join $prefix $file]
}
lappend rval [fileinfo_for_file $file]
}
@@ -395,9 +395,9 @@
if {$nlocked > 1} {
return
}
- set lockpath [file join ${registry.path} registry .registry.lock]
+ set lockpath [::file join ${registry.path} registry .registry.lock]
if {![info exists lockfd]} {
- if {![file writable [file dirname $lockpath]]} {
+ if {![::file writable [::file dirname $lockpath]]} {
# skip locking, registry can't be modified anyway
return
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110527/e25840d4/attachment.html>
More information about the macports-changes
mailing list