mirror
/
glances
mirror of https://github.com/nicolargo/glances.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolve conflict

This commit is contained in:
nicolargo 2025-11-01 09:50:47 +01:00
parent 7f34578cea
commit c9fc7d4bb4
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
glances/plugins/containers/__init__.py
View File

@ -546,7 +546,6 @@ class ContainersPlugin(GlancesPluginModel):
def build_container_data(self, name_max_width, args):
def build_with_this_params(ret, container):
steps = [self.maybe_add_engine_name_or_pod_name]
<<<<<<< HEAD
options = {
'name': self.build_container_name(name_max_width),
'status': self.build_status_name,
@ -557,27 +556,6 @@ class ContainersPlugin(GlancesPluginModel):
'networkio': self.build_net_line(args),
'command': self.build_cmd_line,
}
=======
if 'name' not in self.disable_stats:
steps.append(self.build_container_name(name_max_width))
if 'status' not in self.disable_stats:
steps.append(self.build_status_name)
if 'uptime' not in self.disable_stats:
steps.append(self.build_uptime_line)
if 'cpu' not in self.disable_stats:
steps.append(self.build_cpu_line)
if 'mem' not in self.disable_stats:
steps.append(self.build_memory_line)
if 'diskio' not in self.disable_stats:
steps.append(self.build_io_line)
if 'networkio' not in self.disable_stats:
steps.append(self.build_net_line(args))
if 'ports' not in self.disable_stats:
steps.append(self.build_ports)
if 'command' not in self.disable_stats:
steps.append(self.build_cmd_line)
>>>>>>> f7051938 (Show used port in container section - First try, ok for one port... #2054)
steps.extend(v for k, v in options.items() if k not in self.disable_stats)
return reduce(lambda ret, step: step(ret, container), steps, ret)