50647 2010-12-07 14:38:34 -0800 Migrate buildbot.py from xmlrpclib to json 2010-12-08 20:22:42 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED http://build.webkit.org P2 Normal --- 1 wsiegrist wsiegrist commit-queue eric webkit.review.bot oldest_to_newest 318446 0 wsiegrist 2010-12-07 14:38:34 -0800 The latest version of buildbot removed the xmlrpc interface. We need to change the buildbot module in webkitpy to use the json interface instead. 318451 1 75847 wsiegrist 2010-12-07 15:07:41 -0800 Created attachment 75847 change buildbot.py to use json instead of xmlrpc 318456 2 75847 eric 2010-12-07 15:19:12 -0800 Comment on attachment 75847 change buildbot.py to use json instead of xmlrpc Your ChangeLog has tabs. Looks good though. Assuming you actually ran something like failure-reason which would use this. 318465 3 75848 wsiegrist 2010-12-07 15:51:51 -0800 Created attachment 75848 fixed tabs in ChangeLog and added python2.5 support with simplejson 318485 4 75848 eric 2010-12-07 16:10:55 -0800 Comment on attachment 75848 fixed tabs in ChangeLog and added python2.5 support with simplejson View in context: https://bugs.webkit.org/attachment.cgi?id=75848&action=review Lgtm. I assume you ran test-webkitpy :) > WebKitTools/ChangeLog:2 > + Reviewed by NOBODY (OOPS!). Normally there is a blank line before this one. 318527 5 75856 wsiegrist 2010-12-07 18:10:02 -0800 Created attachment 75856 add blank line to ChangeLog, fix mockup of build_dictionary No, I had not run test-webkitpy, but now I know better. It turns out I needed to update the mockup of build_dictionary to match the new layout of the json data. I also fixed the ChangeLog (again). 318561 6 75856 eric 2010-12-07 20:10:08 -0800 Comment on attachment 75856 add blank line to ChangeLog, fix mockup of build_dictionary Thanks again! 318635 7 webkit.review.bot 2010-12-07 21:56:20 -0800 Attachment 75847 did not pass style-queue: Failed to run "['WebKitTools/Scripts/update-webkit']" exit_code: 2 Updating OpenSource Incomplete data: Delta source ended unexpectedly at /usr/lib/git-core/git-svn line 5061 Died at WebKitTools/Scripts/update-webkit line 132. If any of these errors are false positives, please file a bug against check-webkit-style. 318687 8 75856 commit-queue 2010-12-08 00:19:33 -0800 Comment on attachment 75856 add blank line to ChangeLog, fix mockup of build_dictionary Rejecting patch 75856 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=eseidel-cq-sl', 'apply-attachment', '--force-clean', '--non-interactive', 75856]" exit_code: 2 Last 500 characters of output: up to this was: -------------------------- |Index: Scripts/webkitpy/common/net/buildbot.py |=================================================================== |--- Scripts/webkitpy/common/net/buildbot.py (revision 73456) |+++ Scripts/webkitpy/common/net/buildbot.py (working copy) -------------------------- No file to patch. Skipping patch. 4 out of 4 hunks ignored Failed to run "[u'/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Eric Seidel', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/6745109 318779 9 75903 wsiegrist 2010-12-08 07:35:16 -0800 Created attachment 75903 recreated patch from the root of the repo so CQ can apply it 318878 10 75903 eric 2010-12-08 10:43:40 -0800 Comment on attachment 75903 recreated patch from the root of the repo so CQ can apply it Thanks. 319233 11 commit-queue 2010-12-08 20:21:27 -0800 The commit-queue encountered the following flaky tests while processing attachment 75903: inspector/debugger-no-nested-pause.html Please file bugs against the tests. These tests were authored by loislo@chromium.org, podivilov@chromium.org, and yurys@chromium.org. The commit-queue is continuing to process your patch. 319234 12 75903 commit-queue 2010-12-08 20:22:36 -0800 Comment on attachment 75903 recreated patch from the root of the repo so CQ can apply it Clearing flags on attachment: 75903 Committed r73590: <http://trac.webkit.org/changeset/73590> 319235 13 commit-queue 2010-12-08 20:22:42 -0800 All reviewed patches have been landed. Closing bug. 75847 2010-12-07 15:07:41 -0800 2010-12-07 15:51:51 -0800 change buildbot.py to use json instead of xmlrpc webkitpy.buildbot.py.50647.patch text/plain 5140 wsiegrist SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDczNDU2KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTEgQEAKKzIwMTAtMTItMDcgIFdpbGxpYW0gU2llZ3Jpc3Qg PHdzaWVncmlzdEBhcHBsZS5jb20+CisJUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKwlN aWdyYXRlIGJ1aWxkYm90LnB5IGZyb20geG1scnBjIHRvIGpzb24uCisJaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwNjQ3CisKKwkqIFNjcmlwdHMvd2Via2l0cHkvY29t bW9uL25ldC9idWlsZGJvdC5weToKKwogMjAxMC0xMi0wNyAgVG9ueSBDaGFuZyAgPHRvbnlAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9qYW4gVmFmYWkuCkluZGV4OiBXZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVpbGRib3RfdW5pdHRlc3QucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1 aWxkYm90X3VuaXR0ZXN0LnB5CShyZXZpc2lvbiA3MzQ1NikKKysrIFdlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL25ldC9idWlsZGJvdF91bml0dGVzdC5weQkod29ya2luZyBjb3B5 KQpAQCAtMjk3LDE1ICsyOTcsMTUgQEAKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChidWlsZGVy LnVybF9lbmNvZGVkX25hbWUoKSwgIlRlc3QlMjBCdWlsZGVyIikKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChidWlsZGVyLnJlc3VsdHNfdXJsKCksICJodHRwOi8vYnVpbGQud2Via2l0Lm9yZy9y ZXN1bHRzL1Rlc3QlMjBCdWlsZGVyIikKIAotICAgICAgICAjIE92ZXJyaWRlIF9mZXRjaF94bWxy cGNfYnVpbGRfZGljdGlvbmFyeSBmdW5jdGlvbiB0byBub3QgdG91Y2ggdGhlIG5ldHdvcmsuCi0g ICAgICAgIGRlZiBtb2NrX2ZldGNoX3htbHJwY19idWlsZF9kaWN0aW9uYXJ5KHNlbGYsIGJ1aWxk X251bWJlcik6CisgICAgICAgICMgT3ZlcnJpZGUgX2ZldGNoX2J1aWxkX2RpY3Rpb25hcnkgZnVu Y3Rpb24gdG8gbm90IHRvdWNoIHRoZSBuZXR3b3JrLgorICAgICAgICBkZWYgbW9ja19mZXRjaF9i dWlsZF9kaWN0aW9uYXJ5KHNlbGYsIGJ1aWxkX251bWJlcik6CiAgICAgICAgICAgICBidWlsZF9k aWN0aW9uYXJ5ID0gewogICAgICAgICAgICAgICAgICJyZXZpc2lvbiIgOiAyICogYnVpbGRfbnVt YmVyLAogICAgICAgICAgICAgICAgICJudW1iZXIiIDogaW50KGJ1aWxkX251bWJlciksCiAgICAg ICAgICAgICAgICAgInJlc3VsdHMiIDogYnVpbGRfbnVtYmVyICUgMiwgIyAwIG1lYW5zIHBhc3MK ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHJldHVybiBidWlsZF9kaWN0aW9uYXJ5Ci0gICAg ICAgIGJ1aWxkYm90Ll9mZXRjaF94bWxycGNfYnVpbGRfZGljdGlvbmFyeSA9IG1vY2tfZmV0Y2hf eG1scnBjX2J1aWxkX2RpY3Rpb25hcnkKKyAgICAgICAgYnVpbGRib3QuX2ZldGNoX2J1aWxkX2Rp Y3Rpb25hcnkgPSBtb2NrX2ZldGNoX2J1aWxkX2RpY3Rpb25hcnkKIAogICAgICAgICBidWlsZCA9 IGJ1aWxkZXIuYnVpbGQoMTApCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoYnVpbGQuYnVpbGRl cigpLCBidWlsZGVyKQpJbmRleDogV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v bmV0L2J1aWxkYm90LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL25ldC9idWlsZGJvdC5weQkocmV2aXNpb24gNzM0NTYpCisrKyBXZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVpbGRib3QucHkJKHdvcmtpbmcgY29weSkK QEAgLTI4LDExICsyOCwxMSBAQAogIwogIyBXZWJLaXQncyBQeXRob24gbW9kdWxlIGZvciBpbnRl cmFjdGluZyB3aXRoIFdlYktpdCdzIGJ1aWxkYm90CiAKK2ltcG9ydCBqc29uCiBpbXBvcnQgb3Bl cmF0b3IKIGltcG9ydCByZQogaW1wb3J0IHVybGxpYgogaW1wb3J0IHVybGxpYjIKLWltcG9ydCB4 bWxycGNsaWIKIAogZnJvbSB3ZWJraXRweS5jb21tb24ubmV0LmZhaWx1cmVtYXAgaW1wb3J0IEZh aWx1cmVNYXAKIGZyb20gd2Via2l0cHkuY29tbW9uLm5ldC5sYXlvdXR0ZXN0cmVzdWx0cyBpbXBv cnQgTGF5b3V0VGVzdFJlc3VsdHMKQEAgLTY3LDEzICs2NywxMyBAQAogCiAgICAgIyBUaGlzIHBy b3ZpZGVzIGEgc2luZ2xlIHBsYWNlIHRvIG1vY2sKICAgICBkZWYgX2ZldGNoX2J1aWxkKHNlbGYs IGJ1aWxkX251bWJlcik6Ci0gICAgICAgIGJ1aWxkX2RpY3Rpb25hcnkgPSBzZWxmLl9idWlsZGJv dC5fZmV0Y2hfeG1scnBjX2J1aWxkX2RpY3Rpb25hcnkoc2VsZiwgYnVpbGRfbnVtYmVyKQorICAg ICAgICBidWlsZF9kaWN0aW9uYXJ5ID0gc2VsZi5fYnVpbGRib3QuX2ZldGNoX2J1aWxkX2RpY3Rp b25hcnkoc2VsZiwgYnVpbGRfbnVtYmVyKQogICAgICAgICBpZiBub3QgYnVpbGRfZGljdGlvbmFy eToKICAgICAgICAgICAgIHJldHVybiBOb25lCiAgICAgICAgIHJldHVybiBCdWlsZChzZWxmLAog ICAgICAgICAgICAgYnVpbGRfbnVtYmVyPWludChidWlsZF9kaWN0aW9uYXJ5WydudW1iZXInXSks Ci0gICAgICAgICAgICByZXZpc2lvbj1pbnQoYnVpbGRfZGljdGlvbmFyeVsncmV2aXNpb24nXSks Ci0gICAgICAgICAgICBpc19ncmVlbj0oYnVpbGRfZGljdGlvbmFyeVsncmVzdWx0cyddID09IDAp ICMgVW5kb2N1bWVudGVkLCBidWlsZGJvdCBYTUxSUEMsIDAgc2VlbXMgdG8gbWVhbiAicGFzcyIK KyAgICAgICAgICAgIHJldmlzaW9uPWludChidWlsZF9kaWN0aW9uYXJ5Wydzb3VyY2VTdGFtcCdd WydyZXZpc2lvbiddKSwKKyAgICAgICAgICAgIGlzX2dyZWVuPShidWlsZF9kaWN0aW9uYXJ5Wydy ZXN1bHRzJ10gPT0gMCkgIyBVbmRvY3VtZW50ZWQsIDAgc2VlbXMgdG8gbWVhbiAicGFzcyIKICAg ICAgICAgKQogCiAgICAgZGVmIGJ1aWxkKHNlbGYsIGJ1aWxkX251bWJlcik6CkBAIC0xNDAsNyAr MTQwLDcgQEAKICAgICAgICAgICAgIHJldHVybiBOb25lCiAgICAgICAgIGJ1aWxkID0gc2VsZi5i dWlsZChidWlsZF9udW1iZXIpCiAgICAgICAgIGlmIG5vdCBidWlsZCBhbmQgYWxsb3dfZmFpbGVk X2xvb2t1cHM6Ci0gICAgICAgICAgICAjIEJ1aWxkcyBmb3Igb2xkIHJldmlzaW9ucyB3aXRoIGZh aWwgdG8gbG9va3VwIHZpYSBidWlsZGJvdCdzIHhtbHJwYyBhcGkuCisgICAgICAgICAgICAjIEJ1 aWxkcyBmb3Igb2xkIHJldmlzaW9ucyB3aXRoIGZhaWwgdG8gbG9va3VwIHZpYSBidWlsZGJvdCdz IGpzb24gYXBpLgogICAgICAgICAgICAgYnVpbGQgPSBCdWlsZChzZWxmLAogICAgICAgICAgICAg ICAgIGJ1aWxkX251bWJlcj1idWlsZF9udW1iZXIsCiAgICAgICAgICAgICAgICAgcmV2aXNpb249 cmV2aXNpb24sCkBAIC0zNDUsMTYgKzM0NSwyMiBAQAogICAgICAgICByZXR1cm4gbm90IHNlbGYu cmVkX2NvcmVfYnVpbGRlcnMoKQogCiAgICAgIyBGSVhNRTogVGhlc2UgX2ZldGNoIG1ldGhvZHMg c2hvdWxkIG1vdmUgdG8gYSBuZXR3b3JraW5nIGNsYXNzLgotICAgIGRlZiBfZmV0Y2hfeG1scnBj X2J1aWxkX2RpY3Rpb25hcnkoc2VsZiwgYnVpbGRlciwgYnVpbGRfbnVtYmVyKToKLSAgICAgICAg IyBUaGUgYnVpbGRib3QgWE1MUlBDIEFQSSBpcyBzdXBlci1saW1pdGVkLgotICAgICAgICAjIEZv ciBvbmUsIHlvdSBjYW5ub3QgZmV0Y2ggaW5mbyBvbiBidWlsZHMgd2hpY2ggYXJlIGluY29tcGxl dGUuCi0gICAgICAgIHByb3h5ID0geG1scnBjbGliLlNlcnZlclByb3h5KCJodHRwOi8vJXMveG1s cnBjIiAlIHNlbGYuYnVpbGRib3RfaG9zdCwgYWxsb3dfbm9uZT1UcnVlKQorICAgIGRlZiBfZmV0 Y2hfYnVpbGRfZGljdGlvbmFyeShzZWxmLCBidWlsZGVyLCBidWlsZF9udW1iZXIpOgogICAgICAg ICB0cnk6Ci0gICAgICAgICAgICByZXR1cm4gcHJveHkuZ2V0QnVpbGQoYnVpbGRlci5uYW1lKCks IGludChidWlsZF9udW1iZXIpKQotICAgICAgICBleGNlcHQgeG1scnBjbGliLkZhdWx0LCBlcnI6 CisgICAgICAgICAgICBiYXNlID0gImh0dHA6Ly8lcyIgJSBzZWxmLmJ1aWxkYm90X2hvc3QKKyAg ICAgICAgICAgIHBhdGggPSB1cmxsaWIucXVvdGUoImpzb24vYnVpbGRlcnMvJXMvYnVpbGRzLyVz IiAlIChidWlsZGVyLm5hbWUoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBidWlsZF9udW1iZXIpKQorICAgICAgICAgICAg dXJsID0gIiVzLyVzIiAlIChiYXNlLCBwYXRoKQorICAgICAgICAgICAganNvbmRhdGEgPSB1cmxs aWIyLnVybG9wZW4odXJsKQorICAgICAgICAgICAgcmV0dXJuIGpzb24ubG9hZChqc29uZGF0YSkK KyAgICAgICAgZXhjZXB0IHVybGxpYjIuVVJMRXJyb3IsIGVycjoKICAgICAgICAgICAgIGJ1aWxk X3VybCA9IEJ1aWxkLmJ1aWxkX3VybChidWlsZGVyLCBidWlsZF9udW1iZXIpCiAgICAgICAgICAg ICBfbG9nLmVycm9yKCJFcnJvciBmZXRjaGluZyBkYXRhIGZvciAlcyBidWlsZCAlcyAoJXMpOiAl cyIgJSAoYnVpbGRlci5uYW1lKCksIGJ1aWxkX251bWJlciwgYnVpbGRfdXJsLCBlcnIpKQogICAg ICAgICAgICAgcmV0dXJuIE5vbmUKKyAgICAgICAgZXhjZXB0IFZhbHVlRXJyb3IsIGVycjoKKyAg ICAgICAgICAgIGJ1aWxkX3VybCA9IEJ1aWxkLmJ1aWxkX3VybChidWlsZGVyLCBidWlsZF9udW1i ZXIpCisgICAgICAgICAgICBfbG9nLmVycm9yKCJFcnJvciBkZWNvZGluZyBqc29uIGRhdGEgZnJv bSAlczogJXMiICUgKGJ1aWxkX3VybCwgZXJyKSkKKyAgICAgICAgICAgIHJldHVybiBOb25lCiAK ICAgICBkZWYgX2ZldGNoX29uZV9ib3hfcGVyX2J1aWxkZXIoc2VsZik6CiAgICAgICAgIGJ1aWxk X3N0YXR1c191cmwgPSAiaHR0cDovLyVzL29uZV9ib3hfcGVyX2J1aWxkZXIiICUgc2VsZi5idWls ZGJvdF9ob3N0Cg== 75848 2010-12-07 15:51:51 -0800 2010-12-07 18:10:02 -0800 fixed tabs in ChangeLog and added python2.5 support with simplejson webkitpy.buildbot.py.50647.2.patch text/plain 5284 wsiegrist SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDczNDU2KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTEgQEAKKzIwMTAtMTItMDcgIFdpbGxpYW0gU2llZ3Jpc3Qg PHdzaWVncmlzdEBhcHBsZS5jb20+CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE1pZ3JhdGUgYnVpbGRib3QucHkgZnJvbSB4bWxycGMgdG8ganNvbi4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwNjQ3CisKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVpbGRib3QucHk6CisKIDIwMTAt MTItMDcgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBPamFuIFZhZmFpLgpJbmRleDogV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vbmV0L2J1aWxkYm90X3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWlsZGJvdF91bml0dGVzdC5weQkocmV2aXNpb24g NzM0NTYpCisrKyBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVpbGRi b3RfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTI5NywxNSArMjk3LDE1IEBACiAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoYnVpbGRlci51cmxfZW5jb2RlZF9uYW1lKCksICJUZXN0JTIw QnVpbGRlciIpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoYnVpbGRlci5yZXN1bHRzX3VybCgp LCAiaHR0cDovL2J1aWxkLndlYmtpdC5vcmcvcmVzdWx0cy9UZXN0JTIwQnVpbGRlciIpCiAKLSAg ICAgICAgIyBPdmVycmlkZSBfZmV0Y2hfeG1scnBjX2J1aWxkX2RpY3Rpb25hcnkgZnVuY3Rpb24g dG8gbm90IHRvdWNoIHRoZSBuZXR3b3JrLgotICAgICAgICBkZWYgbW9ja19mZXRjaF94bWxycGNf YnVpbGRfZGljdGlvbmFyeShzZWxmLCBidWlsZF9udW1iZXIpOgorICAgICAgICAjIE92ZXJyaWRl IF9mZXRjaF9idWlsZF9kaWN0aW9uYXJ5IGZ1bmN0aW9uIHRvIG5vdCB0b3VjaCB0aGUgbmV0d29y ay4KKyAgICAgICAgZGVmIG1vY2tfZmV0Y2hfYnVpbGRfZGljdGlvbmFyeShzZWxmLCBidWlsZF9u dW1iZXIpOgogICAgICAgICAgICAgYnVpbGRfZGljdGlvbmFyeSA9IHsKICAgICAgICAgICAgICAg ICAicmV2aXNpb24iIDogMiAqIGJ1aWxkX251bWJlciwKICAgICAgICAgICAgICAgICAibnVtYmVy IiA6IGludChidWlsZF9udW1iZXIpLAogICAgICAgICAgICAgICAgICJyZXN1bHRzIiA6IGJ1aWxk X251bWJlciAlIDIsICMgMCBtZWFucyBwYXNzCiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBy ZXR1cm4gYnVpbGRfZGljdGlvbmFyeQotICAgICAgICBidWlsZGJvdC5fZmV0Y2hfeG1scnBjX2J1 aWxkX2RpY3Rpb25hcnkgPSBtb2NrX2ZldGNoX3htbHJwY19idWlsZF9kaWN0aW9uYXJ5CisgICAg ICAgIGJ1aWxkYm90Ll9mZXRjaF9idWlsZF9kaWN0aW9uYXJ5ID0gbW9ja19mZXRjaF9idWlsZF9k aWN0aW9uYXJ5CiAKICAgICAgICAgYnVpbGQgPSBidWlsZGVyLmJ1aWxkKDEwKQogICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKGJ1aWxkLmJ1aWxkZXIoKSwgYnVpbGRlcikKSW5kZXg6IFdlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWlsZGJvdC5weQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVpbGRib3QucHkJKHJl dmlzaW9uIDczNDU2KQorKysgV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0 L2J1aWxkYm90LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yOCwxMSArMjgsMTYgQEAKICMKICMgV2Vi S2l0J3MgUHl0aG9uIG1vZHVsZSBmb3IgaW50ZXJhY3Rpbmcgd2l0aCBXZWJLaXQncyBidWlsZGJv dAogCit0cnk6CisgICAgaW1wb3J0IGpzb24KK2V4Y2VwdCBJbXBvcnRFcnJvcjoKKyAgICAjIHB5 dGhvbiAyLjUgY29tcGF0aWJpbGl0eQorICAgIGltcG9ydCB3ZWJraXRweS50aGlyZHBhcnR5LnNp bXBsZWpzb24gYXMganNvbgorCiBpbXBvcnQgb3BlcmF0b3IKIGltcG9ydCByZQogaW1wb3J0IHVy bGxpYgogaW1wb3J0IHVybGxpYjIKLWltcG9ydCB4bWxycGNsaWIKIAogZnJvbSB3ZWJraXRweS5j b21tb24ubmV0LmZhaWx1cmVtYXAgaW1wb3J0IEZhaWx1cmVNYXAKIGZyb20gd2Via2l0cHkuY29t bW9uLm5ldC5sYXlvdXR0ZXN0cmVzdWx0cyBpbXBvcnQgTGF5b3V0VGVzdFJlc3VsdHMKQEAgLTY3 LDEzICs3MiwxMyBAQAogCiAgICAgIyBUaGlzIHByb3ZpZGVzIGEgc2luZ2xlIHBsYWNlIHRvIG1v Y2sKICAgICBkZWYgX2ZldGNoX2J1aWxkKHNlbGYsIGJ1aWxkX251bWJlcik6Ci0gICAgICAgIGJ1 aWxkX2RpY3Rpb25hcnkgPSBzZWxmLl9idWlsZGJvdC5fZmV0Y2hfeG1scnBjX2J1aWxkX2RpY3Rp b25hcnkoc2VsZiwgYnVpbGRfbnVtYmVyKQorICAgICAgICBidWlsZF9kaWN0aW9uYXJ5ID0gc2Vs Zi5fYnVpbGRib3QuX2ZldGNoX2J1aWxkX2RpY3Rpb25hcnkoc2VsZiwgYnVpbGRfbnVtYmVyKQog ICAgICAgICBpZiBub3QgYnVpbGRfZGljdGlvbmFyeToKICAgICAgICAgICAgIHJldHVybiBOb25l CiAgICAgICAgIHJldHVybiBCdWlsZChzZWxmLAogICAgICAgICAgICAgYnVpbGRfbnVtYmVyPWlu dChidWlsZF9kaWN0aW9uYXJ5WydudW1iZXInXSksCi0gICAgICAgICAgICByZXZpc2lvbj1pbnQo YnVpbGRfZGljdGlvbmFyeVsncmV2aXNpb24nXSksCi0gICAgICAgICAgICBpc19ncmVlbj0oYnVp bGRfZGljdGlvbmFyeVsncmVzdWx0cyddID09IDApICMgVW5kb2N1bWVudGVkLCBidWlsZGJvdCBY TUxSUEMsIDAgc2VlbXMgdG8gbWVhbiAicGFzcyIKKyAgICAgICAgICAgIHJldmlzaW9uPWludChi dWlsZF9kaWN0aW9uYXJ5Wydzb3VyY2VTdGFtcCddWydyZXZpc2lvbiddKSwKKyAgICAgICAgICAg IGlzX2dyZWVuPShidWlsZF9kaWN0aW9uYXJ5WydyZXN1bHRzJ10gPT0gMCkgIyBVbmRvY3VtZW50 ZWQsIDAgc2VlbXMgdG8gbWVhbiAicGFzcyIKICAgICAgICAgKQogCiAgICAgZGVmIGJ1aWxkKHNl bGYsIGJ1aWxkX251bWJlcik6CkBAIC0xNDAsNyArMTQ1LDcgQEAKICAgICAgICAgICAgIHJldHVy biBOb25lCiAgICAgICAgIGJ1aWxkID0gc2VsZi5idWlsZChidWlsZF9udW1iZXIpCiAgICAgICAg IGlmIG5vdCBidWlsZCBhbmQgYWxsb3dfZmFpbGVkX2xvb2t1cHM6Ci0gICAgICAgICAgICAjIEJ1 aWxkcyBmb3Igb2xkIHJldmlzaW9ucyB3aXRoIGZhaWwgdG8gbG9va3VwIHZpYSBidWlsZGJvdCdz IHhtbHJwYyBhcGkuCisgICAgICAgICAgICAjIEJ1aWxkcyBmb3Igb2xkIHJldmlzaW9ucyB3aXRo IGZhaWwgdG8gbG9va3VwIHZpYSBidWlsZGJvdCdzIGpzb24gYXBpLgogICAgICAgICAgICAgYnVp bGQgPSBCdWlsZChzZWxmLAogICAgICAgICAgICAgICAgIGJ1aWxkX251bWJlcj1idWlsZF9udW1i ZXIsCiAgICAgICAgICAgICAgICAgcmV2aXNpb249cmV2aXNpb24sCkBAIC0zNDUsMTYgKzM1MCwy MiBAQAogICAgICAgICByZXR1cm4gbm90IHNlbGYucmVkX2NvcmVfYnVpbGRlcnMoKQogCiAgICAg IyBGSVhNRTogVGhlc2UgX2ZldGNoIG1ldGhvZHMgc2hvdWxkIG1vdmUgdG8gYSBuZXR3b3JraW5n IGNsYXNzLgotICAgIGRlZiBfZmV0Y2hfeG1scnBjX2J1aWxkX2RpY3Rpb25hcnkoc2VsZiwgYnVp bGRlciwgYnVpbGRfbnVtYmVyKToKLSAgICAgICAgIyBUaGUgYnVpbGRib3QgWE1MUlBDIEFQSSBp cyBzdXBlci1saW1pdGVkLgotICAgICAgICAjIEZvciBvbmUsIHlvdSBjYW5ub3QgZmV0Y2ggaW5m byBvbiBidWlsZHMgd2hpY2ggYXJlIGluY29tcGxldGUuCi0gICAgICAgIHByb3h5ID0geG1scnBj bGliLlNlcnZlclByb3h5KCJodHRwOi8vJXMveG1scnBjIiAlIHNlbGYuYnVpbGRib3RfaG9zdCwg YWxsb3dfbm9uZT1UcnVlKQorICAgIGRlZiBfZmV0Y2hfYnVpbGRfZGljdGlvbmFyeShzZWxmLCBi dWlsZGVyLCBidWlsZF9udW1iZXIpOgogICAgICAgICB0cnk6Ci0gICAgICAgICAgICByZXR1cm4g cHJveHkuZ2V0QnVpbGQoYnVpbGRlci5uYW1lKCksIGludChidWlsZF9udW1iZXIpKQotICAgICAg ICBleGNlcHQgeG1scnBjbGliLkZhdWx0LCBlcnI6CisgICAgICAgICAgICBiYXNlID0gImh0dHA6 Ly8lcyIgJSBzZWxmLmJ1aWxkYm90X2hvc3QKKyAgICAgICAgICAgIHBhdGggPSB1cmxsaWIucXVv dGUoImpzb24vYnVpbGRlcnMvJXMvYnVpbGRzLyVzIiAlIChidWlsZGVyLm5hbWUoKSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBidWlsZF9udW1iZXIpKQorICAgICAgICAgICAgdXJsID0gIiVzLyVzIiAlIChiYXNlLCBwYXRo KQorICAgICAgICAgICAganNvbmRhdGEgPSB1cmxsaWIyLnVybG9wZW4odXJsKQorICAgICAgICAg ICAgcmV0dXJuIGpzb24ubG9hZChqc29uZGF0YSkKKyAgICAgICAgZXhjZXB0IHVybGxpYjIuVVJM RXJyb3IsIGVycjoKICAgICAgICAgICAgIGJ1aWxkX3VybCA9IEJ1aWxkLmJ1aWxkX3VybChidWls ZGVyLCBidWlsZF9udW1iZXIpCiAgICAgICAgICAgICBfbG9nLmVycm9yKCJFcnJvciBmZXRjaGlu ZyBkYXRhIGZvciAlcyBidWlsZCAlcyAoJXMpOiAlcyIgJSAoYnVpbGRlci5uYW1lKCksIGJ1aWxk X251bWJlciwgYnVpbGRfdXJsLCBlcnIpKQogICAgICAgICAgICAgcmV0dXJuIE5vbmUKKyAgICAg ICAgZXhjZXB0IFZhbHVlRXJyb3IsIGVycjoKKyAgICAgICAgICAgIGJ1aWxkX3VybCA9IEJ1aWxk LmJ1aWxkX3VybChidWlsZGVyLCBidWlsZF9udW1iZXIpCisgICAgICAgICAgICBfbG9nLmVycm9y KCJFcnJvciBkZWNvZGluZyBqc29uIGRhdGEgZnJvbSAlczogJXMiICUgKGJ1aWxkX3VybCwgZXJy KSkKKyAgICAgICAgICAgIHJldHVybiBOb25lCiAKICAgICBkZWYgX2ZldGNoX29uZV9ib3hfcGVy X2J1aWxkZXIoc2VsZik6CiAgICAgICAgIGJ1aWxkX3N0YXR1c191cmwgPSAiaHR0cDovLyVzL29u ZV9ib3hfcGVyX2J1aWxkZXIiICUgc2VsZi5idWlsZGJvdF9ob3N0Cg== 75856 2010-12-07 18:10:02 -0800 2010-12-08 07:35:16 -0800 add blank line to ChangeLog, fix mockup of build_dictionary webkitpy.buildbot.py.50647.3.patch text/plain 5288 wsiegrist SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDczNDU2 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTAtMTIt MDcgIFdpbGxpYW0gU2llZ3Jpc3QgPHdzaWVncmlzdEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWlncmF0ZSBidWlsZGJvdC5weSBm cm9tIHhtbHJwYyB0byBqc29uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTA2NDcKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL25l dC9idWlsZGJvdC5weToKKwogMjAxMC0xMi0wNyAgVG9ueSBDaGFuZyAgPHRvbnlAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9qYW4gVmFmYWkuCkluZGV4OiBTY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9uZXQvYnVpbGRib3RfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU2Ny aXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1aWxkYm90X3VuaXR0ZXN0LnB5CShyZXZpc2lvbiA3 MzQ1NikKKysrIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWlsZGJvdF91bml0dGVzdC5w eQkod29ya2luZyBjb3B5KQpAQCAtMjk3LDE1ICsyOTcsMTcgQEAKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChidWlsZGVyLnVybF9lbmNvZGVkX25hbWUoKSwgIlRlc3QlMjBCdWlsZGVyIikKICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChidWlsZGVyLnJlc3VsdHNfdXJsKCksICJodHRwOi8vYnVp bGQud2Via2l0Lm9yZy9yZXN1bHRzL1Rlc3QlMjBCdWlsZGVyIikKIAotICAgICAgICAjIE92ZXJy aWRlIF9mZXRjaF94bWxycGNfYnVpbGRfZGljdGlvbmFyeSBmdW5jdGlvbiB0byBub3QgdG91Y2gg dGhlIG5ldHdvcmsuCi0gICAgICAgIGRlZiBtb2NrX2ZldGNoX3htbHJwY19idWlsZF9kaWN0aW9u YXJ5KHNlbGYsIGJ1aWxkX251bWJlcik6CisgICAgICAgICMgT3ZlcnJpZGUgX2ZldGNoX2J1aWxk X2RpY3Rpb25hcnkgZnVuY3Rpb24gdG8gbm90IHRvdWNoIHRoZSBuZXR3b3JrLgorICAgICAgICBk ZWYgbW9ja19mZXRjaF9idWlsZF9kaWN0aW9uYXJ5KHNlbGYsIGJ1aWxkX251bWJlcik6CiAgICAg ICAgICAgICBidWlsZF9kaWN0aW9uYXJ5ID0gewotICAgICAgICAgICAgICAgICJyZXZpc2lvbiIg OiAyICogYnVpbGRfbnVtYmVyLAorICAgICAgICAgICAgICAgICJzb3VyY2VTdGFtcCI6IHsKKyAg ICAgICAgICAgICAgICAgICAgInJldmlzaW9uIiA6IDIgKiBidWlsZF9udW1iZXIsCisgICAgICAg ICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAgICAgIm51bWJlciIgOiBpbnQoYnVpbGRfbnVt YmVyKSwKICAgICAgICAgICAgICAgICAicmVzdWx0cyIgOiBidWlsZF9udW1iZXIgJSAyLCAjIDAg bWVhbnMgcGFzcwogICAgICAgICAgICAgfQogICAgICAgICAgICAgcmV0dXJuIGJ1aWxkX2RpY3Rp b25hcnkKLSAgICAgICAgYnVpbGRib3QuX2ZldGNoX3htbHJwY19idWlsZF9kaWN0aW9uYXJ5ID0g bW9ja19mZXRjaF94bWxycGNfYnVpbGRfZGljdGlvbmFyeQorICAgICAgICBidWlsZGJvdC5fZmV0 Y2hfYnVpbGRfZGljdGlvbmFyeSA9IG1vY2tfZmV0Y2hfYnVpbGRfZGljdGlvbmFyeQogCiAgICAg ICAgIGJ1aWxkID0gYnVpbGRlci5idWlsZCgxMCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChi dWlsZC5idWlsZGVyKCksIGJ1aWxkZXIpCkluZGV4OiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9u ZXQvYnVpbGRib3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0 L2J1aWxkYm90LnB5CShyZXZpc2lvbiA3MzQ1NikKKysrIFNjcmlwdHMvd2Via2l0cHkvY29tbW9u L25ldC9idWlsZGJvdC5weQkod29ya2luZyBjb3B5KQpAQCAtMjgsMTEgKzI4LDE2IEBACiAjCiAj IFdlYktpdCdzIFB5dGhvbiBtb2R1bGUgZm9yIGludGVyYWN0aW5nIHdpdGggV2ViS2l0J3MgYnVp bGRib3QKIAordHJ5OgorICAgIGltcG9ydCBqc29uCitleGNlcHQgSW1wb3J0RXJyb3I6CisgICAg IyBweXRob24gMi41IGNvbXBhdGliaWxpdHkKKyAgICBpbXBvcnQgd2Via2l0cHkudGhpcmRwYXJ0 eS5zaW1wbGVqc29uIGFzIGpzb24KKwogaW1wb3J0IG9wZXJhdG9yCiBpbXBvcnQgcmUKIGltcG9y dCB1cmxsaWIKIGltcG9ydCB1cmxsaWIyCi1pbXBvcnQgeG1scnBjbGliCiAKIGZyb20gd2Via2l0 cHkuY29tbW9uLm5ldC5mYWlsdXJlbWFwIGltcG9ydCBGYWlsdXJlTWFwCiBmcm9tIHdlYmtpdHB5 LmNvbW1vbi5uZXQubGF5b3V0dGVzdHJlc3VsdHMgaW1wb3J0IExheW91dFRlc3RSZXN1bHRzCkBA IC02NywxMyArNzIsMTMgQEAKIAogICAgICMgVGhpcyBwcm92aWRlcyBhIHNpbmdsZSBwbGFjZSB0 byBtb2NrCiAgICAgZGVmIF9mZXRjaF9idWlsZChzZWxmLCBidWlsZF9udW1iZXIpOgotICAgICAg ICBidWlsZF9kaWN0aW9uYXJ5ID0gc2VsZi5fYnVpbGRib3QuX2ZldGNoX3htbHJwY19idWlsZF9k aWN0aW9uYXJ5KHNlbGYsIGJ1aWxkX251bWJlcikKKyAgICAgICAgYnVpbGRfZGljdGlvbmFyeSA9 IHNlbGYuX2J1aWxkYm90Ll9mZXRjaF9idWlsZF9kaWN0aW9uYXJ5KHNlbGYsIGJ1aWxkX251bWJl cikKICAgICAgICAgaWYgbm90IGJ1aWxkX2RpY3Rpb25hcnk6CiAgICAgICAgICAgICByZXR1cm4g Tm9uZQogICAgICAgICByZXR1cm4gQnVpbGQoc2VsZiwKICAgICAgICAgICAgIGJ1aWxkX251bWJl cj1pbnQoYnVpbGRfZGljdGlvbmFyeVsnbnVtYmVyJ10pLAotICAgICAgICAgICAgcmV2aXNpb249 aW50KGJ1aWxkX2RpY3Rpb25hcnlbJ3JldmlzaW9uJ10pLAotICAgICAgICAgICAgaXNfZ3JlZW49 KGJ1aWxkX2RpY3Rpb25hcnlbJ3Jlc3VsdHMnXSA9PSAwKSAjIFVuZG9jdW1lbnRlZCwgYnVpbGRi b3QgWE1MUlBDLCAwIHNlZW1zIHRvIG1lYW4gInBhc3MiCisgICAgICAgICAgICByZXZpc2lvbj1p bnQoYnVpbGRfZGljdGlvbmFyeVsnc291cmNlU3RhbXAnXVsncmV2aXNpb24nXSksCisgICAgICAg ICAgICBpc19ncmVlbj0oYnVpbGRfZGljdGlvbmFyeVsncmVzdWx0cyddID09IDApICMgVW5kb2N1 bWVudGVkLCAwIHNlZW1zIHRvIG1lYW4gInBhc3MiCiAgICAgICAgICkKIAogICAgIGRlZiBidWls ZChzZWxmLCBidWlsZF9udW1iZXIpOgpAQCAtMTQwLDcgKzE0NSw3IEBACiAgICAgICAgICAgICBy ZXR1cm4gTm9uZQogICAgICAgICBidWlsZCA9IHNlbGYuYnVpbGQoYnVpbGRfbnVtYmVyKQogICAg ICAgICBpZiBub3QgYnVpbGQgYW5kIGFsbG93X2ZhaWxlZF9sb29rdXBzOgotICAgICAgICAgICAg IyBCdWlsZHMgZm9yIG9sZCByZXZpc2lvbnMgd2l0aCBmYWlsIHRvIGxvb2t1cCB2aWEgYnVpbGRi b3QncyB4bWxycGMgYXBpLgorICAgICAgICAgICAgIyBCdWlsZHMgZm9yIG9sZCByZXZpc2lvbnMg d2l0aCBmYWlsIHRvIGxvb2t1cCB2aWEgYnVpbGRib3QncyBqc29uIGFwaS4KICAgICAgICAgICAg IGJ1aWxkID0gQnVpbGQoc2VsZiwKICAgICAgICAgICAgICAgICBidWlsZF9udW1iZXI9YnVpbGRf bnVtYmVyLAogICAgICAgICAgICAgICAgIHJldmlzaW9uPXJldmlzaW9uLApAQCAtMzQ1LDE2ICsz NTAsMjIgQEAKICAgICAgICAgcmV0dXJuIG5vdCBzZWxmLnJlZF9jb3JlX2J1aWxkZXJzKCkKIAog ICAgICMgRklYTUU6IFRoZXNlIF9mZXRjaCBtZXRob2RzIHNob3VsZCBtb3ZlIHRvIGEgbmV0d29y a2luZyBjbGFzcy4KLSAgICBkZWYgX2ZldGNoX3htbHJwY19idWlsZF9kaWN0aW9uYXJ5KHNlbGYs IGJ1aWxkZXIsIGJ1aWxkX251bWJlcik6Ci0gICAgICAgICMgVGhlIGJ1aWxkYm90IFhNTFJQQyBB UEkgaXMgc3VwZXItbGltaXRlZC4KLSAgICAgICAgIyBGb3Igb25lLCB5b3UgY2Fubm90IGZldGNo IGluZm8gb24gYnVpbGRzIHdoaWNoIGFyZSBpbmNvbXBsZXRlLgotICAgICAgICBwcm94eSA9IHht bHJwY2xpYi5TZXJ2ZXJQcm94eSgiaHR0cDovLyVzL3htbHJwYyIgJSBzZWxmLmJ1aWxkYm90X2hv c3QsIGFsbG93X25vbmU9VHJ1ZSkKKyAgICBkZWYgX2ZldGNoX2J1aWxkX2RpY3Rpb25hcnkoc2Vs ZiwgYnVpbGRlciwgYnVpbGRfbnVtYmVyKToKICAgICAgICAgdHJ5OgotICAgICAgICAgICAgcmV0 dXJuIHByb3h5LmdldEJ1aWxkKGJ1aWxkZXIubmFtZSgpLCBpbnQoYnVpbGRfbnVtYmVyKSkKLSAg ICAgICAgZXhjZXB0IHhtbHJwY2xpYi5GYXVsdCwgZXJyOgorICAgICAgICAgICAgYmFzZSA9ICJo dHRwOi8vJXMiICUgc2VsZi5idWlsZGJvdF9ob3N0CisgICAgICAgICAgICBwYXRoID0gdXJsbGli LnF1b3RlKCJqc29uL2J1aWxkZXJzLyVzL2J1aWxkcy8lcyIgJSAoYnVpbGRlci5uYW1lKCksCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgYnVpbGRfbnVtYmVyKSkKKyAgICAgICAgICAgIHVybCA9ICIlcy8lcyIgJSAoYmFzZSwg cGF0aCkKKyAgICAgICAgICAgIGpzb25kYXRhID0gdXJsbGliMi51cmxvcGVuKHVybCkKKyAgICAg ICAgICAgIHJldHVybiBqc29uLmxvYWQoanNvbmRhdGEpCisgICAgICAgIGV4Y2VwdCB1cmxsaWIy LlVSTEVycm9yLCBlcnI6CiAgICAgICAgICAgICBidWlsZF91cmwgPSBCdWlsZC5idWlsZF91cmwo YnVpbGRlciwgYnVpbGRfbnVtYmVyKQogICAgICAgICAgICAgX2xvZy5lcnJvcigiRXJyb3IgZmV0 Y2hpbmcgZGF0YSBmb3IgJXMgYnVpbGQgJXMgKCVzKTogJXMiICUgKGJ1aWxkZXIubmFtZSgpLCBi dWlsZF9udW1iZXIsIGJ1aWxkX3VybCwgZXJyKSkKICAgICAgICAgICAgIHJldHVybiBOb25lCisg ICAgICAgIGV4Y2VwdCBWYWx1ZUVycm9yLCBlcnI6CisgICAgICAgICAgICBidWlsZF91cmwgPSBC dWlsZC5idWlsZF91cmwoYnVpbGRlciwgYnVpbGRfbnVtYmVyKQorICAgICAgICAgICAgX2xvZy5l cnJvcigiRXJyb3IgZGVjb2RpbmcganNvbiBkYXRhIGZyb20gJXM6ICVzIiAlIChidWlsZF91cmws IGVycikpCisgICAgICAgICAgICByZXR1cm4gTm9uZQogCiAgICAgZGVmIF9mZXRjaF9vbmVfYm94 X3Blcl9idWlsZGVyKHNlbGYpOgogICAgICAgICBidWlsZF9zdGF0dXNfdXJsID0gImh0dHA6Ly8l cy9vbmVfYm94X3Blcl9idWlsZGVyIiAlIHNlbGYuYnVpbGRib3RfaG9zdAo= 75903 2010-12-08 07:35:16 -0800 2010-12-08 20:22:36 -0800 recreated patch from the root of the repo so CQ can apply it webkitpy.buildbot.py.50647.4.patch text/plain 5396 wsiegrist SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDczNDU2KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTAtMTItMDcgIFdpbGxpYW0gU2llZ3Jpc3Qg PHdzaWVncmlzdEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgTWlncmF0ZSBidWlsZGJvdC5weSBmcm9tIHhtbHJwYyB0byBqc29uLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA2NDcKKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWlsZGJvdC5weToKKwogMjAx MC0xMi0wNyAgVG9ueSBDaGFuZyAgPHRvbnlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IE9qYW4gVmFmYWkuCkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9uZXQvYnVpbGRib3RfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1aWxkYm90X3VuaXR0ZXN0LnB5CShyZXZpc2lv biA3MzQ1NikKKysrIFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWls ZGJvdF91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMjk3LDE1ICsyOTcsMTcgQEAKICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChidWlsZGVyLnVybF9lbmNvZGVkX25hbWUoKSwgIlRlc3Ql MjBCdWlsZGVyIikKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChidWlsZGVyLnJlc3VsdHNfdXJs KCksICJodHRwOi8vYnVpbGQud2Via2l0Lm9yZy9yZXN1bHRzL1Rlc3QlMjBCdWlsZGVyIikKIAot ICAgICAgICAjIE92ZXJyaWRlIF9mZXRjaF94bWxycGNfYnVpbGRfZGljdGlvbmFyeSBmdW5jdGlv biB0byBub3QgdG91Y2ggdGhlIG5ldHdvcmsuCi0gICAgICAgIGRlZiBtb2NrX2ZldGNoX3htbHJw Y19idWlsZF9kaWN0aW9uYXJ5KHNlbGYsIGJ1aWxkX251bWJlcik6CisgICAgICAgICMgT3ZlcnJp ZGUgX2ZldGNoX2J1aWxkX2RpY3Rpb25hcnkgZnVuY3Rpb24gdG8gbm90IHRvdWNoIHRoZSBuZXR3 b3JrLgorICAgICAgICBkZWYgbW9ja19mZXRjaF9idWlsZF9kaWN0aW9uYXJ5KHNlbGYsIGJ1aWxk X251bWJlcik6CiAgICAgICAgICAgICBidWlsZF9kaWN0aW9uYXJ5ID0gewotICAgICAgICAgICAg ICAgICJyZXZpc2lvbiIgOiAyICogYnVpbGRfbnVtYmVyLAorICAgICAgICAgICAgICAgICJzb3Vy Y2VTdGFtcCI6IHsKKyAgICAgICAgICAgICAgICAgICAgInJldmlzaW9uIiA6IDIgKiBidWlsZF9u dW1iZXIsCisgICAgICAgICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAgICAgIm51bWJlciIg OiBpbnQoYnVpbGRfbnVtYmVyKSwKICAgICAgICAgICAgICAgICAicmVzdWx0cyIgOiBidWlsZF9u dW1iZXIgJSAyLCAjIDAgbWVhbnMgcGFzcwogICAgICAgICAgICAgfQogICAgICAgICAgICAgcmV0 dXJuIGJ1aWxkX2RpY3Rpb25hcnkKLSAgICAgICAgYnVpbGRib3QuX2ZldGNoX3htbHJwY19idWls ZF9kaWN0aW9uYXJ5ID0gbW9ja19mZXRjaF94bWxycGNfYnVpbGRfZGljdGlvbmFyeQorICAgICAg ICBidWlsZGJvdC5fZmV0Y2hfYnVpbGRfZGljdGlvbmFyeSA9IG1vY2tfZmV0Y2hfYnVpbGRfZGlj dGlvbmFyeQogCiAgICAgICAgIGJ1aWxkID0gYnVpbGRlci5idWlsZCgxMCkKICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChidWlsZC5idWlsZGVyKCksIGJ1aWxkZXIpCkluZGV4OiBXZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVpbGRib3QucHkKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1aWxkYm90LnB5CShyZXZp c2lvbiA3MzQ1NikKKysrIFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9i dWlsZGJvdC5weQkod29ya2luZyBjb3B5KQpAQCAtMjgsMTEgKzI4LDE2IEBACiAjCiAjIFdlYktp dCdzIFB5dGhvbiBtb2R1bGUgZm9yIGludGVyYWN0aW5nIHdpdGggV2ViS2l0J3MgYnVpbGRib3QK IAordHJ5OgorICAgIGltcG9ydCBqc29uCitleGNlcHQgSW1wb3J0RXJyb3I6CisgICAgIyBweXRo b24gMi41IGNvbXBhdGliaWxpdHkKKyAgICBpbXBvcnQgd2Via2l0cHkudGhpcmRwYXJ0eS5zaW1w bGVqc29uIGFzIGpzb24KKwogaW1wb3J0IG9wZXJhdG9yCiBpbXBvcnQgcmUKIGltcG9ydCB1cmxs aWIKIGltcG9ydCB1cmxsaWIyCi1pbXBvcnQgeG1scnBjbGliCiAKIGZyb20gd2Via2l0cHkuY29t bW9uLm5ldC5mYWlsdXJlbWFwIGltcG9ydCBGYWlsdXJlTWFwCiBmcm9tIHdlYmtpdHB5LmNvbW1v bi5uZXQubGF5b3V0dGVzdHJlc3VsdHMgaW1wb3J0IExheW91dFRlc3RSZXN1bHRzCkBAIC02Nywx MyArNzIsMTMgQEAKIAogICAgICMgVGhpcyBwcm92aWRlcyBhIHNpbmdsZSBwbGFjZSB0byBtb2Nr CiAgICAgZGVmIF9mZXRjaF9idWlsZChzZWxmLCBidWlsZF9udW1iZXIpOgotICAgICAgICBidWls ZF9kaWN0aW9uYXJ5ID0gc2VsZi5fYnVpbGRib3QuX2ZldGNoX3htbHJwY19idWlsZF9kaWN0aW9u YXJ5KHNlbGYsIGJ1aWxkX251bWJlcikKKyAgICAgICAgYnVpbGRfZGljdGlvbmFyeSA9IHNlbGYu X2J1aWxkYm90Ll9mZXRjaF9idWlsZF9kaWN0aW9uYXJ5KHNlbGYsIGJ1aWxkX251bWJlcikKICAg ICAgICAgaWYgbm90IGJ1aWxkX2RpY3Rpb25hcnk6CiAgICAgICAgICAgICByZXR1cm4gTm9uZQog ICAgICAgICByZXR1cm4gQnVpbGQoc2VsZiwKICAgICAgICAgICAgIGJ1aWxkX251bWJlcj1pbnQo YnVpbGRfZGljdGlvbmFyeVsnbnVtYmVyJ10pLAotICAgICAgICAgICAgcmV2aXNpb249aW50KGJ1 aWxkX2RpY3Rpb25hcnlbJ3JldmlzaW9uJ10pLAotICAgICAgICAgICAgaXNfZ3JlZW49KGJ1aWxk X2RpY3Rpb25hcnlbJ3Jlc3VsdHMnXSA9PSAwKSAjIFVuZG9jdW1lbnRlZCwgYnVpbGRib3QgWE1M UlBDLCAwIHNlZW1zIHRvIG1lYW4gInBhc3MiCisgICAgICAgICAgICByZXZpc2lvbj1pbnQoYnVp bGRfZGljdGlvbmFyeVsnc291cmNlU3RhbXAnXVsncmV2aXNpb24nXSksCisgICAgICAgICAgICBp c19ncmVlbj0oYnVpbGRfZGljdGlvbmFyeVsncmVzdWx0cyddID09IDApICMgVW5kb2N1bWVudGVk LCAwIHNlZW1zIHRvIG1lYW4gInBhc3MiCiAgICAgICAgICkKIAogICAgIGRlZiBidWlsZChzZWxm LCBidWlsZF9udW1iZXIpOgpAQCAtMTQwLDcgKzE0NSw3IEBACiAgICAgICAgICAgICByZXR1cm4g Tm9uZQogICAgICAgICBidWlsZCA9IHNlbGYuYnVpbGQoYnVpbGRfbnVtYmVyKQogICAgICAgICBp ZiBub3QgYnVpbGQgYW5kIGFsbG93X2ZhaWxlZF9sb29rdXBzOgotICAgICAgICAgICAgIyBCdWls ZHMgZm9yIG9sZCByZXZpc2lvbnMgd2l0aCBmYWlsIHRvIGxvb2t1cCB2aWEgYnVpbGRib3QncyB4 bWxycGMgYXBpLgorICAgICAgICAgICAgIyBCdWlsZHMgZm9yIG9sZCByZXZpc2lvbnMgd2l0aCBm YWlsIHRvIGxvb2t1cCB2aWEgYnVpbGRib3QncyBqc29uIGFwaS4KICAgICAgICAgICAgIGJ1aWxk ID0gQnVpbGQoc2VsZiwKICAgICAgICAgICAgICAgICBidWlsZF9udW1iZXI9YnVpbGRfbnVtYmVy LAogICAgICAgICAgICAgICAgIHJldmlzaW9uPXJldmlzaW9uLApAQCAtMzQ1LDE2ICszNTAsMjIg QEAKICAgICAgICAgcmV0dXJuIG5vdCBzZWxmLnJlZF9jb3JlX2J1aWxkZXJzKCkKIAogICAgICMg RklYTUU6IFRoZXNlIF9mZXRjaCBtZXRob2RzIHNob3VsZCBtb3ZlIHRvIGEgbmV0d29ya2luZyBj bGFzcy4KLSAgICBkZWYgX2ZldGNoX3htbHJwY19idWlsZF9kaWN0aW9uYXJ5KHNlbGYsIGJ1aWxk ZXIsIGJ1aWxkX251bWJlcik6Ci0gICAgICAgICMgVGhlIGJ1aWxkYm90IFhNTFJQQyBBUEkgaXMg c3VwZXItbGltaXRlZC4KLSAgICAgICAgIyBGb3Igb25lLCB5b3UgY2Fubm90IGZldGNoIGluZm8g b24gYnVpbGRzIHdoaWNoIGFyZSBpbmNvbXBsZXRlLgotICAgICAgICBwcm94eSA9IHhtbHJwY2xp Yi5TZXJ2ZXJQcm94eSgiaHR0cDovLyVzL3htbHJwYyIgJSBzZWxmLmJ1aWxkYm90X2hvc3QsIGFs bG93X25vbmU9VHJ1ZSkKKyAgICBkZWYgX2ZldGNoX2J1aWxkX2RpY3Rpb25hcnkoc2VsZiwgYnVp bGRlciwgYnVpbGRfbnVtYmVyKToKICAgICAgICAgdHJ5OgotICAgICAgICAgICAgcmV0dXJuIHBy b3h5LmdldEJ1aWxkKGJ1aWxkZXIubmFtZSgpLCBpbnQoYnVpbGRfbnVtYmVyKSkKLSAgICAgICAg ZXhjZXB0IHhtbHJwY2xpYi5GYXVsdCwgZXJyOgorICAgICAgICAgICAgYmFzZSA9ICJodHRwOi8v JXMiICUgc2VsZi5idWlsZGJvdF9ob3N0CisgICAgICAgICAgICBwYXRoID0gdXJsbGliLnF1b3Rl KCJqc29uL2J1aWxkZXJzLyVzL2J1aWxkcy8lcyIgJSAoYnVpbGRlci5uYW1lKCksCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg YnVpbGRfbnVtYmVyKSkKKyAgICAgICAgICAgIHVybCA9ICIlcy8lcyIgJSAoYmFzZSwgcGF0aCkK KyAgICAgICAgICAgIGpzb25kYXRhID0gdXJsbGliMi51cmxvcGVuKHVybCkKKyAgICAgICAgICAg IHJldHVybiBqc29uLmxvYWQoanNvbmRhdGEpCisgICAgICAgIGV4Y2VwdCB1cmxsaWIyLlVSTEVy cm9yLCBlcnI6CiAgICAgICAgICAgICBidWlsZF91cmwgPSBCdWlsZC5idWlsZF91cmwoYnVpbGRl ciwgYnVpbGRfbnVtYmVyKQogICAgICAgICAgICAgX2xvZy5lcnJvcigiRXJyb3IgZmV0Y2hpbmcg ZGF0YSBmb3IgJXMgYnVpbGQgJXMgKCVzKTogJXMiICUgKGJ1aWxkZXIubmFtZSgpLCBidWlsZF9u dW1iZXIsIGJ1aWxkX3VybCwgZXJyKSkKICAgICAgICAgICAgIHJldHVybiBOb25lCisgICAgICAg IGV4Y2VwdCBWYWx1ZUVycm9yLCBlcnI6CisgICAgICAgICAgICBidWlsZF91cmwgPSBCdWlsZC5i dWlsZF91cmwoYnVpbGRlciwgYnVpbGRfbnVtYmVyKQorICAgICAgICAgICAgX2xvZy5lcnJvcigi RXJyb3IgZGVjb2RpbmcganNvbiBkYXRhIGZyb20gJXM6ICVzIiAlIChidWlsZF91cmwsIGVycikp CisgICAgICAgICAgICByZXR1cm4gTm9uZQogCiAgICAgZGVmIF9mZXRjaF9vbmVfYm94X3Blcl9i dWlsZGVyKHNlbGYpOgogICAgICAgICBidWlsZF9zdGF0dXNfdXJsID0gImh0dHA6Ly8lcy9vbmVf Ym94X3Blcl9idWlsZGVyIiAlIHNlbGYuYnVpbGRib3RfaG9zdAo=