diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index dd741977a..f468a2c10 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -2,6 +2,8 @@ * src/TreeTips.py: Typo. * src/plugins/ScratchPad.py: Convert to new API. * src/plugins/DumpGenderStats.py: Convert to new API. + * src/ArgHandler.py: Do actions prior to exports. + * doc/gramps.1.in: Document new execution order. 2005-10-06 Stefan Bjork * src/plugins/rel_sv.py: Obviosly, level=1 to get_parents means diff --git a/gramps2/doc/gramps.1.in b/gramps2/doc/gramps.1.in index 0fdbd7835..5dc7a1360 100644 --- a/gramps2/doc/gramps.1.in +++ b/gramps2/doc/gramps.1.in @@ -174,8 +174,8 @@ exports, and actions specified further on the command line by using \fB\-i\fR, .LP The order of \fB\-i\fR, \fB\-o\fR, or \fB\-a\fR options does not matter. The -actual order always is: all imports (if any) -> all exports (if any) -> -all actions (if any). But opening must always be first! +actual order always is: all imports (if any) -> all actions (if any) +-> all exports (if any). But opening must always be first! .LP If no \fB\-O\fR or \fB\-i\fR option is given, gramps will launch its main diff --git a/gramps2/src/ArgHandler.py b/gramps2/src/ArgHandler.py index 74fdeb152..0699f273a 100644 --- a/gramps2/src/ArgHandler.py +++ b/gramps2/src/ArgHandler.py @@ -385,16 +385,16 @@ class ArgHandler: print "Launching interactive session..." if self.parent.cl: - for expt in self.exports: - print "Exporting: file %s, format %s." % expt - self.cl_export(expt[0],expt[1]) - for (action,options_str) in self.actions: print "Performing action: %s." % action if options_str: print "Using options string: %s" % options_str self.cl_action(action,options_str) + for expt in self.exports: + print "Exporting: file %s, format %s." % expt + self.cl_export(expt[0],expt[1]) + print "Cleaning up." # remove import db after use self.parent.db.close()