From 2b1255cd6a902402f2b808f504d8fdcb997dacd2 Mon Sep 17 00:00:00 2001 From: Will Greenberg Date: Wed, 6 Jul 2022 17:40:27 -0700 Subject: [PATCH] finish_release.py: fix revision regex, add more logging (#9342) --- tools/finish_release.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/finish_release.py b/tools/finish_release.py index 6e0d1d490..79613c2fa 100755 --- a/tools/finish_release.py +++ b/tools/finish_release.py @@ -130,9 +130,9 @@ def get_snap_revisions(snap, version): print('Getting revision numbers for', snap, version) cmd = ['snapcraft', 'status', snap] process = subprocess.run(cmd, check=True, stdout=subprocess.PIPE, universal_newlines=True) - pattern = f'^\s+beta\s+{version}\s+(\d+)\s*$' + pattern = f'^\s+beta\s+{version}\s+(\d+)\s*' revisions = re.findall(pattern, process.stdout, re.MULTILINE) - assert len(revisions) == SNAP_ARCH_COUNT, f'Unexpected number of snaps found for {snap} {version}' + assert len(revisions) == SNAP_ARCH_COUNT, f'Unexpected number of snaps found for {snap} {version} (expected {SNAP_ARCH_COUNT}, found {len(revisions)})' return revisions