Skip to content
This repository was archived by the owner on Apr 3, 2020. It is now read-only.

Commit 2d28ae2

Browse files
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 [email protected],[email protected],[email protected] NOTREECHECKS=true NOTRY=true BUG=352046 Review URL: https://codereview.chromium.org/208313002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258579 0039d316-1c4b-4281-b951-d872f2087c98
1 parent c7397ff commit 2d28ae2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

build/compiler_version.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def GetVersion(compiler, tool):
2828
# Unmodified: GNU assembler (GNU Binutils) 2.24
2929
# Ubuntu: GNU assembler (GNU Binutils for Ubuntu) 2.22
3030
# Fedora: GNU assembler version 2.23.2
31-
version_re = re.compile(r"^GNU [^ ]+ .* (\d+)\.(\d+)\.*?$", re.M)
31+
version_re = re.compile(r"^GNU [^ ]+ .* (\d+).(\d+).*?$", re.M)
3232
elif tool == "linker":
3333
compiler = compiler + " -Xlinker --version"
3434
# Using BFD linker
@@ -39,7 +39,7 @@ def GetVersion(compiler, tool):
3939
# Unmodified: GNU gold (GNU Binutils 2.24) 1.11
4040
# Ubuntu: GNU gold (GNU Binutils for Ubuntu 2.22) 1.11
4141
# Fedora: GNU gold (version 2.23.2) 1.11
42-
version_re = re.compile(r"^GNU [^ ]+ .* (\d+)\.(\d+)\.*?$", re.M)
42+
version_re = re.compile(r"^GNU [^ ]+ .* (\d+).(\d+).*?$", re.M)
4343
else:
4444
raise Exception("Unknown tool %s" % tool)
4545

0 commit comments

Comments
 (0)