From bf2dc6ce7604ec10098050810149d2b27b33ebd1 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Mon, 27 Jul 2020 19:29:28 +0200 Subject: [PATCH 1/3] Update tools/snap/build_remote.py Co-authored-by: Brad Warren --- tools/snap/build_remote.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/snap/build_remote.py b/tools/snap/build_remote.py index 7d8be8d6c..63817a1d7 100755 --- a/tools/snap/build_remote.py +++ b/tools/snap/build_remote.py @@ -61,7 +61,7 @@ def _build_snap(target, archs, status, lock): # We expect for each failed builds to have a build output, or something bad happened. missing_outputs = False for arch in failed_archs: - if not exists(join(workspace, f'{target}_{failed_archs}.txt')): + if not exists(join(workspace, f'{target}_{arch}.txt')): missing_outputs = True print(f'Missing output on a failed build {target} for {arch}.') if missing_outputs: From e42f782525e9d5ef1cae947efcbd65a27eafdd23 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Mon, 27 Jul 2020 19:29:38 +0200 Subject: [PATCH 2/3] Update tools/snap/build_remote.py Co-authored-by: Brad Warren --- tools/snap/build_remote.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/snap/build_remote.py b/tools/snap/build_remote.py index 63817a1d7..b7d8b685c 100755 --- a/tools/snap/build_remote.py +++ b/tools/snap/build_remote.py @@ -58,7 +58,7 @@ def _build_snap(target, archs, status, lock): break if failed_archs: - # We expect for each failed builds to have a build output, or something bad happened. + # We expect each failed build to have a log file, or something bad happened. missing_outputs = False for arch in failed_archs: if not exists(join(workspace, f'{target}_{arch}.txt')): From f10332421d5f6f523b12c83f34c58b4b5eb60015 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Mon, 27 Jul 2020 20:13:06 +0200 Subject: [PATCH 3/3] Update tools/snap/build_remote.py Co-authored-by: Brad Warren --- tools/snap/build_remote.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/snap/build_remote.py b/tools/snap/build_remote.py index b7d8b685c..66af9f404 100755 --- a/tools/snap/build_remote.py +++ b/tools/snap/build_remote.py @@ -16,7 +16,7 @@ PLUGINS = [basename(path) for path in glob.glob(join(CERTBOT_DIR, 'certbot-dns-* def _execute_build(target, archs, status, workspace): process = subprocess.Popen([ 'snapcraft', 'remote-build', '--launchpad-accept-public-upload', '--recover', '--build-on', ','.join(archs) - ], stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True, cwd=workspace) + ], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, cwd=workspace) process_output = [] for line in process.stdout: