From 5217058733138cf4ffa06af50129c931c5c09fdb Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Wed, 20 Jun 2007 04:44:32 +0000 Subject: [PATCH] 2007-06-19 Don Allingham * src/DbManager.py: handle RCS init properly, don't use gziped files * src/GrampsDbUtils/_WriteXML.py: pass compress argument properly 2007-06-19 Don Allingham * src/DbManager.py: parse comment for display in list * src/glade/gramps.glade: fix names of buttons on dbmanager svn: r8606 --- ChangeLog | 8 ++++++++ src/DbManager.py | 21 ++++++++++++--------- src/GrampsDbUtils/_WriteXML.py | 2 +- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7393559cf..9f60c29e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,15 @@ +2007-06-19 Don Allingham + * src/DbManager.py: handle RCS init properly, don't use gziped files + * src/GrampsDbUtils/_WriteXML.py: pass compress argument properly + 2007-06-19 Alex Roitman * src/FilterEditor/_FilterEditor.py (_find_dependent_filters): Add method to first find all filters fo deletion. +2007-06-19 Don Allingham + * src/DbManager.py: parse comment for display in list + * src/glade/gramps.glade: fix names of buttons on dbmanager + 2007-06-19 Alex Roitman * src/FilterEditor/_FilterEditor.py (_do_delete_filter): Use a copy for iteration over the filters. diff --git a/src/DbManager.py b/src/DbManager.py index b021a32d1..4788174e5 100644 --- a/src/DbManager.py +++ b/src/DbManager.py @@ -149,6 +149,8 @@ class DbManager: """ if event.type == gtk.gdk._2BUTTON_PRESS and event.button == 1: data = self.selection.get_selected() + if data[STOCK_COL] == 'gramps-lock': + return if data[1]: self.top.response(gtk.RESPONSE_OK) return True @@ -548,7 +550,7 @@ def find_revisions(name): return revlist def check_in(db, filename, callback): - init = [ "rcs", '-i', '-U', '-q', '-t'"GRAMPS database", ] + init = [ "rcs", '-i', '-U', '-q', '-t-GRAMPS database', ] ci = [ "ci", "-q" ] glade = gtk.glade.XML(const.gladeFile, "comment", "gramps") @@ -559,17 +561,17 @@ def check_in(db, filename, callback): comment = text.get_text() top.destroy() - proc = subprocess.Popen(init + [filename + ",v"], stderr = subprocess.PIPE) - status = proc.wait() - message = "\n".join(proc.stderr.readlines()) - proc.stderr.close() - del proc + if not os.path.isfile(filename + ",v") : + proc = subprocess.Popen(init + [filename + ",v"], stderr = subprocess.PIPE) + status = proc.wait() + message = "\n".join(proc.stderr.readlines()) + proc.stderr.close() + del proc - xmlwrite = GrampsDbUtils.XmlWriter(db, callback, - False, False) + xmlwrite = GrampsDbUtils.XmlWriter(db, callback, False, 0) xmlwrite.write(filename) - cmd = ci + ['-m%s' % comment, filename] + cmd = ci + ['-m%s' % comment, filename, filename + ",v" ] proc = subprocess.Popen( cmd, @@ -577,6 +579,7 @@ def check_in(db, filename, callback): stderr = subprocess.PIPE ) proc.stdin.close() message = "\n".join(proc.stderr.readlines()) + print message proc.stderr.close() status = proc.wait() del proc diff --git a/src/GrampsDbUtils/_WriteXML.py b/src/GrampsDbUtils/_WriteXML.py index 9e4039da4..161725aec 100644 --- a/src/GrampsDbUtils/_WriteXML.py +++ b/src/GrampsDbUtils/_WriteXML.py @@ -81,7 +81,7 @@ class XmlWriter(GrampsDbXmlWriter): def __init__(self, db, callback, strip_photos, compress=1): """ """ - GrampsDbXmlWriter.__init__(self, db, version=const.version) + GrampsDbXmlWriter.__init__(self, db, strip_photos, compress, const.version) def write(self,filename): """