nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't remove the module if the signature is invalid

Browse source 
Remove it only just before extraction
This commit is contained in:
Laurent Bachelier 2012-01-30 15:48:28 +01:00
commit 8c50324dbf
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
weboob/core/repositories.py
View file

@ -584,8 +584,7 @@ class Repositories(object):
tardata = fp.read() tardata = fp.read()
if os.path.isdir(module_dir): # Check signature
shutil.rmtree(module_dir)
if module.signed and Keyring.find_gpgv(): if module.signed and Keyring.find_gpgv():
progress.progress(0.5, 'Checking module authenticity...') progress.progress(0.5, 'Checking module authenticity...')
fpsig = browser.openurl(posixpath.join(module.url + '.sig')) fpsig = browser.openurl(posixpath.join(module.url + '.sig'))
@ -598,6 +597,8 @@ class Repositories(object):
# Extract module from tarball. # Extract module from tarball.
if os.path.isdir(module_dir):
shutil.rmtree(module_dir)
progress.progress(0.7, 'Setting up module...') progress.progress(0.7, 'Setting up module...')
with closing(tarfile.open('', 'r:gz', StringIO(tardata))) as tar: with closing(tarfile.open('', 'r:gz', StringIO(tardata))) as tar:
tar.extractall(self.modules_dir) tar.extractall(self.modules_dir)