From 09304f24535cc0ff19ff2b9faf936b9249eda2c9 Mon Sep 17 00:00:00 2001 From: Alec Leamas Date: Aug 19 2013 06:50:33 +0000 Subject: mock: handle multiple prebuilt disttags with -D DISTTAG. If we find multiple prebuilt disttags let user choose one using -D DISTTAG instead of bailing out. Examples include mingw-filesystem (fc20). --- diff --git a/src/FedoraReview/mock.py b/src/FedoraReview/mock.py index f9a367b..ba5cfd7 100644 --- a/src/FedoraReview/mock.py +++ b/src/FedoraReview/mock.py @@ -59,11 +59,11 @@ def _run_script(script): def _get_tag(paths): - ''' Return common disttag from prebuilt files. ''' + ''' Return common disttag from prebuilt files, possibly "" ''' releases = [p.rsplit('-', 2)[2] for p in paths] releases = [r.rsplit('.', 2)[0] for r in releases] if not len(set(releases)) == 1: - raise ReviewError("Prebuilt packages release differs") + return "" match = re.search('(fc|el)[0-9][0-9]', releases[0]) return match.group() if match else ''