From 8e05db82652a5f02bcb125fe844656fb370dde8d Mon Sep 17 00:00:00 2001 From: William Douglas Date: Tue, 31 Jul 2018 23:18:07 +0000 Subject: [PATCH] Stop setting catkin pkgconfig and buildreqs for certain patterns Setting catkin on certain failed patterns was a mistake due to the patterns being more generic. Correct this error by not setting a requirement addition at this stage and letting later failed pattern detection catch these. --- autospec/config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/autospec/config.py b/autospec/config.py index 75bd2e3..9fc4196 100644 --- a/autospec/config.py +++ b/autospec/config.py @@ -286,9 +286,9 @@ failed_pats = [ r".*:(.*):[jar|pom]+:.* has not been downloaded from it before.*", 0, 'maven'), (r"\[WARNING\] The POM for .*:(.*):[jar|pom]+:.* is missing, no dependency information " r"available", 0, 'maven'), - (r"^.*Could not find a package configuration file provided by \"(.*)\".*$", 0, 'catkin'), - (r"^.*By not providing \"Find(.*).cmake\" in CMAKE_MODULE_PATH this.*$", 0, 'catkin'), - (r"^.*\"(.*)\" with any of the following names.*$", 0, 'catkin')] + (r"^.*Could not find a package configuration file provided by \"(.*)\".*$", 0, None), + (r"^.*By not providing \"Find(.*).cmake\" in CMAKE_MODULE_PATH this.*$", 0, None), + (r"^.*\"(.*)\" with any of the following names.*$", 0, None)] def get_metadata_conf():