From fa1596b57ac381e56d39225431d80fa5e64c39b2 Mon Sep 17 00:00:00 2001 From: Benedikt Ziemons Date: Fri, 18 Mar 2022 15:08:56 +0100 Subject: [PATCH] Update project, fix progress bars --- .idea/misc.xml | 2 +- .idea/podlaunch.iml | 2 +- imagerebuild.py | 14 ++++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index bc77e74..f7fcb5a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/.idea/podlaunch.iml b/.idea/podlaunch.iml index 8437fe6..ed7ac0e 100644 --- a/.idea/podlaunch.iml +++ b/.idea/podlaunch.iml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/imagerebuild.py b/imagerebuild.py index beb5001..067ac1f 100755 --- a/imagerebuild.py +++ b/imagerebuild.py @@ -78,8 +78,10 @@ def main(): image_tags.add(unit[len(search_str) :]) started_processes = [] - with click.progressbar(image_units, label="Collecting container images..") as bar: - for image_service in bar: + with click.progressbar( + length=len(image_units), label="Collecting container images.." + ) as bar: + for image_service in image_units: process = systemctl.show( image_service, _out=process_image_systemctl_show, @@ -92,9 +94,9 @@ def main(): started_processes = [] with click.progressbar( - image_tags, label="Untagging container images..", show_pos=True + length=len(image_tags), label="Untagging container images..", show_pos=True ) as bar: - for image_tag in bar: + for image_tag in image_tags: process = podman.untag( image_tag, _bg=True, @@ -112,9 +114,9 @@ def main(): started_processes = [] with click.progressbar( - image_units, label="Building images..", show_pos=True + length=len(image_units), label="Building images..", show_pos=True ) as bar: - for image_service in bar: + for image_service in image_units: process = systemctl.restart( image_service, _bg=True,