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

[enh] Remove empty pending conf directory at regen-conf

Browse source
This commit is contained in:
Jérôme Lebleu 2016-05-01 13:46:27 +02:00
parent f1866c6113
commit 3f0ad9139e
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/yunohost/service.py
View file

@ -617,15 +617,20 @@ def _get_pending_conf(services=[]):
if not services: if not services:
services = os.listdir(pending_conf_dir) services = os.listdir(pending_conf_dir)
for name in services: for name in services:
service_conf = {}
service_pending_path = os.path.join(pending_conf_dir, name) service_pending_path = os.path.join(pending_conf_dir, name)
if not os.path.isdir(service_pending_path):
continue
path_index = len(service_pending_path) path_index = len(service_pending_path)
service_conf = {}
for root, dirs, files in os.walk(service_pending_path): for root, dirs, files in os.walk(service_pending_path):
for filename in files: for filename in files:
pending_path = os.path.join(root, filename) pending_path = os.path.join(root, filename)
service_conf[pending_path[path_index:]] = pending_path service_conf[pending_path[path_index:]] = pending_path
if service_conf: if service_conf:
result[name] = service_conf result[name] = service_conf
else:
# remove empty directory
shutil.rmtree(service_pending_path, ignore_errors=True)
return result return result