From c9fc7d4bb4c0aa9ebf7c95f5e9e19b10554e73ca Mon Sep 17 00:00:00 2001 From: nicolargo Date: Sat, 1 Nov 2025 09:50:47 +0100 Subject: [PATCH] Resolve conflict --- glances/plugins/containers/__init__.py | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/glances/plugins/containers/__init__.py b/glances/plugins/containers/__init__.py index 6d58dd89..514626df 100644 --- a/glances/plugins/containers/__init__.py +++ b/glances/plugins/containers/__init__.py @@ -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)