141200 2015-02-03 09:57:39 -0800 [Win] Correct version parsing error in update-webkit 2015-02-03 10:01:53 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham commit-queue dbates oldest_to_newest 1066465 0 bfulgham 2015-02-03 09:57:39 -0800 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. 1066466 1 245946 bfulgham 2015-02-03 09:59:21 -0800 Created attachment 245946 Patch 1066467 2 bfulgham 2015-02-03 10:01:53 -0800 Committed r179551: <http://trac.webkit.org/changeset/179551> 245946 2015-02-03 09:59:21 -0800 2015-02-03 10:00:35 -0800 Patch bug-141200-20150203100720.patch text/plain 1438 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3OTU1MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDE1LTAyLTAzICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5dIENvcnJlY3QgdmVyc2lvbiBwYXJzaW5nIHdhcm5pbmcgaW4gdXBk YXRlLXdlYmtpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTQxMjAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChzZXR1cEFwcGxlV2luRW52KTog U3RyaXAgb3V0IGFueSBzcGVjaWZpYyB2ZXJzaW9uIGJ1aWxkIGxldmVsCisgICAgICAgIGZyb20g dGhlIEN5Z3dpbiB2ZXJzaW9uIGluZm9ybWF0aW9uLgorICAKKwogMjAxNS0wMi0wMyAgQnJlbnQg RnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2luXSBBdHRlbXB0IHRv IGltcHJvdmUgdGhlIHJlbGlhYmlsaXR5IG9mIEhUVFAgc2VydmljZQpJbmRleDogVG9vbHMvU2Ny aXB0cy93ZWJraXRkaXJzLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGly cy5wbQkocmV2aXNpb24gMTc5NTUwKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCSh3 b3JraW5nIGNvcHkpCkBAIC0xNTA4LDYgKzE1MDgsNyBAQCBzdWIgc2V0dXBBcHBsZVdpbkVudigp CiAgICAgICAgICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg1Nzkx CiAgICAgICAgIG15ICR1bmFtZV92ZXJzaW9uID0gKFBPU0lYOjp1bmFtZSgpKVsyXTsKICAgICAg ICAgJHVuYW1lX3ZlcnNpb24gPX4gcy9cKC4qXCkvLzsgICMgUmVtb3ZlIHRoZSB0cmFpbGluZyBj eWd3aW4gdmVyc2lvbiwgaWYgYW55LgorICAgICAgICAkdW5hbWVfdmVyc2lvbiA9fiBzL1wtLiok Ly87ICMgUmVtb3ZlIHRyYWlsaW5nIGRhc2gtdmVyc2lvbiBjb250ZW50LCBpZiBhbnkKICAgICAg ICAgaWYgKHZlcnNpb24tPnBhcnNlKCR1bmFtZV92ZXJzaW9uKSA8IHZlcnNpb24tPnBhcnNlKCIx LjcuMTAiKSkgewogICAgICAgICAgICAgIyBTZXR0aW5nIHRoZSBlbnZpcm9ubWVudCB2YXJpYWJs ZSAnQ1lHV0lOJyB0byAndHR5JyBtYWtlcyBjeWd3aW4gZW5hYmxlIGV4dHJhIHN1cHBvcnQgKGku ZS4sIHRlcm1pb3MpCiAgICAgICAgICAgICAjIGZvciBVTklYLWxpa2UgdHR5cyBpbiB0aGUgV2lu ZG93cyBjb25zb2xlCg==