Gentoo Archives: gentoo-commits

From: "Benda XU (heroxbd)" <heroxbd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-wm/xpra/files: xpra-0.10.1-prefix.patch
Date: Fri, 30 Aug 2013 08:36:56
Message-Id: 20130830083650.F1B6C2004E@flycatcher.gentoo.org
1 heroxbd 13/08/30 08:36:50
2
3 Added: xpra-0.10.1-prefix.patch
4 Log:
5 patch runtime /etc directory for Prefix. bug 482988. Thanks to Michael for reviewing.
6
7 (Portage version: 2.2.0/cvs/Linux x86_64, unsigned Manifest commit)
8
9 Revision Changes Path
10 1.1 x11-wm/xpra/files/xpra-0.10.1-prefix.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/xpra/files/xpra-0.10.1-prefix.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/xpra/files/xpra-0.10.1-prefix.patch?rev=1.1&content-type=text/plain
14
15 Index: xpra-0.10.1-prefix.patch
16 ===================================================================
17 Index: xpra-0.10.1/setup.py
18 ===================================================================
19 --- xpra-0.10.1.orig/setup.py
20 +++ xpra-0.10.1/setup.py
21 @@ -896,8 +896,8 @@ else:
22 return {}
23 if "install" in sys.argv:
24 #prepare default [/usr/local]/etc configuration files:
25 - if sys.prefix == '/usr':
26 - etc_prefix = '/etc/xpra'
27 + if sys.prefix[-4:] == '/usr':
28 + etc_prefix = sys.prefix[:-4] + '/etc/xpra'
29 else:
30 etc_prefix = sys.prefix + '/etc/xpra'
31
32 Index: xpra-0.10.1/xpra/scripts/config.py
33 ===================================================================
34 --- xpra-0.10.1.orig/xpra/scripts/config.py
35 +++ xpra-0.10.1/xpra/scripts/config.py
36 @@ -344,8 +344,8 @@ def read_xpra_defaults():
37 #first, read the global defaults:
38 if sys.platform.startswith("win"):
39 conf_dir = os.path.dirname(os.path.abspath(sys.executable))
40 - elif sys.prefix == '/usr':
41 - conf_dir = '/etc/xpra'
42 + elif sys.prefix[-4:] == '/usr':
43 + conf_dir = sys.prefix[:-4] + '/etc/xpra'
44 else:
45 conf_dir = sys.prefix + '/etc/xpra/'
46 defaults = read_xpra_conf(conf_dir)