From 1b8f8926ebc6ac470b89870c80448934b472ff93 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 26 Jul 2017 13:24:50 -0400 Subject: [PATCH] Add regexp to recognize new error text. No issue # Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- jenkins/run_upload_packages.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/jenkins/run_upload_packages.py b/jenkins/run_upload_packages.py index ee3f8d2..fe01b92 100755 --- a/jenkins/run_upload_packages.py +++ b/jenkins/run_upload_packages.py @@ -98,8 +98,12 @@ class PackageSuite: class PythonPackageSuite(PackageSuite): LOGGER_PART = 'python' - REUPLOAD_REGEXP = re.compile( - r'^error: Upload failed \(400\): A file named "[^"]+" already exists\b') + REUPLOAD_REGEXPS = [ + re.compile( + r'^error: Upload failed \(400\): A file named "[^"]+" already exists\b'), + re.compile( + r'^error: Upload failed \(400\): File already exists\b'), + ] def __init__(self, glob_root, rel_globs): super().__init__(glob_root, rel_globs) @@ -124,7 +128,7 @@ class PythonPackageSuite(PackageSuite): cmd.append('--quiet') cmd.extend(['sdist', '--dist-dir', '.upload_dist', 'upload']) upload_returncode, repushed = run_and_grep( - cmd, 'stderr', self.REUPLOAD_REGEXP, cwd=src_dir) + cmd, 'stderr', *self.REUPLOAD_REGEXPS, cwd=src_dir) if (upload_returncode != 0) and not repushed: raise subprocess.CalledProcessError(upload_returncode, cmd) shutil.rmtree(os.path.join(src_dir, '.upload_dist')) -- 2.30.2