Merge branch 'develop' of github.com:nicolargo/glances into develop

This commit is contained in:
nicolargo 2022-11-19 15:27:44 +01:00
commit b60f704ceb
3 changed files with 5 additions and 3 deletions

View File

@ -7,4 +7,5 @@ autopep8
autoflake
codespell
memory-profiler
matplotlib
matplotlib
setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability

View File

@ -1,3 +1,4 @@
sphinx
sphinx_rtd_theme
reuse
reuse
setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability

View File

@ -53,7 +53,7 @@ def processes_to_programs(processes):
programs_dict[p[key]]['childrens'].append(p['pid'])
# If all the subprocess has the same value, display it
programs_dict[p[key]]['username'] = (
p['username'] if p['username'] == programs_dict[p[key]]['username'] else '_'
p['username'] if ('username' in p) and (p['username'] == programs_dict[p[key]]['username']) else '_'
)
programs_dict[p[key]]['nice'] = p['nice'] if p['nice'] == programs_dict[p[key]]['nice'] else '_'
programs_dict[p[key]]['status'] = p['status'] if p['status'] == programs_dict[p[key]]['status'] else '_'