1diff -ru ../orig/supervisor-3.0b1/supervisor/datatypes.py ./supervisor/datatypes.py
 2--- ../orig/supervisor-3.0b1/supervisor/datatypes.py    2012-08-23 03:45:12.000000000 +0200
 3+++ ./supervisor/datatypes.py    2012-12-06 14:37:17.512427000 +0100
 4@@ -333,14 +333,20 @@
 5     return pwrec[3]
 6 
 7 def existing_directory(v):
 8-    nv = v % {'here':here}
 9+    from options import environ_expansions
10+    expansions = {'here': here}
11+    expansions.update(environ_expansions())
12+    nv = v % expansions
13     nv = os.path.expanduser(nv)
14     if os.path.isdir(nv):
15         return nv
16     raise ValueError('%s is not an existing directory' % v)
17 
18 def existing_dirpath(v):
19-    nv = v % {'here':here}
20+    from options import environ_expansions
21+    expansions = {'here': here}
22+    expansions.update(environ_expansions())
23+    nv = v % expansions
24     nv = os.path.expanduser(nv)
25     dir = os.path.dirname(nv)
26     if not dir:
27Only in ./supervisor: datatypes.py.orig
28Only in ./supervisor: datatypes.py.rej
29diff -ru ../orig/supervisor-3.0b1/supervisor/options.py ./supervisor/options.py
30--- ../orig/supervisor-3.0b1/supervisor/options.py    2012-08-23 03:45:12.000000000 +0200
31+++ ./supervisor/options.py    2012-12-06 14:56:27.352769906 +0100
32@@ -97,7 +97,8 @@
33         paths = [os.path.join(here, 'etc', 'supervisord.conf'),
34                  os.path.join(here, 'supervisord.conf'),
35                  'supervisord.conf', 'etc/supervisord.conf',
36-                 '/etc/supervisord.conf']
37+                 '/etc/supervisord.conf',
38+                 os.path.expanduser('~/.supervisord.conf')]
39         config = None
40         for path in paths:
41             if os.path.exists(path):
42@@ -890,6 +891,9 @@
43         get = parser.saneget
44         username = get(section, 'username', None)
45<<<hidden due to potential security issue>>>
46<<<hidden due to potential security issue>>>
47+            from options import environ_expansions
48<<<hidden due to potential security issue>>>
49<<<hidden due to potential security issue>>>
50             raise ValueError(
51<<<hidden due to potential security issue>>>
52@@ -1479,6 +1483,8 @@
53         section.prompt = config.getdefault('prompt', section.prompt)
54         section.username = config.getdefault('username', section.username)
55<<<hidden due to potential security issue>>>
56+        from options import environ_expansions
57<<<hidden due to potential security issue>>>
58         history_file = config.getdefault('history_file', section.history_file)
59 
60         if history_file:
61Only in ./supervisor: options.py.orig