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

Don't exit from arghandler, just return

Browse Source
This commit is contained in:
Doug Blank 2016-01-05 13:00:30 -05:00
parent 8717839809
commit d44673c260
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gramps/cli/arghandler.py
View File

@ -382,7 +382,7 @@ class ArgHandler(object):
self.__import_action() self.__import_action()
return None return None
def handle_args_cli(self, cleanup=True, should_exit=True): def handle_args_cli(self, cleanup=True):
""" """
Depending on the given arguments, import or open data, launch Depending on the given arguments, import or open data, launch
session, write files, and/or perform actions. session, write files, and/or perform actions.
@ -399,37 +399,25 @@ class ArgHandler(object):
print(_("%(full_DB_path)s with name \"%(f_t_name)s\"") print(_("%(full_DB_path)s with name \"%(f_t_name)s\"")
% {'full_DB_path' : dirname, 'f_t_name' : name}) % {'full_DB_path' : dirname, 'f_t_name' : name})
if should_exit: return
sys.exit(0)
else:
return
# Handle the "--remove" Family Tree # Handle the "--remove" Family Tree
if self.removes: if self.removes:
for name in self.removes: for name in self.removes:
self.dbman.remove_database(name, self.user) self.dbman.remove_database(name, self.user)
if should_exit: return
sys.exit(0)
else:
return
# Handle the "-L" List Family Trees in detail option. # Handle the "-L" List Family Trees in detail option.
if self.list_more: if self.list_more:
self.dbman.print_family_tree_summaries() self.dbman.print_family_tree_summaries()
if should_exit: return
sys.exit(0)
else:
return
# Handle the "-t" List Family Trees, tab delimited option. # Handle the "-t" List Family Trees, tab delimited option.
if self.list_table: if self.list_table:
print(_('Gramps Family Trees:')) print(_('Gramps Family Trees:'))
summary_list = self.dbman.family_tree_summary() summary_list = self.dbman.family_tree_summary()
if not summary_list: if not summary_list:
if should_exit: return
sys.exit(0)
else:
return
# We have to construct the line elements together, to avoid # We have to construct the line elements together, to avoid
# insertion of blank spaces when print on the same line is used # insertion of blank spaces when print on the same line is used
line_list = [_("Family Tree")] line_list = [_("Family Tree")]
@ -445,10 +433,7 @@ class ArgHandler(object):
# translators: used in French+Russian, ignore otherwise # translators: used in French+Russian, ignore otherwise
line_list += [(_('"%s"') % summary[item])] line_list += [(_('"%s"') % summary[item])]
print("\t".join(line_list)) print("\t".join(line_list))
if should_exit: return
sys.exit(0)
else:
return
self.__open_action() self.__open_action()
self.__import_action() self.__import_action()
@ -468,9 +453,6 @@ class ArgHandler(object):
if cleanup: if cleanup:
self.cleanup() self.cleanup()
print(_("Exiting."), file=sys.stderr)
if should_exit:
sys.exit(0)
def cleanup(self): def cleanup(self):
print(_("Cleaning up."), file=sys.stderr) print(_("Cleaning up."), file=sys.stderr)