Fix shutil error + version bump

XBMC-Addons · Feb 9, 2020 · f8d1dc2 · f8d1dc2
1 parent 9cff6ed
commit f8d1dc2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/addon.xml b/addon.xml
@@ -1,4 +1,4 @@
-<addon id="script.module.xbmcswift2" name="xbmcswift2" provider-name="Jonathan Beluch (jbel), enen92" version="2.5.0">
+<addon id="script.module.xbmcswift2" name="xbmcswift2" provider-name="Jonathan Beluch (jbel), enen92" version="2.5.1">
   <requires>
     <import addon="xbmc.python" version="2.14.0" />
   </requires>

diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,7 @@
 CHANGES
 =======
+Version 2.5.1 (9/2/2020)
+- Fix shutil error when moving cache file
 
 Version 2.5.0 (4/12/2019)
 -------------

diff --git a/lib/xbmcswift2/storage.py b/lib/xbmcswift2/storage.py
@@ -60,6 +60,11 @@ def sync(self):
             raise
         finally:
             fileobj.close()
+
+        # shutil error (SameFileError when performing copyfile)
+        if os.path.exists(self.filename):
+            os.remove(self.filename)
+
         shutil.move(tempname, self.filename)    # atomic commit
         if self.mode is not None:
             os.chmod(self.filename, self.mode)