From c7b87953ff0a8f306112ce7384f5f7500fde76d9 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 21 Jan 2016 23:33:37 +0000 Subject: [PATCH] remove any "socket-dir" paths containing the uid: osx uses /var/tmp/$UID-Xpra, but this should not be included in the default config for all users! (the buildbot's uid!) git-svn-id: https://xpra.org/svn/Xpra/trunk@11713 3bb7dfac-3a0b-4e04-842a-767bc560f471 --- src/setup.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/setup.py b/src/setup.py index 5dd213ff5c..047f05cf2c 100755 --- a/src/setup.py +++ b/src/setup.py @@ -857,6 +857,12 @@ def bstr(b): from xpra.platform.paths import get_socket_dirs, get_default_log_dir #remove build paths and user specific paths with UID ("/run/user/UID/Xpra"): socket_dirs = get_socket_dirs() + if os.getuid()>0: + #remove any paths containing the uid, + #osx uses /var/tmp/$UID-Xpra, + #but this should not be included in the default config for all users! + #(the buildbot's uid!) + socket_dirs = [x for x in socket_dirs if x.find(str(os.getuid()))<0] if WIN32: bind = "" else: