1diff -ur ../orig/supervisor/supervisor/datatypes.py ./supervisor/datatypes.py
2--- ../orig/supervisor/supervisor/datatypes.py 2016-05-03 14:17:42.739314785 +0000
3+++ ./supervisor/datatypes.py 2016-05-03 14:15:50.101248478 +0000
4@@ -328,13 +328,13 @@
5 raise ValueError('%s can not be converted to an octal type' % arg)
6
7 def existing_directory(v):
8- nv = os.path.expanduser(v)
9+ nv = os.path.expanduser(os.path.expandvars(v))
10 if os.path.isdir(nv):
11 return nv
12 raise ValueError('%s is not an existing directory' % v)
13
14 def existing_dirpath(v):
15- nv = os.path.expanduser(v)
16+ nv = os.path.expanduser(os.path.expandvars(v))
17 dir = os.path.dirname(nv)
18 if not dir:
19 # relative pathname with no directory component
20Only in ./supervisor: datatypes.py.orig
21diff -ur ../orig/supervisor/supervisor/options.py ./supervisor/options.py
22--- ../orig/supervisor/supervisor/options.py 2016-05-03 14:17:43.120446781 +0000
23+++ ./supervisor/options.py 2016-05-03 14:19:06.448500630 +0000
24@@ -110,6 +110,7 @@
25 'etc/supervisord.conf',
26 '/etc/supervisord.conf',
27 '/etc/supervisor/supervisord.conf',
28+ os.path.expanduser('~/.supervisord.conf'),
29 ]
30 self.searchpaths = searchpaths
31
32@@ -1025,6 +1026,8 @@
33 get = parser.saneget
34 username = get(section, 'username', None)
35<<<hidden due to potential security issue>>>
36<<<hidden due to potential security issue>>>
37<<<hidden due to potential security issue>>>
38<<<hidden due to potential security issue>>>
39<<<hidden due to potential security issue>>>
40 raise ValueError(
41@@ -1655,6 +1658,8 @@
42 section.prompt = parser.getdefault('prompt', section.prompt)
43 section.username = parser.getdefault('username', section.username)
44<<<hidden due to potential security issue>>>
45<<<hidden due to potential security issue>>>
46<<<hidden due to potential security issue>>>
47 history_file = parser.getdefault('history_file', section.history_file,
48 expansions={'here': self.here})