From 52e240b02641f2cfa985a8f398684e6d37cbd462 Mon Sep 17 00:00:00 2001 From: Carlos! Date: Thu, 15 Aug 2024 20:10:03 +0000 Subject: [PATCH 1/2] avoid raising error when removing non-existent image --- swebench/harness/docker_utils.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/swebench/harness/docker_utils.py b/swebench/harness/docker_utils.py index dd8037ee..84fa6613 100644 --- a/swebench/harness/docker_utils.py +++ b/swebench/harness/docker_utils.py @@ -84,11 +84,13 @@ def remove_image(client, image_id, logger=None): log_error = logger.info log_info = logger.info raise_error = False - try: log_info(f"Attempting to remove image {image_id}...") client.images.remove(image_id, force=True) log_info(f"Image {image_id} removed.") + except docker.errors.ImageNotFound: + log_info(f"Image {image_id} not found, removing has no effect.") + log_info(f"Image {image_id} not found, removing has no effect.") except Exception as e: if raise_error: raise e From f76dabf8964dc93f6b9798dd7781e27bc59d06ff Mon Sep 17 00:00:00 2001 From: carlos Date: Thu, 15 Aug 2024 16:31:05 -0400 Subject: [PATCH 2/2] Update docker_utils.py --- swebench/harness/docker_utils.py | 1 - 1 file changed, 1 deletion(-) diff --git a/swebench/harness/docker_utils.py b/swebench/harness/docker_utils.py index 84fa6613..45a064b3 100644 --- a/swebench/harness/docker_utils.py +++ b/swebench/harness/docker_utils.py @@ -90,7 +90,6 @@ def remove_image(client, image_id, logger=None): log_info(f"Image {image_id} removed.") except docker.errors.ImageNotFound: log_info(f"Image {image_id} not found, removing has no effect.") - log_info(f"Image {image_id} not found, removing has no effect.") except Exception as e: if raise_error: raise e