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

revert r9411 -- better leave it broken

Browse Source 
svn: r9412
This commit is contained in:
James G Sack 2007-11-26 11:19:07 +00:00
parent f6b5ac971e
commit f9304ef86c
2 changed files with 5 additions and 3 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 : reverted previous change
better to leave it broken than to risk worse
2007-11-26 Jim Sack <jgsack@san.rr.com> 2007-11-26 Jim Sack <jgsack@san.rr.com>
* src/plugins/ReadPkg.py : #1096 add isfile() before remove() * src/plugins/ReadPkg.py : #1096 add isfile() before remove()
Note: this may be part a larger "relative path" problem Note: this may be part a larger "relative path" problem

4
src/plugins/ReadPkg.py
View File

@ -82,8 +82,7 @@ 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:
if os.path.isfile(filename): os.remove(os.path.join(tmpdir_path, filename))
os.remove(os.path.join(tmpdir_path, filename))
try: try:
archive = tarfile.open(name) archive = tarfile.open(name)
@ -99,7 +98,6 @@ 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.