Skip to content

Commit

Permalink
Merge pull request #52 from qchateau/dev
Browse files Browse the repository at this point in the history
ccb: allow warning in conan create by default
  • Loading branch information
qchateau authored Dec 29, 2020
2 parents a6f907b + 099f3d3 commit c55f327
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions ccb/update/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
]

RE_ALREADY_PATCHED = re.compile(r"WARN:\s*(.*):\s*already patched", re.M)
RE_WARNING = re.compile(r"WARN:\s*(.*)", re.M)
RE_CREATE_ERRORS = [RE_WARNING]
RE_CREATE_ERRORS = [RE_ALREADY_PATCHED]

RE_CMAKELISTS_VERSION = re.compile(
r"(cmake_minimum_required\s*\(\s*VERSION\s*)([0-9\.]+)(\s*\))", re.I
Expand Down Expand Up @@ -70,11 +69,6 @@ def get_test_details(output):
patches = {m.group(1) for m in matches}
return "Patch already applied:\n" + "\n".join(patches)

matches = list(RE_WARNING.finditer(output))
if matches:
warnings = [m.group(1) for m in matches]
return "Warnings during conan create:\n" + "\n".join(warnings)

return "no details"


Expand Down

0 comments on commit c55f327

Please sign in to comment.