summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2010-09-02 04:52:47 (GMT)
committerandreas_kupries <akupries@shaw.ca>2010-09-02 04:52:47 (GMT)
commitb950ee3dd312e66ccd595e0ac905c8fe80410a26 (patch)
treec6656dd82b16857c3f9ba4deeaef01a97f1475bb
parentedef60ea0d312a837373055536430373006632d9 (diff)
downloadtcl-b950ee3dd312e66ccd595e0ac905c8fe80410a26.zip
tcl-b950ee3dd312e66ccd595e0ac905c8fe80410a26.tar.gz
tcl-b950ee3dd312e66ccd595e0ac905c8fe80410a26.tar.bz2
* library/safe.tcl (::safe::AliasGlob): Moved the command
extending the actual glob command with a -directory flag to when we actually have a proper untranslated path,
-rw-r--r--ChangeLog6
-rw-r--r--library/safe.tcl4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3117a1d..f3c07b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-01 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+ * library/safe.tcl (::safe::AliasGlob): Moved the command
+ extending the actual glob command with a -directory flag to when
+ we actually have a proper untranslated path,
+
2010-09-01 Don Porter <dgp@users.sourceforge.net>
*** 8.5.9 TAGGED FOR RELEASE ***
diff --git a/library/safe.tcl b/library/safe.tcl
index e89ca29..7b4a50d 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -12,7 +12,7 @@
# See the file "license.terms" for information on usage and redistribution of
# this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: safe.tcl,v 1.16.4.6 2009/12/30 22:20:57 dkf Exp $
+# RCS: @(#) $Id: safe.tcl,v 1.16.4.7 2010/09/02 04:52:49 andreas_kupries Exp $
#
# The implementation is based on namespaces. These naming conventions are
@@ -699,7 +699,6 @@ proc ::safe::AliasGlob {slave args} {
set got($opt) 1
set virtualdir [lindex $args [incr at]]
incr at
- lappend cmd -directory $dir
}
pkgIndex.tcl {
# Oops, this is globbing a subdirectory in regular package
@@ -734,6 +733,7 @@ proc ::safe::AliasGlob {slave args} {
return
}
}
+ lappend cmd -directory $dir
}
# Apply the -join semantics ourselves