73637 2011-12-02 02:19:13 -0800 [Refactoring] In webkitpy/bindings/main.py, replace subprocess.Popen() with Executive 2011-12-06 00:05:35 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 haraken haraken abarth eric ojan webkit.review.bot oldest_to_newest 513630 0 haraken 2011-12-02 02:19:13 -0800 We can replace subprocess.Popen() with Executive, similar to other Python scripts in webkitpy/. 513633 1 117593 haraken 2011-12-02 02:29:29 -0800 Created attachment 117593 Patch 513911 2 abarth 2011-12-02 10:36:59 -0800 I forget whether run_command or run_and_throw_if_failed is preferred. @Eric? 513914 3 eric 2011-12-02 10:42:49 -0800 (In reply to comment #2) > I forget whether run_command or run_and_throw_if_failed is preferred. > > @Eric? run_command. 515478 4 117593 abarth 2011-12-05 16:06:50 -0800 Comment on attachment 117593 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=117593&action=review > Tools/Scripts/webkitpy/common/system/executive.py:403 > + return_exit_code_and_output=False, Why not just catch the exception? That's what we usually do in these cases. The ScriptError has all the data. 515568 5 117972 haraken 2011-12-05 18:09:59 -0800 Created attachment 117972 Patch 515585 6 117972 abarth 2011-12-05 18:49:27 -0800 Comment on attachment 117972 Patch Thanks. 515693 7 117972 webkit.review.bot 2011-12-06 00:05:29 -0800 Comment on attachment 117972 Patch Clearing flags on attachment: 117972 Committed r102105: <http://trac.webkit.org/changeset/102105> 515694 8 webkit.review.bot 2011-12-06 00:05:35 -0800 All reviewed patches have been landed. Closing bug. 117593 2011-12-02 02:29:29 -0800 2011-12-05 18:09:54 -0800 Patch bug-73637-20111202192928.patch text/plain 6298 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxNzY3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTkyZGNmNTQ0NmJmYzczN2M1NWQ3Njg2NjcyZWMxYWQ0 NDhkMDJmNC4uNDIyMWVmZTRjMzgxZDQ3ZWUxM2EzMTdjZjQ3YjUxNjQwYzdlNzg5NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2 IEBACiAyMDExLTEyLTAyICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAor ICAgICAgICBbUmVmYWN0b3JpbmddIEluIHdlYmtpdHB5L2JpbmRpbmdzL21haW4ucHksIHJlcGxh Y2Ugc3VicHJvY2Vzcy5Qb3BlbigpIHdpdGggRXhlY3V0aXZlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MzYzNworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggcmVwbGFjZXMgc3VicHJvY2Vz cy5Qb3BlbigpIHdpdGggRXhlY3V0aXZlLCBzaW1pbGFyIHRvIG90aGVyCisgICAgICAgIFB5dGhv biBzY3JpcHRzIGluIHdlYmtpdHB5Ly4gVGhpcyBwYXRjaCBhZGRzIGEgbmV3IG9wdGlvbiAncmV0 dXJuX2V4aXRfY29kZV9hbmRfb3V0cHV0JworICAgICAgICB0byBFeGVjdXRpdmUucnVuX2NvbW1h bmQuCisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi1iaW5kaW5ncy10ZXN0czoKKyAgICAgICAgKG1h aW4pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmluZGluZ3MvbWFpbi5weTogUmVwbGFj ZXMgc3VicHJvY2Vzcy5Qb3BlbigpIHdpdGggRXhlY3V0aXZlLgorICAgICAgICAoQmluZGluZ3NU ZXN0cy5fX2luaXRfXyk6CisgICAgICAgIChCaW5kaW5nc1Rlc3RzLmdlbmVyYXRlX2Zyb21faWRs KToKKyAgICAgICAgKEJpbmRpbmdzVGVzdHMuZ2VuZXJhdGVfc3VwcGxlbWVudGFsX2RlcGVuZGVu Y3kpOgorICAgICAgICAoQmluZGluZ3NUZXN0cy5kZXRlY3RfY2hhbmdlcyk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weToKKyAgICAgICAgKEV4 ZWN1dGl2ZS5ydW5fY29tbWFuZCk6IElmICdyZXR1cm5fZXhpdF9jb2RlX2FuZF9vdXRwdXQ9VHJ1 ZScsIHRoZW4gYSB0dXBsZSBvZiBleGl0X2NvZGUgYW5kIG91dHB1dCBpcyByZXR1cm5lZC4KKwor MjAxMS0xMi0wMiAgS2VudGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CisKICAgICAg ICAgTW92ZSBydW4tYmluZGluZ3MtdGVzdHMgaW1wbGVtZW50YXRpb24gdG8gd2Via2l0cHkvYmlu ZGluZ3MvbWFpbi5weQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NzM2MTkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9ydW4tYmluZGluZ3MtdGVz dHMgYi9Ub29scy9TY3JpcHRzL3J1bi1iaW5kaW5ncy10ZXN0cwppbmRleCAyMzZkNTBlYWU2NGQ1 ZWQ5ZjNlNGUzYzAyZWM4MzkzNzc3ZjNlMTZkLi42MjdmMTc2ZGU2MmZlNDkwMjk0YzYzOGRhNjY4 ZmExNzQ0OGI1MzRmIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3J1bi1iaW5kaW5ncy10ZXN0 cworKysgYi9Ub29scy9TY3JpcHRzL3J1bi1iaW5kaW5ncy10ZXN0cwpAQCAtMjksNiArMjksNyBA QAogIyBwYXRjaC4gVGhpcyBtYWtlcyBpdCBlYXNpZXIgdG8gdHJhY2sgYW5kIHJldmlldyBjaGFu Z2VzIGluIGdlbmVyYXRlZCBjb2RlLgogCiBpbXBvcnQgc3lzCitmcm9tIHdlYmtpdHB5LmNvbW1v bi5zeXN0ZW0gaW1wb3J0IGV4ZWN1dGl2ZQogCiBkZWYgbWFpbihhcmd2KToKICAgICAiIiJSdW5z IFdlYkNvcmUgYmluZGluZ3MgY29kZSBnZW5lcmF0b3JzIG9uIHRlc3QgSURMIGZpbGVzIGFuZCBj b21wYXJlcwpAQCAtNTAsNyArNTEsNyBAQCBkZWYgbWFpbihhcmd2KToKIAogICAgIGZyb20gd2Vi a2l0cHkuYmluZGluZ3MubWFpbiBpbXBvcnQgQmluZGluZ3NUZXN0cwogCi0gICAgQmluZGluZ3NU ZXN0cyhyZXNldF9yZXN1bHRzLCBnZW5lcmF0b3JzKS5tYWluKCkKKyAgICBCaW5kaW5nc1Rlc3Rz KHJlc2V0X3Jlc3VsdHMsIGdlbmVyYXRvcnMsIGV4ZWN1dGl2ZS5FeGVjdXRpdmUoKSkubWFpbigp CiAKIAogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvYmluZGluZ3MvbWFpbi5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmlu ZGluZ3MvbWFpbi5weQppbmRleCBkZThlNmRhZjUxZmI3NmU1NzYxODQ3MjU4OTkwNDZkN2I3OGE3 NjE5Li4wZTAyNmI5ZGVkY2NmMzc1MDFiZGYwZTY5NzU5OTRlMWU1MWNhZmVmIDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JpbmRpbmdzL21haW4ucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9iaW5kaW5ncy9tYWluLnB5CkBAIC0zNCw5ICszNCwxMCBAQCBmcm9tIHdl YmtpdHB5LmNvbW1vbi5jaGVja291dC5zY20uZGV0ZWN0aW9uIGltcG9ydCBkZXRlY3Rfc2NtX3N5 c3RlbQogCiBjbGFzcyBCaW5kaW5nc1Rlc3RzOgogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHJl c2V0X3Jlc3VsdHMsIGdlbmVyYXRvcnMpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCByZXNldF9y ZXN1bHRzLCBnZW5lcmF0b3JzLCBleGVjdXRpdmUpOgogICAgICAgICBzZWxmLnJlc2V0X3Jlc3Vs dHMgPSByZXNldF9yZXN1bHRzCiAgICAgICAgIHNlbGYuZ2VuZXJhdG9ycyA9IGdlbmVyYXRvcnMK KyAgICAgICAgc2VsZi5leGVjdXRpdmUgPSBleGVjdXRpdmUKIAogICAgIGRlZiBnZW5lcmF0ZV9m cm9tX2lkbChzZWxmLCBnZW5lcmF0b3IsIGlkbF9maWxlLCBvdXRwdXRfZGlyZWN0b3J5LCBzdXBw bGVtZW50YWxfZGVwZW5kZW5jeV9maWxlKToKICAgICAgICAgY21kID0gWydwZXJsJywgJy13JywK QEAgLTUwLDkgKzUxLDcgQEAgY2xhc3MgQmluZGluZ3NUZXN0czoKICAgICAgICAgICAgICAgICct LXN1cHBsZW1lbnRhbERlcGVuZGVuY3lGaWxlJywgc3VwcGxlbWVudGFsX2RlcGVuZGVuY3lfZmls ZSwKICAgICAgICAgICAgICAgIGlkbF9maWxlXQogCi0gICAgICAgIHByb2Nlc3MgPSBzdWJwcm9j ZXNzLlBvcGVuKGNtZCwgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSwgc3RkZXJyPXN1YnByb2Nlc3Mu U1RET1VUKQotICAgICAgICBleGl0X2NvZGUgPSBwcm9jZXNzLndhaXQoKQotICAgICAgICBvdXRw dXQgPSBwcm9jZXNzLmNvbW11bmljYXRlKClbMF0KKyAgICAgICAgZXhpdF9jb2RlLCBvdXRwdXQg PSBzZWxmLmV4ZWN1dGl2ZS5ydW5fY29tbWFuZChjbWQsIHJldHVybl9leGl0X2NvZGVfYW5kX291 dHB1dD1UcnVlKQogICAgICAgICBpZiBvdXRwdXQ6CiAgICAgICAgICAgICBwcmludCBvdXRwdXQK ICAgICAgICAgcmV0dXJuIGV4aXRfY29kZQpAQCAtNzIsMTMgKzcxLDExIEBAIGNsYXNzIEJpbmRp bmdzVGVzdHM6CiAgICAgICAgICAgICAgICAnLS1pZGxGaWxlc0xpc3QnLCBpZGxfZmlsZXNfbGlz dFsxXSwKICAgICAgICAgICAgICAgICctLWRlZmluZXMnLCAnJywKICAgICAgICAgICAgICAgICct LXN1cHBsZW1lbnRhbERlcGVuZGVuY3lGaWxlJywgc3VwcGxlbWVudGFsX2RlcGVuZGVuY3lfZmls ZV0KLSAgICAgICAgcHJvY2VzcyA9IHN1YnByb2Nlc3MuUG9wZW4oY21kLCBzdGRvdXQ9c3VicHJv Y2Vzcy5QSVBFLCBzdGRlcnI9c3VicHJvY2Vzcy5TVERPVVQpCi0gICAgICAgIGV4aXRfY29kZSA9 IHByb2Nlc3Mud2FpdCgpCi0gICAgICAgIG91dHB1dCA9IHByb2Nlc3MuY29tbXVuaWNhdGUoKVsw XQotICAgICAgICBpZiBvdXRwdXQ6Ci0gICAgICAgICAgICBwcmludCBvdXRwdXQKIAorICAgICAg ICBleGl0X2NvZGUsIG91dHB1dCA9IHNlbGYuZXhlY3V0aXZlLnJ1bl9jb21tYW5kKGNtZCwgcmV0 dXJuX2V4aXRfY29kZV9hbmRfb3V0cHV0PVRydWUpCiAgICAgICAgIG9zLnJlbW92ZShpZGxfZmls ZXNfbGlzdFsxXSkKKyAgICAgICAgaWYgb3V0cHV0OgorICAgICAgICAgICAgcHJpbnQgb3V0cHV0 CiAgICAgICAgIHJldHVybiBleGl0X2NvZGUKIAogICAgIGRlZiBkZXRlY3RfY2hhbmdlcyhzZWxm LCBnZW5lcmF0b3IsIHdvcmtfZGlyZWN0b3J5LCByZWZlcmVuY2VfZGlyZWN0b3J5KToKQEAgLTkw LDE2ICs4NywxMyBAQCBjbGFzcyBCaW5kaW5nc1Rlc3RzOgogICAgICAgICAgICAgICAgICAgIG9z LnBhdGguam9pbihyZWZlcmVuY2VfZGlyZWN0b3J5LCBvdXRwdXRfZmlsZSksCiAgICAgICAgICAg ICAgICAgICAgb3MucGF0aC5qb2luKHdvcmtfZGlyZWN0b3J5LCBvdXRwdXRfZmlsZSldCiAKLSAg ICAgICAgICAgIHByb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKGNtZCwgc3Rkb3V0PXN1YnByb2Nl c3MuUElQRSwgc3RkZXJyPXN1YnByb2Nlc3MuU1RET1VUKQotICAgICAgICAgICAgcHJvY2Vzcy53 YWl0KCkKLSAgICAgICAgICAgIG91dHB1dCA9IHByb2Nlc3MuY29tbXVuaWNhdGUoKVswXQotICAg ICAgICAgICAgaWYgb3V0cHV0OgorICAgICAgICAgICAgZXhpdF9jb2RlLCBvdXRwdXQgPSBzZWxm LmV4ZWN1dGl2ZS5ydW5fY29tbWFuZChjbWQsIHJldHVybl9leGl0X2NvZGVfYW5kX291dHB1dD1U cnVlKQorICAgICAgICAgICAgaWYgZXhpdF9jb2RlIG9yIG91dHB1dDoKICAgICAgICAgICAgICAg ICBwcmludCAnRkFJTDogKCVzKSAlcycgJSAoZ2VuZXJhdG9yLCBvdXRwdXRfZmlsZSkKICAgICAg ICAgICAgICAgICBwcmludCBvdXRwdXQKICAgICAgICAgICAgICAgICBjaGFuZ2VzX2ZvdW5kID0g VHJ1ZQogICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICBwcmludCAnUEFTUzogKCVz KSAlcycgJSAoZ2VuZXJhdG9yLCBvdXRwdXRfZmlsZSkKLQogICAgICAgICByZXR1cm4gY2hhbmdl c19mb3VuZAogCiAgICAgZGVmIHJ1bl90ZXN0cyhzZWxmLCBnZW5lcmF0b3IsIGlucHV0X2RpcmVj dG9yeSwgcmVmZXJlbmNlX2RpcmVjdG9yeSwgc3VwcGxlbWVudGFsX2RlcGVuZGVuY3lfZmlsZSk6 CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0 aXZlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5w eQppbmRleCA1NjFkOGNhODA5YTk1ZmUzZjYwMmZkMzliNTZkYTVkZDZhNWU2ZjhhLi4yMWM0MGY3 Yjc4ZGIzYWI3MDU4N2EyNDM1NWFkZGYwYmExYTg5YzU0IDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmUucHkKQEAgLTQwMCw2ICs0MDAsNyBA QCBjbGFzcyBFeGVjdXRpdmUob2JqZWN0KToKICAgICAgICAgICAgICAgICAgICAgaW5wdXQ9Tm9u ZSwKICAgICAgICAgICAgICAgICAgICAgZXJyb3JfaGFuZGxlcj1Ob25lLAogICAgICAgICAgICAg ICAgICAgICByZXR1cm5fZXhpdF9jb2RlPUZhbHNlLAorICAgICAgICAgICAgICAgICAgICByZXR1 cm5fZXhpdF9jb2RlX2FuZF9vdXRwdXQ9RmFsc2UsCiAgICAgICAgICAgICAgICAgICAgIHJldHVy bl9zdGRlcnI9VHJ1ZSwKICAgICAgICAgICAgICAgICAgICAgZGVjb2RlX291dHB1dD1UcnVlKToK ICAgICAgICAgIiIiUG9wZW4gd3JhcHBlciBmb3IgY29udmVuaWVuY2UgYW5kIHRvIHdvcmsgYXJv dW5kIHB5dGhvbiBidWdzLiIiIgpAQCAtNDMzLDEyICs0MzQsMTUgQEAgY2xhc3MgRXhlY3V0aXZl KG9iamVjdCk6CiAgICAgICAgIGlmIHJldHVybl9leGl0X2NvZGU6CiAgICAgICAgICAgICByZXR1 cm4gZXhpdF9jb2RlCiAKLSAgICAgICAgaWYgZXhpdF9jb2RlOgorICAgICAgICBpZiBleGl0X2Nv ZGUgYW5kIG5vdCByZXR1cm5fZXhpdF9jb2RlX2FuZF9vdXRwdXQ6CiAgICAgICAgICAgICBzY3Jp cHRfZXJyb3IgPSBTY3JpcHRFcnJvcihzY3JpcHRfYXJncz1hcmdzLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZXhpdF9jb2RlPWV4aXRfY29kZSwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG91dHB1dD1vdXRwdXQsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjd2Q9Y3dkKQogICAgICAgICAgICAgKGVycm9yX2hh bmRsZXIgb3Igc2VsZi5kZWZhdWx0X2Vycm9yX2hhbmRsZXIpKHNjcmlwdF9lcnJvcikKKworICAg ICAgICBpZiByZXR1cm5fZXhpdF9jb2RlX2FuZF9vdXRwdXQ6CisgICAgICAgICAgICByZXR1cm4g KGV4aXRfY29kZSwgb3V0cHV0KQogICAgICAgICByZXR1cm4gb3V0cHV0CiAKICAgICBkZWYgX2No aWxkX3Byb2Nlc3NfZW5jb2Rpbmcoc2VsZik6Cg== 117972 2011-12-05 18:09:59 -0800 2011-12-06 00:05:29 -0800 Patch bug-73637-20111206110958.patch text/plain 5354 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxNzY3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTkyZGNmNTQ0NmJmYzczN2M1NWQ3Njg2NjcyZWMxYWQ0 NDhkMDJmNC4uZGRiYzBkNzExOGY3YzI3NWJkNTAyNGI4Mjk1NDFhZTQ0YTgzMzVkNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDExLTEyLTA1ICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBbUmVmYWN0b3JpbmddIEluIHdlYmtpdHB5L2JpbmRpbmdzL21haW4ucHksIHJlcGxh Y2Ugc3VicHJvY2Vzcy5Qb3BlbigpIHdpdGggRXhlY3V0aXZlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MzYzNworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggcmVwbGFjZXMgc3VicHJvY2Vz cy5Qb3BlbigpIHdpdGggRXhlY3V0aXZlLCBzaW1pbGFyIHRvIG90aGVyCisgICAgICAgIFB5dGhv biBzY3JpcHRzIGluIHdlYmtpdHB5Ly4gSSBtYW51YWxseSBjb25maXJtZWQgdGhhdCBydW4tYmlu ZGluZ3MtdGVzdHMKKyAgICAgICAgd29ya3Mgd2VsbCBmb3IgY2FzZXMgd2hlcmUgbm8gZXhjZXB0 aW9uIGlzIHJhaXNlZCwgbm8gZXhjZXB0aW9uIGlzIHJhaXNlZAorICAgICAgICBidXQgZGlmZiBp cyBmb3VuZCwgYW5kIFNjcmlwdEVycm9yIGlzIHJhaXNlZC4KKworICAgICAgICAqIFNjcmlwdHMv cnVuLWJpbmRpbmdzLXRlc3RzOgorICAgICAgICAobWFpbik6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9iaW5kaW5ncy9tYWluLnB5OiBSZXBsYWNlcyBzdWJwcm9jZXNzLlBvcGVuKCkgd2l0 aCBFeGVjdXRpdmUuCisgICAgICAgIChCaW5kaW5nc1Rlc3RzLl9faW5pdF9fKToKKyAgICAgICAg KEJpbmRpbmdzVGVzdHMuZ2VuZXJhdGVfZnJvbV9pZGwpOgorICAgICAgICAoQmluZGluZ3NUZXN0 cy5nZW5lcmF0ZV9zdXBwbGVtZW50YWxfZGVwZW5kZW5jeSk6CisgICAgICAgIChCaW5kaW5nc1Rl c3RzLmRldGVjdF9jaGFuZ2VzKToKKwogMjAxMS0xMi0wMiAgS2VudGFybyBIYXJhICA8aGFyYWtl bkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgTW92ZSBydW4tYmluZGluZ3MtdGVzdHMgaW1wbGVt ZW50YXRpb24gdG8gd2Via2l0cHkvYmluZGluZ3MvbWFpbi5weQpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy9ydW4tYmluZGluZ3MtdGVzdHMgYi9Ub29scy9TY3JpcHRzL3J1bi1iaW5kaW5ncy10 ZXN0cwppbmRleCAyMzZkNTBlYWU2NGQ1ZWQ5ZjNlNGUzYzAyZWM4MzkzNzc3ZjNlMTZkLi42Mjdm MTc2ZGU2MmZlNDkwMjk0YzYzOGRhNjY4ZmExNzQ0OGI1MzRmIDEwMDc1NQotLS0gYS9Ub29scy9T Y3JpcHRzL3J1bi1iaW5kaW5ncy10ZXN0cworKysgYi9Ub29scy9TY3JpcHRzL3J1bi1iaW5kaW5n cy10ZXN0cwpAQCAtMjksNiArMjksNyBAQAogIyBwYXRjaC4gVGhpcyBtYWtlcyBpdCBlYXNpZXIg dG8gdHJhY2sgYW5kIHJldmlldyBjaGFuZ2VzIGluIGdlbmVyYXRlZCBjb2RlLgogCiBpbXBvcnQg c3lzCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0gaW1wb3J0IGV4ZWN1dGl2ZQogCiBkZWYg bWFpbihhcmd2KToKICAgICAiIiJSdW5zIFdlYkNvcmUgYmluZGluZ3MgY29kZSBnZW5lcmF0b3Jz IG9uIHRlc3QgSURMIGZpbGVzIGFuZCBjb21wYXJlcwpAQCAtNTAsNyArNTEsNyBAQCBkZWYgbWFp bihhcmd2KToKIAogICAgIGZyb20gd2Via2l0cHkuYmluZGluZ3MubWFpbiBpbXBvcnQgQmluZGlu Z3NUZXN0cwogCi0gICAgQmluZGluZ3NUZXN0cyhyZXNldF9yZXN1bHRzLCBnZW5lcmF0b3JzKS5t YWluKCkKKyAgICBCaW5kaW5nc1Rlc3RzKHJlc2V0X3Jlc3VsdHMsIGdlbmVyYXRvcnMsIGV4ZWN1 dGl2ZS5FeGVjdXRpdmUoKSkubWFpbigpCiAKIAogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmluZGluZ3MvbWFpbi5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvYmluZGluZ3MvbWFpbi5weQppbmRleCBkZThlNmRhZjUxZmI3 NmU1NzYxODQ3MjU4OTkwNDZkN2I3OGE3NjE5Li44MjBhZDJiNDg0MWMwNmEwZTk2MWIwNWE5NWNi ZWExMGJkYTFkNDE3IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JpbmRpbmdz L21haW4ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iaW5kaW5ncy9tYWluLnB5CkBA IC0zMCwxMyArMzAsMTUgQEAgaW1wb3J0IHN1YnByb2Nlc3MKIGltcG9ydCBzeXMKIGltcG9ydCB0 ZW1wZmlsZQogZnJvbSB3ZWJraXRweS5jb21tb24uY2hlY2tvdXQuc2NtLmRldGVjdGlvbiBpbXBv cnQgZGV0ZWN0X3NjbV9zeXN0ZW0KK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5leGVjdXRp dmUgaW1wb3J0IFNjcmlwdEVycm9yCiAKIAogY2xhc3MgQmluZGluZ3NUZXN0czoKIAotICAgIGRl ZiBfX2luaXRfXyhzZWxmLCByZXNldF9yZXN1bHRzLCBnZW5lcmF0b3JzKToKKyAgICBkZWYgX19p bml0X18oc2VsZiwgcmVzZXRfcmVzdWx0cywgZ2VuZXJhdG9ycywgZXhlY3V0aXZlKToKICAgICAg ICAgc2VsZi5yZXNldF9yZXN1bHRzID0gcmVzZXRfcmVzdWx0cwogICAgICAgICBzZWxmLmdlbmVy YXRvcnMgPSBnZW5lcmF0b3JzCisgICAgICAgIHNlbGYuZXhlY3V0aXZlID0gZXhlY3V0aXZlCiAK ICAgICBkZWYgZ2VuZXJhdGVfZnJvbV9pZGwoc2VsZiwgZ2VuZXJhdG9yLCBpZGxfZmlsZSwgb3V0 cHV0X2RpcmVjdG9yeSwgc3VwcGxlbWVudGFsX2RlcGVuZGVuY3lfZmlsZSk6CiAgICAgICAgIGNt ZCA9IFsncGVybCcsICctdycsCkBAIC01MCwxMSArNTIsMTQgQEAgY2xhc3MgQmluZGluZ3NUZXN0 czoKICAgICAgICAgICAgICAgICctLXN1cHBsZW1lbnRhbERlcGVuZGVuY3lGaWxlJywgc3VwcGxl bWVudGFsX2RlcGVuZGVuY3lfZmlsZSwKICAgICAgICAgICAgICAgIGlkbF9maWxlXQogCi0gICAg ICAgIHByb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKGNtZCwgc3Rkb3V0PXN1YnByb2Nlc3MuUElQ RSwgc3RkZXJyPXN1YnByb2Nlc3MuU1RET1VUKQotICAgICAgICBleGl0X2NvZGUgPSBwcm9jZXNz LndhaXQoKQotICAgICAgICBvdXRwdXQgPSBwcm9jZXNzLmNvbW11bmljYXRlKClbMF0KLSAgICAg ICAgaWYgb3V0cHV0OgotICAgICAgICAgICAgcHJpbnQgb3V0cHV0CisgICAgICAgIGV4aXRfY29k ZSA9IDAKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgb3V0cHV0ID0gc2VsZi5leGVjdXRpdmUu cnVuX2NvbW1hbmQoY21kKQorICAgICAgICAgICAgaWYgb3V0cHV0OgorICAgICAgICAgICAgICAg IHByaW50IG91dHB1dAorICAgICAgICBleGNlcHQgU2NyaXB0RXJyb3IsIGU6CisgICAgICAgICAg ICBwcmludCBlLm1lc3NhZ2Vfd2l0aF9vdXRwdXQoKQorICAgICAgICAgICAgZXhpdF9jb2RlID0g ZS5leGl0X2NvZGUKICAgICAgICAgcmV0dXJuIGV4aXRfY29kZQogCiAgICAgZGVmIGdlbmVyYXRl X3N1cHBsZW1lbnRhbF9kZXBlbmRlbmN5KHNlbGYsIGlucHV0X2RpcmVjdG9yeSwgc3VwcGxlbWVu dGFsX2RlcGVuZGVuY3lfZmlsZSk6CkBAIC03MiwxMiArNzcsMTUgQEAgY2xhc3MgQmluZGluZ3NU ZXN0czoKICAgICAgICAgICAgICAgICctLWlkbEZpbGVzTGlzdCcsIGlkbF9maWxlc19saXN0WzFd LAogICAgICAgICAgICAgICAgJy0tZGVmaW5lcycsICcnLAogICAgICAgICAgICAgICAgJy0tc3Vw cGxlbWVudGFsRGVwZW5kZW5jeUZpbGUnLCBzdXBwbGVtZW50YWxfZGVwZW5kZW5jeV9maWxlXQot ICAgICAgICBwcm9jZXNzID0gc3VicHJvY2Vzcy5Qb3BlbihjbWQsIHN0ZG91dD1zdWJwcm9jZXNz LlBJUEUsIHN0ZGVycj1zdWJwcm9jZXNzLlNURE9VVCkKLSAgICAgICAgZXhpdF9jb2RlID0gcHJv Y2Vzcy53YWl0KCkKLSAgICAgICAgb3V0cHV0ID0gcHJvY2Vzcy5jb21tdW5pY2F0ZSgpWzBdCi0g ICAgICAgIGlmIG91dHB1dDoKLSAgICAgICAgICAgIHByaW50IG91dHB1dAogCisgICAgICAgIGV4 aXRfY29kZSA9IDAKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgb3V0cHV0ID0gc2VsZi5leGVj dXRpdmUucnVuX2NvbW1hbmQoY21kKQorICAgICAgICAgICAgaWYgb3V0cHV0OgorICAgICAgICAg ICAgICAgIHByaW50IG91dHB1dAorICAgICAgICBleGNlcHQgU2NyaXB0RXJyb3IsIGU6CisgICAg ICAgICAgICBwcmludCBlLm1lc3NhZ2Vfd2l0aF9vdXRwdXQoKQorICAgICAgICAgICAgZXhpdF9j b2RlID0gZS5leGl0X2NvZGUKICAgICAgICAgb3MucmVtb3ZlKGlkbF9maWxlc19saXN0WzFdKQog ICAgICAgICByZXR1cm4gZXhpdF9jb2RlCiAKQEAgLTkwLDE2ICs5OCwxOSBAQCBjbGFzcyBCaW5k aW5nc1Rlc3RzOgogICAgICAgICAgICAgICAgICAgIG9zLnBhdGguam9pbihyZWZlcmVuY2VfZGly ZWN0b3J5LCBvdXRwdXRfZmlsZSksCiAgICAgICAgICAgICAgICAgICAgb3MucGF0aC5qb2luKHdv cmtfZGlyZWN0b3J5LCBvdXRwdXRfZmlsZSldCiAKLSAgICAgICAgICAgIHByb2Nlc3MgPSBzdWJw cm9jZXNzLlBvcGVuKGNtZCwgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSwgc3RkZXJyPXN1YnByb2Nl c3MuU1RET1VUKQotICAgICAgICAgICAgcHJvY2Vzcy53YWl0KCkKLSAgICAgICAgICAgIG91dHB1 dCA9IHByb2Nlc3MuY29tbXVuaWNhdGUoKVswXQotICAgICAgICAgICAgaWYgb3V0cHV0OgorICAg ICAgICAgICAgZXhpdF9jb2RlID0gMAorICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAg IG91dHB1dCA9IHNlbGYuZXhlY3V0aXZlLnJ1bl9jb21tYW5kKGNtZCkKKyAgICAgICAgICAgIGV4 Y2VwdCBTY3JpcHRFcnJvciwgZToKKyAgICAgICAgICAgICAgICBvdXRwdXQgPSBlLm1lc3NhZ2Vf d2l0aF9vdXRwdXQoKQorICAgICAgICAgICAgICAgIGV4aXRfY29kZSA9IGUuZXhpdF9jb2RlCisK KyAgICAgICAgICAgIGlmIGV4aXRfY29kZSBvciBvdXRwdXQ6CiAgICAgICAgICAgICAgICAgcHJp bnQgJ0ZBSUw6ICglcykgJXMnICUgKGdlbmVyYXRvciwgb3V0cHV0X2ZpbGUpCiAgICAgICAgICAg ICAgICAgcHJpbnQgb3V0cHV0CiAgICAgICAgICAgICAgICAgY2hhbmdlc19mb3VuZCA9IFRydWUK ICAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgcHJpbnQgJ1BBU1M6ICglcykgJXMn ICUgKGdlbmVyYXRvciwgb3V0cHV0X2ZpbGUpCi0KICAgICAgICAgcmV0dXJuIGNoYW5nZXNfZm91 bmQKIAogICAgIGRlZiBydW5fdGVzdHMoc2VsZiwgZ2VuZXJhdG9yLCBpbnB1dF9kaXJlY3Rvcnks IHJlZmVyZW5jZV9kaXJlY3RvcnksIHN1cHBsZW1lbnRhbF9kZXBlbmRlbmN5X2ZpbGUpOgo=