Skip to content

Commit

Permalink
this code has been disabled by default for a while, get rid of it
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@23830 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Sep 20, 2019
1 parent 28e7255 commit e180c54
Showing 1 changed file with 0 additions and 17 deletions.
17 changes: 0 additions & 17 deletions src/xpra/platform/xposix/paths.py
Expand Up @@ -8,13 +8,6 @@
import sys
import site

from xpra.util import envbool

#removed in 2.3:
# we no longer use "~/.xpra" on posix systems to store files or sockets,
# but we still load config files from there if present
LEGACY_DOTXPRA = envbool("XPRA_LEGACY_DOTXPRA", False)


def do_get_desktop_background_paths():
return [
Expand Down Expand Up @@ -87,9 +80,6 @@ def do_get_script_bin_dirs():
runtime_dir = _get_xpra_runtime_dir()
if runtime_dir:
script_bin_dirs.append(runtime_dir)
if LEGACY_DOTXPRA:
if os.geteuid()>0:
script_bin_dirs.append("~/.xpra")
return script_bin_dirs


Expand Down Expand Up @@ -150,11 +140,6 @@ def do_get_socket_dirs():
if runtime_dir:
#private, per user: /run/user/1000/xpra
SOCKET_DIRS.append(runtime_dir)
if LEGACY_DOTXPRA:
#Debian pretends to be root during build.. check FAKEROOTKEY
#to ensure we still include "~/.xpra" in the default config
if os.geteuid()>0 or os.environ.get("FAKEROOTKEY"):
SOCKET_DIRS.append("~/.xpra") #the old default path
#for shared sockets (the 'xpra' group should own this directory):
if os.path.exists("/run"):
SOCKET_DIRS.append("/run/xpra")
Expand All @@ -167,8 +152,6 @@ def do_get_default_log_dirs():
v = _get_xpra_runtime_dir()
if v:
log_dirs.append(v)
if LEGACY_DOTXPRA and os.geteuid()>0:
log_dirs.append("~/.xpra")
log_dirs.append("/tmp")
return log_dirs

Expand Down

0 comments on commit e180c54

Please sign in to comment.