File tree Expand file tree Collapse file tree 2 files changed +8
-10
lines changed Expand file tree Collapse file tree 2 files changed +8
-10
lines changed Original file line number Diff line number Diff line change @@ -120,10 +120,9 @@ defmodule Mix.Sync.Lock do
120
120
end
121
121
122
122
defp base_path do
123
+ # We include user in the dir to avoid permission conflicts across users
123
124
user = System . get_env ( "USER" , "default" )
124
- path = Path . join ( [ System . tmp_dir! ( ) , "mix_lock_#{ Base . url_encode64 ( user , padding: false ) } " ] )
125
- File . mkdir_p! ( path )
126
- path
125
+ Path . join ( System . tmp_dir! ( ) , "mix_lock_#{ Base . url_encode64 ( user , padding: false ) } " )
127
126
end
128
127
129
128
defp lock_disabled? ( ) , do: System . get_env ( "MIX_OS_CONCURRENCY_LOCK" ) in ~w( 0 false)
Original file line number Diff line number Diff line change @@ -272,18 +272,17 @@ defmodule Mix.Sync.PubSub do
272
272
273
273
defp hash ( key ) , do: :erlang . md5 ( key )
274
274
275
- defp base_path do
276
- user = System . get_env ( "USER" , "default" )
277
- path = Path . join ( [ System . tmp_dir! ( ) , "mix_pubsub_#{ Base . url_encode64 ( user , padding: false ) } " ] )
278
- File . mkdir_p! ( path )
279
- path
280
- end
281
-
282
275
defp path ( hash ) do
283
276
hash = Base . url_encode64 ( hash , padding: false )
284
277
Path . join ( base_path ( ) , hash )
285
278
end
286
279
280
+ defp base_path do
281
+ # We include user in the dir to avoid permission conflicts across users
282
+ user = System . get_env ( "USER" , "default" )
283
+ Path . join ( System . tmp_dir! ( ) , "mix_pubsub_#{ Base . url_encode64 ( user , padding: false ) } " )
284
+ end
285
+
287
286
defp recv ( socket , size , timeout \\ :infinity ) do
288
287
# eintr is "Interrupted system call".
289
288
with { :error , :eintr } <- :gen_tcp . recv ( socket , size , timeout ) do
You can’t perform that action at this time.
0 commit comments