Revert of Minor fix to regex inside compiler_version.py (https://codereview.chromium.org/207303004/)
Reason for revert: The second \. should have remained a . Chris Dumez 1 minute ago #7 Message was sent while issue was closed. https://codereview.chromium.org/207303004/diff/1/build/compiler_version.py File build/compiler_version.py (right): https://codereview.chromium.org/207303004/diff/1/build/compiler_version.py#ne... build/compiler_version.py:31: version_re = re.compile(r"^GNU [^ ]+ .* (\d+)\.(\d+)\.*?$", re.M) The last "\.*" looks weird, I think it should be ".*" Original issue's description: > Minor fix to regex inside compiler_version.py > > These dots where meant to be literal dots, not anything. > > BUG=352046 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=258570 TBR=thakis@chromium.org,thestig@chromium.org,ch.dumez@samsung.com NOTREECHECKS=true NOTRY=true BUG=352046 Review URL: https://codereview.chromium.org/208313002 git-svn-id: http://src.chromium.org/svn/trunk/src/build@258579 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
aaa319a163
Коммит
9f8894cd69
|
@ -28,7 +28,7 @@ def GetVersion(compiler, tool):
|
|||
# Unmodified: GNU assembler (GNU Binutils) 2.24
|
||||
# Ubuntu: GNU assembler (GNU Binutils for Ubuntu) 2.22
|
||||
# Fedora: GNU assembler version 2.23.2
|
||||
version_re = re.compile(r"^GNU [^ ]+ .* (\d+)\.(\d+)\.*?$", re.M)
|
||||
version_re = re.compile(r"^GNU [^ ]+ .* (\d+).(\d+).*?$", re.M)
|
||||
elif tool == "linker":
|
||||
compiler = compiler + " -Xlinker --version"
|
||||
# Using BFD linker
|
||||
|
@ -39,7 +39,7 @@ def GetVersion(compiler, tool):
|
|||
# Unmodified: GNU gold (GNU Binutils 2.24) 1.11
|
||||
# Ubuntu: GNU gold (GNU Binutils for Ubuntu 2.22) 1.11
|
||||
# Fedora: GNU gold (version 2.23.2) 1.11
|
||||
version_re = re.compile(r"^GNU [^ ]+ .* (\d+)\.(\d+)\.*?$", re.M)
|
||||
version_re = re.compile(r"^GNU [^ ]+ .* (\d+).(\d+).*?$", re.M)
|
||||
else:
|
||||
raise Exception("Unknown tool %s" % tool)
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче