2007-04-20 Alex Roitman <shura@gramps-project.org>
* src/plugins/Checkpoint.py (Checkpoint.rcs): Remove debugging output; Work out retrieval. svn: r8411
This commit is contained in:
parent
835079dae2
commit
bc2ef71467
@ -1,3 +1,7 @@
|
||||
2007-04-20 Alex Roitman <shura@gramps-project.org>
|
||||
* src/plugins/Checkpoint.py (Checkpoint.rcs): Remove debugging
|
||||
output; Work out retrieval.
|
||||
|
||||
2007-04-20 Don Allingham <don@gramps-project.org>
|
||||
* src/DisplayModels/_BaseModel.py (BaseModel.add_row_by_handle):
|
||||
if search not defined, do an insert
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Gramps - a GTK+/GNOME based genealogy program
|
||||
#
|
||||
# Copyright (C) 2000-2006 Donald N. Allingham
|
||||
# Copyright (C) 2000-2007 Donald N. Allingham
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
@ -325,7 +325,7 @@ class Checkpoint(Tool.Tool, ManagedWindow.ManagedWindow):
|
||||
xmlwrite.write(archive_base)
|
||||
|
||||
cmd = ["ci", archive_base]
|
||||
print cmd
|
||||
# print cmd
|
||||
|
||||
proc = subprocess.Popen(
|
||||
cmd,
|
||||
@ -353,13 +353,18 @@ class Checkpoint(Tool.Tool, ManagedWindow.ManagedWindow):
|
||||
else:
|
||||
dialog(msg1,msg2)
|
||||
else:
|
||||
output = archive_base + ".checkpoint.gramps"
|
||||
fd = open(output,'wt')
|
||||
|
||||
cmd = ("co", "-p", archive_base)
|
||||
proc = subprocess.Popen(
|
||||
("co", "-p", archive_base), stdout=subprocess.PIPE,
|
||||
cmd,
|
||||
stdout = fd,
|
||||
stderr = subprocess.PIPE )
|
||||
status = proc.wait()
|
||||
message = "\n".join(proc.stderr.readlines())
|
||||
proc.stderr.close()
|
||||
fd.close()
|
||||
del proc
|
||||
|
||||
if status:
|
||||
@ -368,7 +373,7 @@ class Checkpoint(Tool.Tool, ManagedWindow.ManagedWindow):
|
||||
dialog = ErrorDialog
|
||||
else:
|
||||
msg1 = retrieve_success_msg[0]
|
||||
msg2 = retrieve_success_msg[1]
|
||||
msg2 = retrieve_success_msg[1] + "\n\t" + output
|
||||
dialog = OkDialog
|
||||
|
||||
if cli:
|
||||
|
Loading…
Reference in New Issue
Block a user