diff options
Diffstat (limited to 'sysutils/py-supervisor/files/patch-supervisor_options.py')
| -rw-r--r-- | sysutils/py-supervisor/files/patch-supervisor_options.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sysutils/py-supervisor/files/patch-supervisor_options.py b/sysutils/py-supervisor/files/patch-supervisor_options.py index 6a91ec1009b5..12876cb4548b 100644 --- a/sysutils/py-supervisor/files/patch-supervisor_options.py +++ b/sysutils/py-supervisor/files/patch-supervisor_options.py @@ -1,14 +1,14 @@ ---- supervisor/options.py.orig 2012-01-10 12:55:20.000000000 +0300 -+++ supervisor/options.py 2012-01-10 12:56:14.000000000 +0300 -@@ -92,10 +92,7 @@ - def default_configfile(self): - """Return the name of the found config file or raise. """ +--- supervisor/options.py.orig 2013-06-20 21:00:12.000000000 +0400 ++++ supervisor/options.py 2013-08-08 14:41:08.000000000 +0400 +@@ -99,10 +99,7 @@ + self.add("configfile", None, "c:", "configuration=") + 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'] -+ paths = [ '%%PREFIX%%/etc/supervisord.conf' ] - config = None - for path in paths: - if os.path.exists(path): +- searchpaths = [os.path.join(here, 'etc', 'supervisord.conf'), +- os.path.join(here, 'supervisord.conf'), +- 'supervisord.conf', 'etc/supervisord.conf', +- '/etc/supervisord.conf'] ++ searchpaths = [ '/usr/local/etc/supervisord.conf' ] + self.searchpaths = searchpaths + + def default_configfile(self): |