summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2013-03-19 14:26:10 (GMT)
committerdgp <dgp@users.sourceforge.net>2013-03-19 14:26:10 (GMT)
commita515c79f52c3d0927a7377700467074b80b8d169 (patch)
treecddea1a36d6b88042ae21a39031325c0bc28cb6e
parentf02a6bd750b0c1da6b070dc9faf45562fa1c560d (diff)
downloadtcl-a515c79f52c3d0927a7377700467074b80b8d169.zip
tcl-a515c79f52c3d0927a7377700467074b80b8d169.tar.gz
tcl-a515c79f52c3d0927a7377700467074b80b8d169.tar.bz2
3597000 Consistent [file copy] result.
-rw-r--r--ChangeLog4
-rw-r--r--generic/tclFCmd.c15
2 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 265faa8..8debc2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-19 Don Porter <dgp@users.sourceforge.net>
+
+ * generic/tclFCmd.c: [Bug 3597000] Consistent [file copy] result.
+
2013-03-19 Jan Nijtmans <nijtmans@users.sf.net>
* win/tclWinFile.c: [Bug 2893771]: file stat fails on locked files
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
index 5ad7063..382e9f3 100644
--- a/generic/tclFCmd.c
+++ b/generic/tclFCmd.c
@@ -691,15 +691,14 @@ CopyRenameOneFile(interp, source, target, copyFlag, force)
* so it should be quite clear
*/
errfile = target;
- /*
- * We now need to reset the result, because the above call,
- * if it failed, may have put an error message in place.
- * (Ideally we would prefer not to pass an interpreter in
- * above, but the channel IO code used by
- * TclCrossFilesystemCopy currently requires one)
- */
- Tcl_ResetResult(interp);
}
+ /*
+ * We now need to reset the result, because the above call,
+ * may have left set it. (Ideally we would prefer not to pass
+ * an interpreter in above, but the channel IO code used by
+ * TclCrossFilesystemCopy currently requires one)
+ */
+ Tcl_ResetResult(interp);
}
if ((copyFlag == 0) && (result == TCL_OK)) {
if (S_ISDIR(sourceStatBuf.st_mode)) {