diff options
author | Aleksey Lim <alsroot@sugarlabs.org> | 2013-07-30 16:52:43 (GMT) |
---|---|---|
committer | Aleksey Lim <alsroot@sugarlabs.org> | 2013-07-30 16:52:43 (GMT) |
commit | 03c82f2a57e72e3a65b9a38e70ecd83b85595ada (patch) | |
tree | 783c4019c5b793cfe5412c9ff3e8a1de8e66bf5c /sugar-network | |
parent | cdde7a3c7c7a50db231333be5f91e799d0bfcd25 (diff) |
Config /etc/sweets.conf has a priority against /etc/sweets.d
Diffstat (limited to 'sugar-network')
-rwxr-xr-x | sugar-network | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sugar-network b/sugar-network index 770c8df..1b7efb3 100755 --- a/sugar-network +++ b/sugar-network @@ -30,9 +30,7 @@ from sugar_network import db, client, toolkit from sugar_network.model import RESOURCES from sugar_network.client import IPCConnection, Connection from sugar_network.client.routes import ClientRoutes -from sugar_network.node.routes import load_bundle from sugar_network.toolkit.router import Router, Request, Response -from sugar_network.toolkit.spec import Spec from sugar_network.toolkit import application, coroutine from sugar_network.toolkit import Option, BUFFER_SIZE, enforce @@ -162,7 +160,6 @@ class Application(application.Application): def POST(self): self.post() - @application.command( 'send raw API PUT request; ' 'specifies all ARGUMENTs the particular API call requires', @@ -358,8 +355,8 @@ app = Application( epilog='See http://wiki.sugarlabs.org/go/Sugar_Network ' 'for details.', config_files=[ - '/etc/sweets.conf', '/etc/sweets.d', + '/etc/sweets.conf', '~/.config/sweets/config', client.profile_path('sweets.conf'), ], |