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

2007-04-20 Alex Roitman <shura@gramps-project.org>

Browse Source 
* src/plugins/Checkpoint.py (Checkpoint.rcs): Remove debugging
	output; Work out retrieval.



svn: r8411
This commit is contained in:
Alex Roitman 2007-04-21 02:50:11 +00:00
parent 835079dae2
commit bc2ef71467
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -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> 2007-04-20 Don Allingham <don@gramps-project.org>
* src/DisplayModels/_BaseModel.py (BaseModel.add_row_by_handle): * src/DisplayModels/_BaseModel.py (BaseModel.add_row_by_handle):
if search not defined, do an insert if search not defined, do an insert

13
gramps2/src/plugins/Checkpoint.py
View File

@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # 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 # 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 # 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) xmlwrite.write(archive_base)
cmd = ["ci", archive_base] cmd = ["ci", archive_base]
print cmd # print cmd
proc = subprocess.Popen( proc = subprocess.Popen(
cmd, cmd,
@ -353,13 +353,18 @@ class Checkpoint(Tool.Tool, ManagedWindow.ManagedWindow):
else: else:
dialog(msg1,msg2) dialog(msg1,msg2)
else: else:
output = archive_base + ".checkpoint.gramps"
fd = open(output,'wt')
cmd = ("co", "-p", archive_base)
proc = subprocess.Popen( proc = subprocess.Popen(
("co", "-p", archive_base), stdout=subprocess.PIPE, cmd,
stdout = fd,
stderr = subprocess.PIPE ) stderr = subprocess.PIPE )
status = proc.wait() status = proc.wait()
message = "\n".join(proc.stderr.readlines()) message = "\n".join(proc.stderr.readlines())
proc.stderr.close() proc.stderr.close()
fd.close()
del proc del proc
if status: if status:
@ -368,7 +373,7 @@ class Checkpoint(Tool.Tool, ManagedWindow.ManagedWindow):
dialog = ErrorDialog dialog = ErrorDialog
else: else:
msg1 = retrieve_success_msg[0] msg1 = retrieve_success_msg[0]
msg2 = retrieve_success_msg[1] msg2 = retrieve_success_msg[1] + "\n\t" + output
dialog = OkDialog dialog = OkDialog
if cli: if cli: