summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2007-03-05 23:28:25 (GMT)
committerandreas_kupries <akupries@shaw.ca>2007-03-05 23:28:25 (GMT)
commit46c5f7a817b9e5508cde166112d355998c8213dc (patch)
treea44f7c3f3374b976cde326914120ea1697ec91f6
parentbbbcdcbdfc1d81b58a3bd8234b3494b598184c3b (diff)
downloadtcl-46c5f7a817b9e5508cde166112d355998c8213dc.zip
tcl-46c5f7a817b9e5508cde166112d355998c8213dc.tar.gz
tcl-46c5f7a817b9e5508cde166112d355998c8213dc.tar.bz2
* library/platform/shell.tcl (::platform::shell::RUN): In the case
* library/platform/pkgIndex.tcl: of a failure put the captured stderr * unix/Makefile.in: into the error message to aid in debugging. Bumped * win/Makefile.in: package version to 1.1.2, and updated the makefiles installing it as Tcl Module.
-rw-r--r--ChangeLog8
-rw-r--r--library/platform/pkgIndex.tcl2
-rw-r--r--library/platform/shell.tcl10
-rw-r--r--unix/Makefile.in6
-rw-r--r--win/Makefile.in6
5 files changed, 21 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index ee8d74d..0352592 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-05 Andreas Kupries <andreask@activestate.com>
+
+ * library/platform/shell.tcl (::platform::shell::RUN): In the case
+ * library/platform/pkgIndex.tcl: of a failure put the captured stderr
+ * unix/Makefile.in: into the error message to aid in debugging. Bumped
+ * win/Makefile.in: package version to 1.1.2, and updated the makefiles
+ installing it as Tcl Module.
+
2007-03-03 Donal K. Fellows <dkf@users.sf.net>
* generic/tclLink.c (LinkedVar): Added macro to conceal at least some
diff --git a/library/platform/pkgIndex.tcl b/library/platform/pkgIndex.tcl
index 25f24d9..e38e770 100644
--- a/library/platform/pkgIndex.tcl
+++ b/library/platform/pkgIndex.tcl
@@ -1,3 +1,3 @@
package ifneeded platform 1.0.2 [list source [file join $dir platform.tcl]]
-package ifneeded platform::shell 1.1.1 [list source [file join $dir shell.tcl]]
+package ifneeded platform::shell 1.1.2 [list source [file join $dir shell.tcl]]
diff --git a/library/platform/shell.tcl b/library/platform/shell.tcl
index 3c2981c..6c1be5d 100644
--- a/library/platform/shell.tcl
+++ b/library/platform/shell.tcl
@@ -77,7 +77,7 @@ proc ::platform::shell::CHECK {shell} {
return -code error "Shell \"$shell\" does not exist"
}
if {![file executable $shell]} {
- return -code error "Shell \"$shell\" is not executable"
+ return -code error "Shell \"$shell\" is not executable (permissions)"
}
return
}
@@ -118,12 +118,14 @@ proc ::platform::shell::RUN {shell code} {
} res]
file delete $c
- file delete $e
if {$code} {
- return -code error "Shell \"$shell\" is not executable"
+ append res \n[read [set chan [open $e r]]][close $chan]
+ file delete $e
+ return -code error "Shell \"$shell\" is not executable ($res)"
}
+ file delete $e
return $res
}
@@ -219,4 +221,4 @@ proc ::platform::shell::DIR {} {
# ### ### ### ######### ######### #########
## Ready
-package provide platform::shell 1.1.1
+package provide platform::shell 1.1.2
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 76925be..09e7a0a 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -4,7 +4,7 @@
# "./configure", which is a configuration script generated by the "autoconf"
# program (constructs like "@foo@" will get replaced in the actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.201 2007/01/19 01:04:00 das Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.202 2007/03/05 23:28:25 andreas_kupries Exp $
VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -797,8 +797,8 @@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs
@echo "Installing package platform 1.0.2 as a Tcl Module";
@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform-1.0.2.tm;
- @echo "Installing package platform::shell 1.1.1 as a Tcl Module";
- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform/shell-1.1.1.tm;
+ @echo "Installing package platform::shell 1.1.2 as a Tcl Module";
+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform/shell-1.1.2.tm;
@echo "Installing library encoding directory";
@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
diff --git a/win/Makefile.in b/win/Makefile.in
index 1352921..353180b 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
# "./configure", which is a configuration script generated by the "autoconf"
# program (constructs like "@foo@" will get replaced in the actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.111 2006/12/05 18:45:51 andreas_kupries Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.112 2007/03/05 23:28:26 andreas_kupries Exp $
VERSION = @TCL_VERSION@
@@ -646,8 +646,8 @@ install-libraries: libraries install-tzdata install-msgs
@$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.3a1.tm;
@echo "Installing package platform 1.0.2 as a Tcl Module";
@$(COPY) $(ROOT_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform-1.0.2.tm;
- @echo "Installing package platform::shell 1.1.1 as a Tcl Module";
- @$(COPY) $(ROOT_DIR)/library/platform/shell.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform/shell-1.1.1.tm;
+ @echo "Installing package platform::shell 1.1.2 as a Tcl Module";
+ @$(COPY) $(ROOT_DIR)/library/platform/shell.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform/shell-1.1.2.tm;
@echo "Installing encodings";
@for i in $(ROOT_DIR)/library/encoding/*.enc ; do \
$(COPY) "$$i" "$(SCRIPT_INSTALL_DIR)/encoding"; \