diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2010-11-22 18:54:49 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2010-11-22 18:54:49 +0000 |
| commit | 048d322f5c01d03d14a21a12987867172a14dbd1 (patch) | |
| tree | d5d17293759d1a7c5d6231f36c7715cd1a12ca31 /sysutils/py-supervisor/files/patch-src-supervisor-options.py | |
| parent | Update to 0.5 (diff) | |
- Update to 3.0a9
PR: ports/152196
Submitted by: Ildar Hizbulin <hizel@vyborg.ru> (maintainer)
Notes
Notes:
svn path=/head/; revision=264938
Diffstat (limited to 'sysutils/py-supervisor/files/patch-src-supervisor-options.py')
| -rw-r--r-- | sysutils/py-supervisor/files/patch-src-supervisor-options.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sysutils/py-supervisor/files/patch-src-supervisor-options.py b/sysutils/py-supervisor/files/patch-src-supervisor-options.py index 46c7f1737f4a..bdee95882019 100644 --- a/sysutils/py-supervisor/files/patch-src-supervisor-options.py +++ b/sysutils/py-supervisor/files/patch-src-supervisor-options.py @@ -1,11 +1,14 @@ ---- src/supervisor/options.py.orig 2010-02-11 13:25:24.000000000 +0300 -+++ src/supervisor/options.py 2010-02-11 13:25:55.000000000 +0300 -@@ -105,7 +105,7 @@ +--- src/supervisor/options.py.orig 2010-08-14 02:34:50.000000000 +0800 ++++ src/supervisor/options.py 2010-11-23 02:33:20.000000000 +0800 +@@ -105,10 +105,7 @@ def default_configfile(self): """Return the name of the found config file or raise. """ - paths = ['supervisord.conf', 'etc/supervisord.conf', + here = os.path.dirname(os.path.dirname(sys.argv[0])) +- paths = [os.path.join(here, 'etc', 'supervisord.conf'), +- os.path.join(here, 'supervisord.conf'), +- 'supervisord.conf', 'etc/supervisord.conf', - '/etc/supervisord.conf'] -+ '/etc/supervisord.conf', '%%PREFIX%%/etc/supervisord.conf'] ++ paths = [ '%%PREFIX%%/etc/supervisord.conf' ] config = None for path in paths: if os.path.exists(path): |