Bug 141200

Summary:

[Win] Correct version parsing error in update-webkit

Product:

WebKit

Reporter:

Brent Fulgham <bfulgham>

Component:

Tools / Tests

Assignee:

Brent Fulgham <bfulgham>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

commit-queue, dbates

Priority:

Version:

528+ (Nightly build)

Hardware:

Unspecified

OS:

Unspecified

Attachments:

Description	Flags
Patch	andersca: review+

Brent Fulgham

Reported 2015-02-03 09:57:39 PST

The update-webkit script will generate error messages on certain Cygwin installs: bfulgham@fulgbr-pc ~/Projects/WebKit/OpenSource/Tools $ update-webkit Updating OpenSource Updating '.': At revision 179550. STIXGeneral-Regular.otf MathJax_Main-Regular.otf Installed tools are correct for the WebKit build. Invalid version format (non-numeric data) at /cygdrive/c/Projects/WebKit/OpenSource/Tools/Scripts/webkitdirs.pm line 1512. Updating Internal Updating '.': At revision 68889. This is happening because 'uname -r' is including a "-2" (or other number) modifier for some Cygwin builds: bfulgham@fulgbr-pc ~/Projects/WebKit/OpenSource/Tools $ uname -r 1.7.33-2(0.280/5/3) We need to remove this to do our comparison, just as we previously stripped out the parenthetical version content. For our purposes, we only care about the major version information.

Attachments
Patch (1.40 KB, patch) 2015-02-03 09:59 PST, Brent Fulgham	andersca: review+	Details Formatted Diff Diff
View All Add attachment proposed patch, testcase, etc.

Brent Fulgham

Comment 1 2015-02-03 09:59:21 PST

Created attachment 245946 [details] Patch

Brent Fulgham

Comment 2 2015-02-03 10:01:53 PST

Committed r179551: <http://trac.webkit.org/changeset/179551>

Note You need to log in before you can comment on or make changes to this bug.