xmw 15/06/07 17:10:50 Added: xpra-0.15.0-prefix.patch Log: Version bump (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Revision Changes Path 1.1 x11-wm/xpra/files/xpra-0.15.0-prefix.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/xpra/files/xpra-0.15.0-prefix.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/xpra/files/xpra-0.15.0-prefix.patch?rev=1.1&content-type=text/plain Index: xpra-0.15.0-prefix.patch =================================================================== --- xpra-0.15.0/setup.py +++ xpra-0.15.0/setup.py @@ -1612,8 +1612,8 @@ #prepare default [/usr/local]/etc configuration files: if '--user' in sys.argv: etc_prefix = 'etc/xpra' - elif sys.prefix == '/usr': - etc_prefix = '/etc/xpra' + elif sys.prefix[-4:] == '/usr': + etc_prefix = sys.prefix[:-4] + '/etc/xpra' else: etc_prefix = sys.prefix + '/etc/xpra' --- xpra-0.15.0/xpra/platform/paths.py +++ xpra-0.15.0/xpra/platform/paths.py @@ -30,9 +30,9 @@ return env_conf_dir prefix = get_install_prefix() #the system wide configuration directory - if prefix == '/usr': + if sys.prefix[-4:] == '/usr': #default posix config location: - return '/etc/xpra' + return sys.prefix[:-4] + '/etc/xpra' #hope the prefix is something like "/usr/local" or "$HOME/.local": return prefix + '/etc/xpra/'
