diff --git a/ChangeLog b/ChangeLog index c5a120db9..a4f08195f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-11-26 Jim Sack + * src/plugins/ReadPkg.py : #1096 add isfile() before remove() + Note: this may be part a larger "relative path" problem + 2007-11-25 Jim Sack * src/Utils.py : add get_empty_tempdir() and rm_tempdir() * src/ArgHandler.py : use get_empty_tempdir, etc diff --git a/src/plugins/ReadPkg.py b/src/plugins/ReadPkg.py index 9f3b41540..abe4c1b97 100644 --- a/src/plugins/ReadPkg.py +++ b/src/plugins/ReadPkg.py @@ -82,7 +82,8 @@ def impData(database, name, cb=None, cl=0): else: # tempdir exists and writable -- clean it up if not empty files = os.listdir(tmpdir_path) ; 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: 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(database, imp_db_name, cb) + # (it's not really a "tempdir" --Note this code may be in-flux?) # Clean up tempdir after ourselves # THIS HAS BEEN CHANGED, because now we want to keep images # stay after the import is over. Just delete the XML file.