diff options
| author | David Aguilar <davvid@gmail.com> | 2014-06-18 19:53:14 -0700 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2014-06-27 16:30:39 +1000 |
| commit | ac54a4b7715543a29cf72a49a3dd8add32796e86 (patch) | |
| tree | 52c63fa4ad3bb4b74a63482afd1efc26b52da4df | |
| parent | 105b5d3fbb1c00bb0aeaf9d3e0fbe26a7b1993fc (diff) | |
| download | git-ac54a4b7715543a29cf72a49a3dd8add32796e86.tar.gz | |
gitk: Catch mkdtemp errors
105b5d3f ("gitk: Use mktemp -d to avoid predictable temporary
directories") introduced a dependency on mkdtemp, which is not
available on Windows.
Use the original temporary directory behavior when mkdtemp fails.
This makes the code use mkdtemp when available and gracefully
fallback to the existing behavior when it is not available.
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rwxr-xr-x | gitk | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -3504,7 +3504,9 @@ proc gitknewtmpdir {} { set tmpdir $gitdir } set gitktmpformat [file join $tmpdir ".gitk-tmp.XXXXXX"] - set gitktmpdir [exec mktemp -d $gitktmpformat] + if {[catch {set gitktmpdir [exec mktemp -d $gitktmpformat]}]} { + set gitktmpdir [file join $gitdir [format ".gitk-tmp.%s" [pid]]] + } if {[catch {file mkdir $gitktmpdir} err]} { error_popup "[mc "Error creating temporary directory %s:" $gitktmpdir] $err" unset gitktmpdir |