Browse Source

Improve source updater

pull/584/head
Ruud 13 years ago
parent
commit
db347f3fb7
  1. 19
      couchpotato/core/_base/updater/main.py

19
couchpotato/core/_base/updater/main.py

@ -265,7 +265,7 @@ class SourceUpdater(BaseUpdater):
tar.close()
os.remove(destination)
self.replaceWith(os.path.join(extracted_path, os.listdir(extracted_path)[0]))
if self.replaceWith(os.path.join(extracted_path, os.listdir(extracted_path)[0])):
self.removeDir(extracted_path)
# Write update version to file
@ -295,18 +295,21 @@ class SourceUpdater(BaseUpdater):
if not Env.get('dev'):
try:
if os.path.isfile(tofile):
os.remove(tofile)
except:
pass
try:
os.renames(fromfile, tofile)
dirname = os.path.dirname(tofile)
if not os.path.isdir(dirname):
self.makeDir(dirname)
os.rename(fromfile, tofile)
try:
existing_files.remove(tofile)
except ValueError:
pass
except Exception, e:
log.error('Failed overwriting file: %s', e)
except:
log.error('Failed overwriting file "%s": %s', (tofile, traceback.format_exc()))
return False
if Env.get('app_dir') not in Env.get('data_dir'):
for still_exists in existing_files:
@ -315,6 +318,8 @@ class SourceUpdater(BaseUpdater):
except:
log.error('Failed removing non-used file: %s', traceback.format_exc())
return True
def removeDir(self, path):
try:

Loading…
Cancel
Save