YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

This ambiguity about 'ret' definitely looks like a bug ...

Browse source
This commit is contained in:
Alexandre Aubin 2019-03-07 17:10:01 +01:00
parent 135ac60d94
commit 7f779ddd1c
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/yunohost/backup.py
View file

@ -331,7 +331,7 @@ class BackupManager():
self.work_dir) self.work_dir)
# Try to recursively unmount stuff (from a previously failed backup ?) # Try to recursively unmount stuff (from a previously failed backup ?)
if _recursive_umount(self.work_dir) > 0: if not _recursive_umount(self.work_dir):
raise YunohostError('backup_output_directory_not_empty') raise YunohostError('backup_output_directory_not_empty')
else: else:
# If umount succeeded, remove the directory (we checked that # If umount succeeded, remove the directory (we checked that
@ -1523,7 +1523,7 @@ class BackupMethod(object):
directories of the working directories directories of the working directories
""" """
if self.need_mount(): if self.need_mount():
if _recursive_umount(self.work_dir) > 0: if not _recursive_umount(self.work_dir):
raise YunohostError('backup_cleaning_failed') raise YunohostError('backup_cleaning_failed')
if self.manager.is_tmp_work_dir: if self.manager.is_tmp_work_dir:
@ -2316,15 +2316,15 @@ def _recursive_umount(directory):
for line in mount_lines for line in mount_lines
if len(line) >= 3 and line.split(" ")[2].startswith(directory)] if len(line) >= 3 and line.split(" ")[2].startswith(directory)]
ret = 0 everything_went_fine = True
for point in reversed(points_to_umount): for point in reversed(points_to_umount):
ret = subprocess.call(["umount", point]) ret = subprocess.call(["umount", point])
if ret != 0: if ret != 0:
ret = 1 everything_went_fine = False
logger.warning(m18n.n('backup_cleaning_failed', point)) logger.warning(m18n.n('backup_cleaning_failed', point))
continue continue
return ret return everything_went_fine
def free_space_in_directory(dirpath): def free_space_in_directory(dirpath):

2
src/yunohost/tests/test_backuprestore.py
View file

@ -571,7 +571,7 @@ def test_backup_binds_are_readonly(monkeypatch):
assert "Read-only file system" in output assert "Read-only file system" in output
if self._recursive_umount(self.work_dir) > 0: if not _recursive_umount(self.work_dir):
raise Exception("Backup cleaning failed !") raise Exception("Backup cleaning failed !")
self.clean() self.clean()