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

#1378 (interim?) fix by testing isfile() before the remove()

Browse Source 
svn: r9410
This commit is contained in:
James G Sack 2007-11-26 10:17:36 +00:00
parent 0a10de647e
commit 3559bd6826
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2007-11-26 Jim Sack <jgsack@san.rr.com>
* src/plugins/ReadPkg.py : #1378 add isfile() before remove()
Note: this may be part a larger "relative path" problem
2007-11-24 Benny Malengier <benny.malengier@gramps-project.org> 2007-11-24 Benny Malengier <benny.malengier@gramps-project.org>
* src/Editors/_EditPerson.py: callback family update bug removed * src/Editors/_EditPerson.py: callback family update bug removed

4
src/plugins/ReadPkg.py
View File

@ -82,7 +82,8 @@ def impData(database, name,cb=None,cl=0):
else: # tempdir exists and writable -- clean it up if not empty else: # tempdir exists and writable -- clean it up if not empty
files = os.listdir(tmpdir_path) ; files = os.listdir(tmpdir_path) ;
for filename in files: for filename in files:
os.remove(os.path.join(tmpdir_path,filename)) if os.path.isfile(filename):
os.remove(os.path.join(tmpdir_path,filename))
try: try:
archive = tarfile.open(name) archive = tarfile.open(name)
@ -98,6 +99,7 @@ def impData(database, name,cb=None,cl=0):
importer = gramps_db_reader_factory(const.app_gramps_xml) importer = gramps_db_reader_factory(const.app_gramps_xml)
importer(database,imp_db_name,cb) importer(database,imp_db_name,cb)
# (it's not really a "tempdir" --Note this code may be in-flux?)
# Clean up tempdir after ourselves # Clean up tempdir after ourselves
# THIS HAS BEEN CHANGED, because now we want to keep images # THIS HAS BEEN CHANGED, because now we want to keep images
# stay after the import is over. Just delete the XML file. # stay after the import is over. Just delete the XML file.