From 3dbc3cdc6ca83de18fac5ecabbf3f4825c2a27a4 Mon Sep 17 00:00:00 2001 From: Patrick McCarty Date: Tue, 2 Jul 2019 09:23:56 -0700 Subject: [PATCH] Support UTF-8 curly single quotes for R patterns Since the introduction of the C.UTF-8 locale for builds, R now prints left/right curly single quotes in its error messages. Adapt to this behavior by accepting U+2018 (left single quotation mark) and U+2019 (right single quotation mark) in addition to the apostrophes for the R fail patterns. Signed-off-by: Patrick McCarty --- autospec/config.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/autospec/config.py b/autospec/config.py index 11a0274..1e6ebba 100644 --- a/autospec/config.py +++ b/autospec/config.py @@ -254,16 +254,16 @@ failed_pats = [ (r"Warning\: no usable ([a-zA-Z0-9]+) found", 0, None), (r"/usr/bin/env\: (.*)\: No such file or directory", 0, None), (r"make: ([a-zA-Z0-9].+): Command not found", 0, None), - (r"ERROR: dependencies.*'([a-zA-Z0-9\-\.]*)' are not available for package '.*'", 0, 'R'), - (r"Package which this enhances but not available for checking: '([a-zA-Z0-9\-]*)'", 0, 'R'), - (r"Unknown packages '([a-zA-Z0-9\-]*)'.* in Rd xrefs", 0, 'R'), - (r"Unknown package '([a-zA-Z0-9\-]*)'.* in Rd xrefs", 0, 'R'), - (r"ERROR: dependencies '([a-zA-Z0-9\-\.]*)'.* are not available for package '.*'", 0, 'R'), - (r"ERROR: dependencies '.*', '([a-zA-Z0-9\-\.]*)',.* are not available for package '.*'", 0, 'R'), - (r"ERROR: dependency '([a-zA-Z0-9\-\.]*)' is not available for package '.*'", 0, 'R'), - (r"Error: package '([a-zA-Z0-9\-\.]*)' required by", 0, 'R'), + (r"ERROR: dependencies.*['‘]([a-zA-Z0-9\-\.]*)['’] are not available for package ['‘].*['’]", 0, 'R'), + (r"Package which this enhances but not available for checking: ['‘]([a-zA-Z0-9\-]*)['’]", 0, 'R'), + (r"Unknown packages ['‘]([a-zA-Z0-9\-]*)['’].* in Rd xrefs", 0, 'R'), + (r"Unknown package ['‘]([a-zA-Z0-9\-]*)['’].* in Rd xrefs", 0, 'R'), + (r"ERROR: dependencies ['‘]([a-zA-Z0-9\-\.]*)['’].* are not available for package ['‘].*['’]", 0, 'R'), + (r"ERROR: dependencies ['‘].*['’], ['‘]([a-zA-Z0-9\-\.]*)['’],.* are not available for package ['‘].*['’]", 0, 'R'), + (r"ERROR: dependency ['‘]([a-zA-Z0-9\-\.]*)['’] is not available for package ['‘].*['’]", 0, 'R'), + (r"Error: package ['‘]([a-zA-Z0-9\-\.]*)['’] required by", 0, 'R'), (r"Error: Unable to find (.*)", 0, None), - (r"there is no package called '([a-zA-Z0-9\-\.]*)'", 0, 'R'), + (r"there is no package called ['‘]([a-zA-Z0-9\-\.]*)['’]", 0, 'R'), (r"you may need to install the ([a-zA-Z0-9\-:\.]*) module", 0, 'perl'), (r" ! ([a-zA-Z:]+) is not installed", 0, 'perl'), (r"Warning: prerequisite ([a-zA-Z:]+) [0-9\.]+ not found.", 0, 'perl'),