codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix up error message when not specifying a directory with the --config option and add this to 1.1.x

This commit is contained in:
Andrew Resch 2009-05-11 04:10:05 +00:00
parent 128b40641f
commit 7aea3a290e
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
deluge/main.py
View File

@ -66,6 +66,20 @@ def start_ui():
# Get the options and args from the OptionParser # Get the options and args from the OptionParser
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
if options.config:
if not os.path.exists(options.config):
# Try to create the config folder if it doesn't exist
try:
os.makedirs(options.config)
except Exception, e:
pass
elif not os.path.isdir(options.config):
print "Config option needs to be a directory!"
sys.exit(1)
else:
if not os.path.exists(deluge.common.get_default_config_dir()):
os.makedirs(deluge.common.get_default_config_dir())
if options.default_ui: if options.default_ui:
if options.config: if options.config:
deluge.configmanager.set_config_dir(options.config) deluge.configmanager.set_config_dir(options.config)
@ -79,21 +93,6 @@ def start_ui():
if options.quiet: if options.quiet:
options.loglevel = "none" options.loglevel = "none"
if options.config:
if not os.path.isdir(options.config):
print "Config option needs to be a directory!"
sys.exit(1)
if not os.path.exists(options.config):
# Try to create the config folder if it doesn't exist
try:
os.makedirs(options.config)
except Exception, e:
pass
else:
if not os.path.exists(deluge.common.get_default_config_dir()):
os.makedirs(deluge.common.get_default_config_dir())
# Setup the logger # Setup the logger
deluge.log.setupLogger(level=options.loglevel, filename=options.logfile) deluge.log.setupLogger(level=options.loglevel, filename=options.logfile)