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

2007-06-19 Alex Roitman <shura@gramps-project.org>

Browse Source 
* src/DbManager.py (check_in): Add -f option to ci to force
	checking even if it is identical.

2007-06-19  Alex Roitman  <shura@gramps-project.org>


svn: r8607
This commit is contained in:
Alex Roitman 2007-06-20 04:53:30 +00:00
parent 5217058733
commit ede07988fa
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,8 +1,12 @@
2007-06-19 Alex Roitman <shura@gramps-project.org>
* src/DbManager.py (check_in): Add -f option to ci to force
checking even if it is identical.
2007-06-19 Don Allingham <don@gramps-project.org> 2007-06-19 Don Allingham <don@gramps-project.org>
* src/DbManager.py: handle RCS init properly, don't use gziped files * src/DbManager.py: handle RCS init properly, don't use gziped files
* src/GrampsDbUtils/_WriteXML.py: pass compress argument properly * src/GrampsDbUtils/_WriteXML.py: pass compress argument properly
2007-06-19 Alex Roitman <shura@phy.ucsf.edu> 2007-06-19 Alex Roitman <shura@gramps-project.org>
* src/FilterEditor/_FilterEditor.py (_find_dependent_filters): * src/FilterEditor/_FilterEditor.py (_find_dependent_filters):
Add method to first find all filters fo deletion. Add method to first find all filters fo deletion.

7
src/DbManager.py
View File

@ -550,8 +550,8 @@ def find_revisions(name):
return revlist return revlist
def check_in(db, filename, callback): 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" ] ci = [ "ci", "-q", "-f" ]
glade = gtk.glade.XML(const.gladeFile, "comment", "gramps") glade = gtk.glade.XML(const.gladeFile, "comment", "gramps")
top = glade.get_widget('comment') top = glade.get_widget('comment')
@ -562,7 +562,8 @@ def check_in(db, filename, callback):
top.destroy() top.destroy()
if not os.path.isfile(filename + ",v") : if not os.path.isfile(filename + ",v") :
proc = subprocess.Popen(init + [filename + ",v"], stderr = subprocess.PIPE) proc = subprocess.Popen(init + [filename + ",v"],
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()