diff options
| author | nicolargo <nicolas@nicolargo.com> | 2022-11-19 15:27:44 +0100 |
|---|---|---|
| committer | nicolargo <nicolas@nicolargo.com> | 2022-11-19 15:27:44 +0100 |
| commit | b60f704ceb1ce087e2426545912097d3574e5c95 (patch) | |
| tree | 1d0e4e4eb311eb2b2ef4e0d223e54a2f740e6b11 | |
| parent | a9ee2aa09c00b6adc396c666d6e970e2b58918e6 (diff) | |
| parent | 09c7d7fb6b361b1ed06f068df6a12823b9c062ba (diff) | |
Merge branch 'develop' of github.com:nicolargo/glances into develop
| -rw-r--r-- | dev-requirements.txt | 3 | ||||
| -rw-r--r-- | doc-requirements.txt | 3 | ||||
| -rw-r--r-- | glances/programs.py | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/dev-requirements.txt b/dev-requirements.txt index 9034dd47..b78acaa3 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -7,4 +7,5 @@ autopep8 autoflake codespell memory-profiler -matplotlib
\ No newline at end of file +matplotlib +setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
\ No newline at end of file diff --git a/doc-requirements.txt b/doc-requirements.txt index f5288255..f5d4f9f4 100644 --- a/doc-requirements.txt +++ b/doc-requirements.txt @@ -1,3 +1,4 @@ sphinx sphinx_rtd_theme -reuse
\ No newline at end of file +reuse +setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
\ No newline at end of file diff --git a/glances/programs.py b/glances/programs.py index da1b4558..95837d74 100644 --- a/glances/programs.py +++ b/glances/programs.py @@ -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 '_' |