Merge remote-tracking branch 'origin/buster' into dev

This commit is contained in:
Alexandre Aubin 2022-08-11 15:58:33 +02:00
commit a45d199896
2 changed files with 10 additions and 4 deletions

6
debian/changelog vendored
View file

@ -134,6 +134,12 @@ yunohost (11.0.2) testing; urgency=low
-- Alexandre Aubin <alex.aubin@mailoo.org> Wed, 19 Jan 2022 20:52:39 +0100
yunohost (4.4.2.1) stable; urgency=low
- [fix] bullseye migration: /opt may not exist ... (5fd74577)
-- Alexandre Aubin <alex.aubin@mailoo.org> Thu, 11 Aug 2022 15:56:16 +0200
yunohost (4.4.2) stable; urgency=low
- Release as stable

View file

@ -27,9 +27,6 @@ logger = getActionLogger("yunohost.migration")
N_CURRENT_DEBIAN = 10
N_CURRENT_YUNOHOST = 4
N_NEXT_DEBAN = 11
N_NEXT_YUNOHOST = 11
VENV_REQUIREMENTS_SUFFIX = ".requirements_backup_for_bullseye_upgrade.txt"
@ -42,8 +39,11 @@ def _get_all_venvs(dir, level=0, maxlevel=3):
maxlevel - the depth of the recursion
level - do not edit this, used as an iterator
"""
# Using os functions instead of glob, because glob doesn't support hidden folders, and we need recursion with a fixed depth
if not os.path.exists(dir):
return []
result = []
# Using os functions instead of glob, because glob doesn't support hidden folders, and we need recursion with a fixed depth
for file in os.listdir(dir):
path = os.path.join(dir, file)
if os.path.isdir(path):