Merge pull request #1066 from SickRage/bugfix-1042

Fixes https://github.com/SickRage/sickrage-issues/issues/1042
pymedusa · Feb 22, 2016 · cc64ab9 · cc64ab9
2 parents f07dff9 + bcaac97
commit cc64ab9
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/sickbeard/helpers.py b/sickbeard/helpers.py
@@ -355,7 +355,7 @@ def copyFile(srcFile, destFile):
     except (SpecialFileError, Error) as error:
         logger.log(error, logger.WARNING)
     except Exception as error:
-        logger.log(error, logger.ERROR)
+        logger.log(u'{}'.format(error), logger.ERROR)
     else:
         try:
             ek(shutil.copymode, srcFile, destFile)
@@ -1347,10 +1347,9 @@ def touchFile(fname, atime=None):
     :return: True on success, False on failure
     """
 
-    if atime and fname:
-        with file(fname, 'a'):
-            os.utime(fname, (atime, atime))
-            return True
+    if atime and fname and ek(os.path.isfile, fname):
+        ek(os.utime, fname, (atime, atime))
+        return True
 
     return False