Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Will not start gramps if the config option is used to show a value; changed the format of the output to make it easier to read/copy-paste

Browse Source 
svn: r15831
This commit is contained in:
Doug Blank 2010-08-30 01:14:38 +00:00
parent bf8146b9d1
commit 5c30db0739
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cli/argparser.py
View File

@ -179,6 +179,7 @@ class ArgParser(object):
# Go over all given option and place them into appropriate lists # Go over all given option and place them into appropriate lists
cleandbg = [] cleandbg = []
need_to_quit = False
for opt_ix in range(len(options)): for opt_ix in range(len(options)):
option, value = options[opt_ix] option, value = options[opt_ix]
if option in ( '-O', '--open'): if option in ( '-O', '--open'):
@ -223,20 +224,23 @@ class ArgParser(object):
set_value = True set_value = True
if config.has_default(setting_name): if config.has_default(setting_name):
setting_value = config.get(setting_name) setting_value = config.get(setting_name)
print "Current config setting '%s': %s" % ( print "Current Gramps config setting: %s:%s" % (
setting_name, setting_value) setting_name, repr(setting_value))
if set_value: if set_value:
if new_value == "DEFAULT": if new_value == "DEFAULT":
new_value = config.get_default(setting_name) new_value = config.get_default(setting_name)
else: else:
new_value = safe_eval(new_value) new_value = safe_eval(new_value)
config.set(setting_name, new_value) config.set(setting_name, new_value)
print " New config setting '%s': %s" % ( print " New Gramps config setting: %s:%s" % (
setting_name, config.get(setting_name)) setting_name, repr(config.get(setting_name)))
else: else:
print "CLI: no such config setting: '%s'" % setting_name need_to_quit = True
else: else:
print "Config settings from %s:" % config.config.filename print "Gramps: no such config setting: '%s'" % setting_name
need_to_quit = True
else:
print "Gramps config settings from %s:" % config.config.filename
for section in config.config.data: for section in config.config.data:
for setting in config.config.data[section]: for setting in config.config.data[section]:
print "%s.%s=%s" % ( print "%s.%s=%s" % (
@ -260,6 +264,8 @@ class ArgParser(object):
_("Error parsing the arguments: %s \n" _("Error parsing the arguments: %s \n"
"To use in the command-line mode," \ "To use in the command-line mode," \
"supply at least one input file to process.") % self.args[1:])] "supply at least one input file to process.") % self.args[1:])]
if need_to_quit:
sys.exit(0)
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# Determine the need for GUI # Determine the need for GUI