summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Iry <jamesiry@gmail.com>2013-01-28 10:40:01 -0800
committerJames Iry <jamesiry@gmail.com>2013-01-28 10:40:01 -0800
commitd4de6f4cc6c3f0f9d7810c6e9a10147a0406e3f5 (patch)
tree4949df164d05138b89c1bb51259111405f8993af
parentc66edcc54ae33d363f2a4d9700c562ad1e8adc4b (diff)
parente0cf65101b601913aaf9e0e1624a022d6cb1b945 (diff)
downloadscala-d4de6f4cc6c3f0f9d7810c6e9a10147a0406e3f5.tar.gz
scala-d4de6f4cc6c3f0f9d7810c6e9a10147a0406e3f5.tar.bz2
scala-d4de6f4cc6c3f0f9d7810c6e9a10147a0406e3f5.zip
Merge pull request #1988 from melloc/fsc-temporary-directory-2.10.x
SI-4733 - fsc no longer creates a single temp directory for all users.
-rw-r--r--src/compiler/scala/tools/nsc/CompileSocket.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/CompileSocket.scala b/src/compiler/scala/tools/nsc/CompileSocket.scala
index 9a3e8d1530..4051bda914 100644
--- a/src/compiler/scala/tools/nsc/CompileSocket.scala
+++ b/src/compiler/scala/tools/nsc/CompileSocket.scala
@@ -72,7 +72,7 @@ class CompileSocket extends CompileOutputCommon {
/** A temporary directory to use */
val tmpDir = {
val udir = Option(Properties.userName) getOrElse "shared"
- val f = (Path(Properties.tmpDir) / "scala-devel" / udir).createDirectory()
+ val f = (Path(Properties.tmpDir) / ("scala-devel" + udir)).createDirectory()
if (f.isDirectory && f.canWrite) {
info("[Temp directory: " + f + "]")