From 3ec8c8e28a1d1d0d1dc120aadd185cb1a6c37b1b Mon Sep 17 00:00:00 2001
From: Adrien Ferrand <ferrand.ad@gmail.com>
Date: Fri, 10 Jul 2020 12:47:29 +0200
Subject: [PATCH] Handle the fact that snap builds may be taken from cache

---
 tools/snap/build_remote.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tools/snap/build_remote.py b/tools/snap/build_remote.py
index f97aaa575..0b83be79f 100644
--- a/tools/snap/build_remote.py
+++ b/tools/snap/build_remote.py
@@ -5,7 +5,7 @@ import multiprocessing
 import re
 import subprocess
 import sys
-from os.path import join, realpath, dirname, basename
+from os.path import join, realpath, dirname, basename, exists
 
 
 CERTBOT_DIR = dirname(dirname(dirname(realpath(__file__))))
@@ -30,13 +30,14 @@ def _build_snap(target, archs):
     status = {}
 
     for arch in archs:
-        with open(join(workspace, '{0}_{1}.txt'.format(target, arch))) as file_h:
-            build_output = file_h.read()
+        status[arch] = None
+        build_file = join(workspace, '{0}_{1}.txt'.format(target, arch))
+        if build_file:
+            with open(build_file) as file_h:
+                build_output = file_h.read()
 
-        if not re.search(r'Snapped {0}_.*_{1}\.snap'.format(target, arch), build_output):
-            status[arch] = build_output
-        else:
-            status[arch] = None
+            if not re.search(r'Snapped {0}_.*_{1}\.snap'.format(target, arch), build_output):
+                status[arch] = build_output
 
     return {target: status}