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

[fix] Indices error due to bad yml files

Browse source
This commit is contained in:
ljf 2018-06-05 00:16:37 +02:00
parent 63f8dfd87e
commit f64f0acb5b
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/yunohost/log.py
View file

@ -90,12 +90,12 @@ def log_list(category=[], limit=None):
"name": base_filename, "name": base_filename,
"path": md_path, "path": md_path,
} }
entry["description"] = _get_description_from_name(base_filename)
try: try:
log_datetime = datetime.strptime(" ".join(log[:2]), "%Y%m%d %H%M%S") log_datetime = datetime.strptime(" ".join(log[:2]), "%Y%m%d %H%M%S")
except ValueError: except ValueError:
entry["description"] = m18n.n("log_" + log[0], *log[1:]), pass
else: else:
entry["description"] = m18n.n("log_" + log[2], *log[3:]),
entry["started_at"] = log_datetime entry["started_at"] = log_datetime
result[category].append(entry) result[category].append(entry)
@ -144,13 +144,7 @@ def log_display(path, number=50):
# If it's a unit operation, display the name and the description # If it's a unit operation, display the name and the description
if base_path.startswith(CATEGORIES_PATH): if base_path.startswith(CATEGORIES_PATH):
log = base_filename.split("-") infos["description"] = _get_description_from_name(base_filename)
try:
datetime.strptime(" ".join(log[:2]), "%Y%m%d %H%M%S")
except ValueError:
infos["description"] = m18n.n("log_" + log[0], *log[1:]),
else:
infos["description"] = m18n.n("log_" + log[2], *log[3:]),
infos['name'] = base_filename infos['name'] = base_filename
# Display metadata if exist # Display metadata if exist
@ -407,9 +401,11 @@ class UnitOperation(object):
def _get_description_from_name(name): def _get_description_from_name(name):
parts = name.split("-") parts = name.split("-")
try: try:
datetime.strptime(" ".join(parts[:2]), "%Y%m%d %H%M%S") try:
except ValueError: datetime.strptime(" ".join(parts[:2]), "%Y%m%d %H%M%S")
return m18n.n("log_" + parts[0], *parts[1:]) except ValueError:
else: return m18n.n("log_" + parts[0], *parts[1:])
return m18n.n("log_" + parts[2], *parts[3:]) else:
return m18n.n("log_" + parts[2], *parts[3:])
except IndexError:
return name