1
0
mirror of https://github.com/projectatomic/atomic.git synced 2026-02-06 12:45:57 +01:00

Atomic/containers.py: quiet supersedes json

If atomic containers list is executed with both the json and quiet flag
then quiet should take precedence.

Closes: #1016
Approved by: baude
This commit is contained in:
Steve Milner
2017-05-25 14:34:36 -04:00
committed by Atomic Bot
parent 1359575e76
commit a27b0e2e6c

View File

@@ -143,7 +143,14 @@ class Containers(Atomic):
if not any([x.running for x in container_objects]) and not self.args.all:
return 0
max_container_id = 12 if self.args.truncate else max([len(x.id) for x in container_objects])
# Set to 12 when truncate
if self.args.truncate:
max_container_id = 12
# Otherwise set to the max, falling back to 0
else:
max_container_id = max([len(x.id) for x in container_objects] or [0])
# Quiet supersedes json output
if self.args.quiet:
for con_obj in container_objects:
util.write_out(con_obj.id[0:max_container_id])