summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2016-03-01 14:17:47 -0800
committerPaul Phillips <paulp@improving.org>2016-03-01 14:17:47 -0800
commit7404b29859dffdc34ea27a73d82787f479575e93 (patch)
tree767165ad4dc0b40604863d563c9fd8889fde3beb /src
parentb0a18992df226691d10fae61bb74d44a1054136f (diff)
downloadunison-7404b29859dffdc34ea27a73d82787f479575e93.zip
unison-7404b29859dffdc34ea27a73d82787f479575e93.tar.gz
unison-7404b29859dffdc34ea27a73d82787f479575e93.tar.bz2
Probable source of linux failure.
Diffstat (limited to 'src')
-rw-r--r--src/uicommon.ml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/uicommon.ml b/src/uicommon.ml
index c4c4636..5ad8f61 100644
--- a/src/uicommon.ml
+++ b/src/uicommon.ml
@@ -495,7 +495,7 @@ let promptForRoots getFirstRoot getSecondRoot =
(* ---- *)
let makeTempDir pattern =
- let ic = Unix.open_process_in (Printf.sprintf "(mktemp --tmpdir -d %s || mktemp -d -t %s) 2>/dev/null" pattern pattern) in
+ let ic = Unix.open_process_in (Printf.sprintf "(mktemp --tmpdir -d %s.XXXXXX || mktemp -d -t %s) 2>/dev/null" pattern pattern) in
let path = input_line ic in
ignore (Unix.close_process_in ic);
path
@@ -550,7 +550,7 @@ let initPrefs ~profileName ~displayWaitMessage ~getFirstRoot ~getSecondRoot
(* Install dummy roots and backup directory if we are running self-tests *)
if Prefs.read runtests then begin
- let tmpdir = makeTempDir "unison-selftest" in
+ let tmpdir = makeTempDir "unisontest" in
if Globals.rawRoots() = [] then
Prefs.loadStrings [
"root = " ^ tmpdir ^ "a";