69486 2011-10-05 17:26:53 -0700 watchlist: Should be more robust to bad regex. 2011-10-19 15:32:52 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 70358 68822 1 levin levin abarth eric levin+watchlist webkit.review.bot oldest_to_newest 478809 0 levin 2011-10-05 17:26:53 -0700 It is easy to enter a bad regex for a definition, etc. We shouldn't turn every style run red and other definitions should still be run. 486532 1 111556 levin 2011-10-18 20:31:08 -0700 Created attachment 111556 Patch 486922 2 111556 abarth 2011-10-19 12:37:45 -0700 Comment on attachment 111556 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=111556&action=review > Tools/Scripts/webkitpy/common/watchlist/amountchangedpattern.py:32 > + def __init__(self, compile_regex, index_for_zero_value): > + self._regex = compile_regex compile_regex => compiled_regex ? > Tools/Scripts/webkitpy/common/watchlist/changedlinepattern.py:32 > + def __init__(self, compile_regex, index_for_zero_value): > + self._regex = compile_regex Same question. > Tools/Scripts/webkitpy/common/watchlist/watchlistparser.py:114 > + except Exception, e: Can we catch a more specific exception here? I bet there's a specific exception for regexes failing to compile. 487057 3 111556 webkit.review.bot 2011-10-19 15:32:47 -0700 Comment on attachment 111556 Patch Clearing flags on attachment: 111556 Committed r97885: <http://trac.webkit.org/changeset/97885> 487058 4 webkit.review.bot 2011-10-19 15:32:52 -0700 All reviewed patches have been landed. Closing bug. 111556 2011-10-18 20:31:08 -0700 2011-10-19 15:32:47 -0700 Patch bug-69486-20111018203107.patch text/plain 20040 levin U3VidmVyc2lvbiBSZXZpc2lvbjogOTc4MjIKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0ZDMxOWIxMGE3YmU0YzBjNjZjMTIyZmYxNjYyYTVjZmM1 MzI1ZjM0Li43ZDE2MDI2ZTFlNzUyMTlkZmI2OGFhNGI2NDRkOGVkYWY0MzU1YTMyIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjYg QEAKIDIwMTEtMTAtMTggIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgogCisgICAg ICAgIHdhdGNobGlzdDogU2hvdWxkIGJlIG1vcmUgcm9idXN0IHRvIGJhZCByZWdleC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5NDg2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9jb25maWcvd2F0Y2hsaXN0OiBDaGFuZ2UgdGhlIGluc3RydWN0aW9ucyBkdWUg dG8KKyAgICAgICAgICB3YXRjaGxpc3QgYmVpbmcgY2hlY2tlZCBieSBjaGVjay13ZWJraXQtc3R5 bGUgKGJ1ZyA2OTQ4NykgYW5kIHJlbW92ZSB0aGUgLiogZnJvbSBmaWxlCisgICAgICAgICAgcGF0 dGVybnMgc2luY2UgdGhleSBhcmUgbm8gbG9uZ2VyIGFuY2hvcmVkIG9uIHRoZSByaWdodCBoYW5k IHNpZGUuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L2Ftb3Vu dGNoYW5nZWRwYXR0ZXJuLnB5OiBDaGFuZ2UgKnBhdHRlcm4gdG8gdGFrZSBhIGNvbXBpbGVkIHJl Z2V4IGRpcmVjdGx5LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlz dC9hbW91bnRjaGFuZ2VkcGF0dGVybl91bml0dGVzdC5weTogRGl0dG8uCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L2NoYW5nZWRsaW5lcGF0dGVybi5weTogRGl0 dG8uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L2NoYW5nZWRs aW5lcGF0dGVybl91bml0dGVzdC5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9jb21tb24vd2F0Y2hsaXN0L2ZpbGVuYW1lcGF0dGVybi5weTogRGl0dG8uCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L2ZpbGVuYW1lcGF0dGVybl91bml0dGVz dC5weTogRGl0dG8gYW5kIGNoYW5nZSBhIHRlc3Qgbm93IHRoYXQKKyAgICAgICAgZmlsZW5hbWVz IGFyZSBubyBsb25nZXIgYW5jaG9yZWQgb24gdGhlIHJpZ2h0IGhhbmQgc2lkZS4KKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0cGFyc2VyLnB5OiBD YXRjaCByZWdleCBlcnJvcnMgYW5kIGxvZyB0aGVtIGFzIGVycm9ycy4KKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0cGFyc2VyX3VuaXR0ZXN0LnB5 OiBBZGQgc29tZSB0ZXN0cyB0byB2ZXJpZnkgdGhhdCBiYWQgcmVnZXhlcworICAgICAgICBkb24n dCBraWxsIGV2ZXJ5dGhpbmcuCisKKzIwMTEtMTAtMTggIERhdmlkIExldmluICA8bGV2aW5AY2hy b21pdW0ub3JnPgorCiAgICAgICAgIHdhdGNobGlzdDogQWRkIGEgc3R5bGVjaGVjayB0byBkbyB2 YWxpZGl0eSBjaGVja3MgZm9yIHRoZSB3YXRjaGxpc3QgY29uZmlnLgogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njk0ODcKIApkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3dhdGNobGlzdCBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy93YXRjaGxpc3QKaW5kZXggOTIyODRlODYzZGFlZGQ2 MjhjNDI0M2Y3OTE2NWI2NDk2ZjY5NjlhMS4uNDNhODk2ODM1ZWJhMmIzYjg0NDAzMjVlMGZkMGMy ZjBmNWJiZDNjZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29u ZmlnL3dhdGNobGlzdAorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcv d2F0Y2hsaXN0CkBAIC0zLDcgKzMsNyBAQAogIyBXaGVuIGVkaXRpbmcgdGhpcyBmaWxlLCBwbGVh c2UgcnVuIHRoZSBmb2xsb3dpbmcgY29tbWFuZCB0byBtYWtlIHN1cmUgeW91CiAjIGhhdmVuJ3Qg aW50cm9kdWNlZCBhbnkgc3ludGF4IGVycm9yczoKICMKLSMgLi9Ub29scy9TY3JpcHRzL3Rlc3Qt d2Via2l0cHkgd2Via2l0cHkuY29tbW9uLndhdGNobGlzdAorIyAuL1Rvb2xzL1NjcmlwdHMvY2hl Y2std2Via2l0LXN0eWxlCiAjCiAjIElmIHlvdSB3YW50IHRvIHRlc3QgeW91ciByZWd1bGFyIGV4 cHJlc3Npb25zLCB5b3UgY2FuIGVkaXQgdmFyaW91cyBmaWxlcyBhbmQKICMgdGhlbiB0cnkgZm9s bG93aW5nIGNvbW1hbmQ6CkBAIC0xMywyMSArMTMsMjEgQEAKIHsKICAgICAiREVGSU5JVElPTlMi OiB7CiAgICAgICAgICJDaHJvbWl1bUdyYXBoaWNzIjogewotICAgICAgICAgICAgImZpbGVuYW1l IjogciJTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS8uKiIsCisgICAg ICAgICAgICAiZmlsZW5hbWUiOiByIlNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtLyIsCiAgICAgICAgIH0sCiAgICAgICAgICJDaHJvbWl1bVB1YmxpY0FwaSI6IHsKLSAg ICAgICAgICAgICJmaWxlbmFtZSI6IHIiU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvLioi CisgICAgICAgICAgICAiZmlsZW5hbWUiOiByIlNvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGlj LyIKICAgICAgICAgfSwKICAgICAgICAgIldlYklETCI6IHsKICAgICAgICAgICAgICJmaWxlbmFt ZSI6IHIiU291cmNlL1dlYkNvcmUvKD8haW5zcGVjdG9yKS4qXC5pZGwiCiAgICAgICAgIH0sCiAg ICAgICAgICJUaHJlYWRpbmdGaWxlcyI6IHsKLSAgICAgICAgICAgICJmaWxlbmFtZSI6IHIiU291 cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRTcGVjaWZpY1wuLioiCi0gICAgICAgICAgICAg ICAgICAgICAgICByInxTb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZFNhZmVSZWZDb3Vu dGVkXC4uKiIKLSAgICAgICAgICAgICAgICAgICAgICAgIHIifFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS93dGYvVGhyZWFkaW5nUHJpbWl0aXZlc1wuLioiCi0gICAgICAgICAgICAgICAgICAgICAgICBy InxTb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGluZ1wuLioiCi0gICAgICAgICAgICAg ICAgICAgICAgICByInxTb3VyY2UvV2ViQ29yZS9kb20vQ3Jvc3NUaHJlYWRUYXNrXC4uKiIKLSAg ICAgICAgICAgICAgICAgICAgICAgIHIifFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0Nyb3NzVGhy ZWFkQ29waWVyXC4uKiIsCisgICAgICAgICAgICAiZmlsZW5hbWUiOiByIlNvdXJjZS9KYXZhU2Ny aXB0Q29yZS93dGYvVGhyZWFkU3BlY2lmaWNcLiIKKyAgICAgICAgICAgICAgICAgICAgICAgIHIi fFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvVGhyZWFkU2FmZVJlZkNvdW50ZWRcLiIKKyAgICAg ICAgICAgICAgICAgICAgICAgIHIifFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvVGhyZWFkaW5n UHJpbWl0aXZlc1wuIgorICAgICAgICAgICAgICAgICAgICAgICAgciJ8U291cmNlL0phdmFTY3Jp cHRDb3JlL3d0Zi9UaHJlYWRpbmdcLiIKKyAgICAgICAgICAgICAgICAgICAgICAgIHIifFNvdXJj ZS9XZWJDb3JlL2RvbS9Dcm9zc1RocmVhZFRhc2tcLiIKKyAgICAgICAgICAgICAgICAgICAgICAg IHIifFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0Nyb3NzVGhyZWFkQ29waWVyXC4iLAogICAgICAg ICB9LAogICAgICAgICAiVGhyZWFkaW5nVXNhZ2UiOiB7CiAgICAgICAgICAgICAjIFRoZSBpbnRl bnRpb24gb2YgdGhpcyByZWdleCBpcyB0byBkZXRlY3QgcGxhY2VzIHdoZXJlIHBlb3BsZSBhcmUg dXNpbmcgY29tbW9uIHRocmVhZGluZyBtZWNoYW5pc21zLApAQCAtMzcsMTMgKzM3LDEzIEBACiAg ICAgICAgICAgICAgICAgICAgIHIifGNyZWF0ZUNhbGxiYWNrVGFza3xjcm9zc1RocmVhZFN0cmlu Z3xkZXByZWNhdGVkVHVybk9mZlZlcmlmaWVyfHRocmVhZHNhZmVDb3B5KSg/IVwuKGh8Y3BwKSki LAogICAgICAgICB9LAogICAgICAgICAiV2F0Y2hMaXN0U2NyaXB0IjogewotICAgICAgICAgICAg ImZpbGVuYW1lIjogciJUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3QvLioi LAorICAgICAgICAgICAgImZpbGVuYW1lIjogciJUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi93YXRjaGxpc3QvIiwKICAgICAgICAgfSwKICAgICAgICAgIndlYmtpdHB5IjogewotICAgICAg ICAgICAgImZpbGVuYW1lIjogciJUb29scy9TY3JpcHRzL3dlYmtpdHB5Ly4qIiwKKyAgICAgICAg ICAgICJmaWxlbmFtZSI6IHIiVG9vbHMvU2NyaXB0cy93ZWJraXRweS8iLAogICAgICAgICB9LAog ICAgICAgICAiVGVzdEZhaWx1cmVzIjogewotICAgICAgICAgICAgImZpbGVuYW1lIjogciJUb29s cy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9U ZXN0RmFpbHVyZXMvLioiLAorICAgICAgICAgICAgImZpbGVuYW1lIjogciJUb29scy9CdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9UZXN0RmFpbHVy ZXMvIiwKICAgICAgICAgfSwKICAgICAgICAgIlNlY3VyaXR5Q3JpdGljYWwiOiB7CiAgICAgICAg ICAgICAibW9yZSI6IHIiW1NzXWVjdXJpdHlPcmlnaW4oPyFcLihofGNwcCkpIiwKQEAgLTUxLDE5 ICs1MSwxOSBAQAogICAgICAgICAgICAgImZpbGVuYW1lIjogciJYU1N8W1NzXWVjdXJpdHkiLAog ICAgICAgICB9LAogICAgICAgICAiVjhCaW5kaW5ncyI6IHsKLSAgICAgICAgICAgICJmaWxlbmFt ZSI6IHIiU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvLioiLAorICAgICAgICAgICAgImZpbGVu YW1lIjogciJTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC8iLAogICAgICAgICB9LAogICAgICAg ICAiQmluZGluZ3NTY3JpcHRzIjogewotICAgICAgICAgICAgImZpbGVuYW1lIjogciJTb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzLy4qIiwKKyAgICAgICAgICAgICJmaWxlbmFtZSI6IHIi U291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy8iLAogICAgICAgICB9LAogICAgICAgICAi RnJhbWVMb2FkZXIiOiB7CiAgICAgICAgICAgICAibW9yZSI6IHIiRnJhbWVMb2FkZXJcLihjcHB8 aCkiLAogICAgICAgICB9LAogICAgICAgICAiTG9hZGVyIjogewotICAgICAgICAgICAgImZpbGVu YW1lIjogciJTb3VyY2UvV2ViQ29yZS9sb2FkZXIvLioiLAorICAgICAgICAgICAgImZpbGVuYW1l IjogciJTb3VyY2UvV2ViQ29yZS9sb2FkZXIvIiwKICAgICAgICAgfSwKICAgICAgICAgIlN0eWxl Q2hlY2tlciI6IHsKLSAgICAgICAgICAgICJmaWxlbmFtZSI6IHIiVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9zdHlsZS8uKiIsCisgICAgICAgICAgICAiZmlsZW5hbWUiOiByIlRvb2xzL1NjcmlwdHMv d2Via2l0cHkvc3R5bGUvIiwKICAgICAgICAgfSwKICAgICB9LAogICAgICJDQ19SVUxFUyI6IHsK QEAgLTgxLDcgKzgxLDcgQEAKICAgICAgICAgIkxvYWRlciI6IFsgImphcGhldEBjaHJvbWl1bS5v cmciIF0sCiAgICAgICAgICJTZWN1cml0eUNyaXRpY2FsIjogWyAiYWJhcnRoQHdlYmtpdC5vcmci IF0sCiAgICAgICAgICJ3ZWJraXRweSI6IFsgImFiYXJ0aEB3ZWJraXQub3JnIiBdLAotICAgICAg ICAiVGVzdEZhaWx1cmVzIjogWyAiZGdsYXprb3ZAY2hyb21pdW0ub3JnIiwgImFiYXJ0aEB3ZWJr aXQub3JnIiBdLAorICAgICAgICAiVGVzdEZhaWx1cmVzIjogWyAiYWJhcnRoQHdlYmtpdC5vcmci LCAiZGdsYXprb3ZAY2hyb21pdW0ub3JnIiBdLAogICAgIH0sCiAgICAgIk1FU1NBR0VfUlVMRVMi OiB7CiAgICAgICAgICJDaHJvbWl1bVB1YmxpY0FwaSI6IFsgIlBsZWFzZSB3YWl0IGZvciBhcHBy b3ZhbCBmcm9tIGZpc2hkQGNocm9taXVtLm9yZyBiZWZvcmUgc3VibWl0dGluZyAiCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3QvYW1vdW50Y2hhbmdl ZHBhdHRlcm4ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3QvYW1v dW50Y2hhbmdlZHBhdHRlcm4ucHkKaW5kZXggZTNkZWM4NGYzNmU0YmY0NDUwZDVmNzYxMzFlNjU5 ODFlMjQzYWI4NS4uZmM4YWRjOTY3NWUzNjdiYWRmNDhkM2E4YzAzMmQwZjI2MWVkZDkzYyAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L2Ftb3VudGNo YW5nZWRwYXR0ZXJuLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNo bGlzdC9hbW91bnRjaGFuZ2VkcGF0dGVybi5weQpAQCAtMjcsMTIgKzI3LDkgQEAKICMgT0YgVEhJ UyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERB TUFHRS4KIAogCi1pbXBvcnQgcmUKLQotCiBjbGFzcyBBbW91bnRDaGFuZ2VkUGF0dGVybjoKLSAg ICBkZWYgX19pbml0X18oc2VsZiwgcmVnZXgsIGluZGV4X2Zvcl96ZXJvX3ZhbHVlKToKLSAgICAg ICAgc2VsZi5fcmVnZXggPSByZS5jb21waWxlKHJlZ2V4KQorICAgIGRlZiBfX2luaXRfXyhzZWxm LCBjb21waWxlX3JlZ2V4LCBpbmRleF9mb3JfemVyb192YWx1ZSk6CisgICAgICAgIHNlbGYuX3Jl Z2V4ID0gY29tcGlsZV9yZWdleAogICAgICAgICBzZWxmLl9pbmRleF9mb3JfemVyb192YWx1ZSA9 IGluZGV4X2Zvcl96ZXJvX3ZhbHVlCiAKICAgICBkZWYgbWF0Y2goc2VsZiwgcGF0aCwgZGlmZl9m aWxlKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlz dC9hbW91bnRjaGFuZ2VkcGF0dGVybl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL3dhdGNobGlzdC9hbW91bnRjaGFuZ2VkcGF0dGVybl91bml0dGVzdC5weQppbmRl eCA1MWFhMTVjZDU3OWRmY2NlY2YwOTk5NGEzYzVjYTMyMzc5YzE4OWJlLi43YWU0NWZhM2Y4NTc5 YzlmYzE5Mjg3NzQ4Y2VhNjc3NjE0OTVmYzdiIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi93YXRjaGxpc3QvYW1vdW50Y2hhbmdlZHBhdHRlcm5fdW5pdHRlc3QucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L2Ftb3VudGNoYW5n ZWRwYXR0ZXJuX3VuaXR0ZXN0LnB5CkBAIC0zMCw3ICszMCwxMCBAQAogJycnVW5pdCB0ZXN0cyBm b3IgYW1vdW50Y2hhbmdlZHBhdHRlcm4ucHkuJycnCiAKIAoraW1wb3J0IHJlCiBpbXBvcnQgdW5p dHRlc3QKKworCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi53YXRjaGxpc3QuYW1vdW50Y2hhbmdlZHBh dHRlcm4gaW1wb3J0IEFtb3VudENoYW5nZWRQYXR0ZXJuCiAKIApAQCAtNDcsMTggKzUwLDIxIEBA IGNsYXNzIEFtb3VudENoYW5nZWRQYXR0ZXJuVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAg ICAgICAgICAgICAgICAoMCwgMywgJ2JvdGgnKSwKICAgICAgICAgICAgICAgICAgICkKIAorICAg IGRlZiBydW5fYW1vdW50X2NoYW5nZWRfcGF0dGVybl9tYXRjaChzZWxmLCBwYXR0ZXJuLCBpbmRl eF9mb3JfemVyb192YWx1ZSk6CisgICAgICAgIHJldHVybiBBbW91bnRDaGFuZ2VkUGF0dGVybihy ZS5jb21waWxlKHBhdHRlcm4pLCBpbmRleF9mb3JfemVyb192YWx1ZSkubWF0Y2goTm9uZSwgc2Vs Zi5fRElGRl9GSUxFKQorCiAgICAgZGVmIHRlc3RfYWRkZWRfbGluZXMoc2VsZik6Ci0gICAgICAg IHNlbGYuYXNzZXJ0VHJ1ZShBbW91bnRDaGFuZ2VkUGF0dGVybignaGknLCAwKS5tYXRjaChOb25l LCBzZWxmLl9ESUZGX0ZJTEUpKQotICAgICAgICBzZWxmLmFzc2VydFRydWUoQW1vdW50Q2hhbmdl ZFBhdHRlcm4oJ2hpIGhpJywgMCkubWF0Y2goTm9uZSwgc2VsZi5fRElGRl9GSUxFKSkKLSAgICAg ICAgc2VsZi5hc3NlcnRGYWxzZShBbW91bnRDaGFuZ2VkUGF0dGVybignb3RoZXInLCAwKS5tYXRj aChOb25lLCBzZWxmLl9ESUZGX0ZJTEUpKQotICAgICAgICBzZWxmLmFzc2VydEZhbHNlKEFtb3Vu dENoYW5nZWRQYXR0ZXJuKCdib3RoJywgMCkubWF0Y2goTm9uZSwgc2VsZi5fRElGRl9GSUxFKSkK LSAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShBbW91bnRDaGFuZ2VkUGF0dGVybignYnllJywgMCku bWF0Y2goTm9uZSwgc2VsZi5fRElGRl9GSUxFKSkKLSAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShB bW91bnRDaGFuZ2VkUGF0dGVybignTWF0Y2hlc05vdGhpbmcnLCAwKS5tYXRjaChOb25lLCBzZWxm Ll9ESUZGX0ZJTEUpKQorICAgICAgICBzZWxmLmFzc2VydFRydWUoc2VsZi5ydW5fYW1vdW50X2No YW5nZWRfcGF0dGVybl9tYXRjaCgnaGknLCAwKSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHNl bGYucnVuX2Ftb3VudF9jaGFuZ2VkX3BhdHRlcm5fbWF0Y2goJ2hpIGhpJywgMCkpCisgICAgICAg IHNlbGYuYXNzZXJ0RmFsc2Uoc2VsZi5ydW5fYW1vdW50X2NoYW5nZWRfcGF0dGVybl9tYXRjaCgn b3RoZXInLCAwKSkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShzZWxmLnJ1bl9hbW91bnRfY2hh bmdlZF9wYXR0ZXJuX21hdGNoKCdib3RoJywgMCkpCisgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2Uo c2VsZi5ydW5fYW1vdW50X2NoYW5nZWRfcGF0dGVybl9tYXRjaCgnYnllJywgMCkpCisgICAgICAg IHNlbGYuYXNzZXJ0RmFsc2Uoc2VsZi5ydW5fYW1vdW50X2NoYW5nZWRfcGF0dGVybl9tYXRjaCgn TWF0Y2hlc05vdGhpbmcnLCAwKSkKIAogICAgIGRlZiB0ZXN0X3JlbW92ZWRfbGluZXMoc2VsZik6 Ci0gICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoQW1vdW50Q2hhbmdlZFBhdHRlcm4oJ2hpJywgMSku bWF0Y2goTm9uZSwgc2VsZi5fRElGRl9GSUxFKSkKLSAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShB bW91bnRDaGFuZ2VkUGF0dGVybignaGkgaGknLCAxKS5tYXRjaChOb25lLCBzZWxmLl9ESUZGX0ZJ TEUpKQotICAgICAgICBzZWxmLmFzc2VydEZhbHNlKEFtb3VudENoYW5nZWRQYXR0ZXJuKCdvdGhl cicsIDEpLm1hdGNoKE5vbmUsIHNlbGYuX0RJRkZfRklMRSkpCi0gICAgICAgIHNlbGYuYXNzZXJ0 RmFsc2UoQW1vdW50Q2hhbmdlZFBhdHRlcm4oJ2JvdGgnLCAxKS5tYXRjaChOb25lLCBzZWxmLl9E SUZGX0ZJTEUpKQotICAgICAgICBzZWxmLmFzc2VydFRydWUoQW1vdW50Q2hhbmdlZFBhdHRlcm4o J2J5ZScsIDEpLm1hdGNoKE5vbmUsIHNlbGYuX0RJRkZfRklMRSkpCi0gICAgICAgIHNlbGYuYXNz ZXJ0RmFsc2UoQW1vdW50Q2hhbmdlZFBhdHRlcm4oJ01hdGNoZXNOb3RoaW5nJywgMSkubWF0Y2go Tm9uZSwgc2VsZi5fRElGRl9GSUxFKSkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShzZWxmLnJ1 bl9hbW91bnRfY2hhbmdlZF9wYXR0ZXJuX21hdGNoKCdoaScsIDEpKQorICAgICAgICBzZWxmLmFz c2VydEZhbHNlKHNlbGYucnVuX2Ftb3VudF9jaGFuZ2VkX3BhdHRlcm5fbWF0Y2goJ2hpIGhpJywg MSkpCisgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2Uoc2VsZi5ydW5fYW1vdW50X2NoYW5nZWRfcGF0 dGVybl9tYXRjaCgnb3RoZXInLCAxKSkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShzZWxmLnJ1 bl9hbW91bnRfY2hhbmdlZF9wYXR0ZXJuX21hdGNoKCdib3RoJywgMSkpCisgICAgICAgIHNlbGYu YXNzZXJ0VHJ1ZShzZWxmLnJ1bl9hbW91bnRfY2hhbmdlZF9wYXR0ZXJuX21hdGNoKCdieWUnLCAx KSkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShzZWxmLnJ1bl9hbW91bnRfY2hhbmdlZF9wYXR0 ZXJuX21hdGNoKCdNYXRjaGVzTm90aGluZycsIDEpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L2NoYW5nZWRsaW5lcGF0dGVybi5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlzdC9jaGFuZ2VkbGluZXBhdHRlcm4ucHkK aW5kZXggZGQ0NzU3OGM4NzljNTVlMjYxZGMzMTZhOTFiMGQ2YjZmOWQ4YmU5MC4uNjFmYWM5YTc2 OTRlMjczOTE5ZjM3NDYzYjdkODA2MzlmOWYwYmFhMyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L2NoYW5nZWRsaW5lcGF0dGVybi5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3QvY2hhbmdlZGxpbmVwYXR0ZXJu LnB5CkBAIC0yNiwxMiArMjYsMTAgQEAKICMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVS V0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9GIFRISVMgU09GVFdB UkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAK LWltcG9ydCByZQotCiAKIGNsYXNzIENoYW5nZWRMaW5lUGF0dGVybjoKLSAgICBkZWYgX19pbml0 X18oc2VsZiwgcmVnZXgsIGluZGV4X2Zvcl96ZXJvX3ZhbHVlKToKLSAgICAgICAgc2VsZi5fcmVn ZXggPSByZS5jb21waWxlKHJlZ2V4KQorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBjb21waWxlX3Jl Z2V4LCBpbmRleF9mb3JfemVyb192YWx1ZSk6CisgICAgICAgIHNlbGYuX3JlZ2V4ID0gY29tcGls ZV9yZWdleAogICAgICAgICBzZWxmLl9pbmRleF9mb3JfemVyb192YWx1ZSA9IGluZGV4X2Zvcl96 ZXJvX3ZhbHVlCiAKICAgICBkZWYgbWF0Y2goc2VsZiwgcGF0aCwgZGlmZl9maWxlKToKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlzdC9jaGFuZ2VkbGlu ZXBhdHRlcm5fdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRj aGxpc3QvY2hhbmdlZGxpbmVwYXR0ZXJuX3VuaXR0ZXN0LnB5CmluZGV4IDAwMTcwNDViODc3MDlk OTRhZjFjMDE4MjQyNWE3OWUyMTAxMjJhNzYuLjFmMmFlZGEyMzdhOTI2YWFlYzYwNTI1NDdmMzI0 NTg1MGJiNmQ0ZmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dh dGNobGlzdC9jaGFuZ2VkbGluZXBhdHRlcm5fdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L2NoYW5nZWRsaW5lcGF0dGVybl91bml0dGVzdC5w eQpAQCAtMjgsNyArMjgsMTAgQEAKIAogJycnVW5pdCB0ZXN0cyBmb3IgY2hhbmdlZGxpbmVwYXR0 ZXJuLnB5LicnJwogCitpbXBvcnQgcmUKIGltcG9ydCB1bml0dGVzdAorCisKIGZyb20gd2Via2l0 cHkuY29tbW9uLndhdGNobGlzdC5jaGFuZ2VkbGluZXBhdHRlcm4gaW1wb3J0IENoYW5nZWRMaW5l UGF0dGVybgogCiAKQEAgLTQ1LDE4ICs0OCwyMSBAQCBjbGFzcyBDaGFuZ2VkTGluZVBhdHRlcm5U ZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgICAgICAgICgwLCAzLCAnYm90aCcp LAogICAgICAgICAgICAgICAgICAgKQogCisgICAgZGVmIHJ1bl9jaGFuZ2VkX2xpbmVfcGF0dGVy bl9tYXRjaChzZWxmLCBwYXR0ZXJuLCBpbmRleF9mb3JfemVyb192YWx1ZSk6CisgICAgICAgIHJl dHVybiBDaGFuZ2VkTGluZVBhdHRlcm4ocmUuY29tcGlsZShwYXR0ZXJuKSwgaW5kZXhfZm9yX3pl cm9fdmFsdWUpLm1hdGNoKE5vbmUsIHNlbGYuX0RJRkZfRklMRSkKKwogICAgIGRlZiB0ZXN0X2Fk ZGVkX2xpbmVzKHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydFRydWUoQ2hhbmdlZExpbmVQYXR0 ZXJuKCdoaScsIDApLm1hdGNoKE5vbmUsIHNlbGYuX0RJRkZfRklMRSkpCi0gICAgICAgIHNlbGYu YXNzZXJ0VHJ1ZShDaGFuZ2VkTGluZVBhdHRlcm4oJ2guJywgMCkubWF0Y2goTm9uZSwgc2VsZi5f RElGRl9GSUxFKSkKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKENoYW5nZWRMaW5lUGF0dGVybign Ym90aCcsIDApLm1hdGNoKE5vbmUsIHNlbGYuX0RJRkZfRklMRSkpCi0gICAgICAgIHNlbGYuYXNz ZXJ0RmFsc2UoQ2hhbmdlZExpbmVQYXR0ZXJuKCdieWUnLCAwKS5tYXRjaChOb25lLCBzZWxmLl9E SUZGX0ZJTEUpKQotICAgICAgICBzZWxmLmFzc2VydEZhbHNlKENoYW5nZWRMaW5lUGF0dGVybign eScsIDApLm1hdGNoKE5vbmUsIHNlbGYuX0RJRkZfRklMRSkpCi0gICAgICAgIHNlbGYuYXNzZXJ0 RmFsc2UoQ2hhbmdlZExpbmVQYXR0ZXJuKCdvdGhlcicsIDApLm1hdGNoKE5vbmUsIHNlbGYuX0RJ RkZfRklMRSkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShzZWxmLnJ1bl9jaGFuZ2VkX2xpbmVf cGF0dGVybl9tYXRjaCgnaGknLCAwKSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHNlbGYucnVu X2NoYW5nZWRfbGluZV9wYXR0ZXJuX21hdGNoKCdoLicsIDApKQorICAgICAgICBzZWxmLmFzc2Vy dFRydWUoc2VsZi5ydW5fY2hhbmdlZF9saW5lX3BhdHRlcm5fbWF0Y2goJ2JvdGgnLCAwKSkKKyAg ICAgICAgc2VsZi5hc3NlcnRGYWxzZShzZWxmLnJ1bl9jaGFuZ2VkX2xpbmVfcGF0dGVybl9tYXRj aCgnYnllJywgMCkpCisgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2Uoc2VsZi5ydW5fY2hhbmdlZF9s aW5lX3BhdHRlcm5fbWF0Y2goJ3knLCAwKSkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShzZWxm LnJ1bl9jaGFuZ2VkX2xpbmVfcGF0dGVybl9tYXRjaCgnb3RoZXInLCAwKSkKIAogICAgIGRlZiB0 ZXN0X3JlbW92ZWRfbGluZXMoc2VsZik6Ci0gICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoQ2hhbmdl ZExpbmVQYXR0ZXJuKCdoaScsIDEpLm1hdGNoKE5vbmUsIHNlbGYuX0RJRkZfRklMRSkpCi0gICAg ICAgIHNlbGYuYXNzZXJ0RmFsc2UoQ2hhbmdlZExpbmVQYXR0ZXJuKCdoLicsIDEpLm1hdGNoKE5v bmUsIHNlbGYuX0RJRkZfRklMRSkpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShDaGFuZ2VkTGlu ZVBhdHRlcm4oJ2JvdGgnLCAxKS5tYXRjaChOb25lLCBzZWxmLl9ESUZGX0ZJTEUpKQotICAgICAg ICBzZWxmLmFzc2VydFRydWUoQ2hhbmdlZExpbmVQYXR0ZXJuKCdieWUnLCAxKS5tYXRjaChOb25l LCBzZWxmLl9ESUZGX0ZJTEUpKQotICAgICAgICBzZWxmLmFzc2VydFRydWUoQ2hhbmdlZExpbmVQ YXR0ZXJuKCd5JywgMSkubWF0Y2goTm9uZSwgc2VsZi5fRElGRl9GSUxFKSkKLSAgICAgICAgc2Vs Zi5hc3NlcnRGYWxzZShDaGFuZ2VkTGluZVBhdHRlcm4oJ290aGVyJywgMSkubWF0Y2goTm9uZSwg c2VsZi5fRElGRl9GSUxFKSkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShzZWxmLnJ1bl9jaGFu Z2VkX2xpbmVfcGF0dGVybl9tYXRjaCgnaGknLCAxKSkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxz ZShzZWxmLnJ1bl9jaGFuZ2VkX2xpbmVfcGF0dGVybl9tYXRjaCgnaC4nLCAxKSkKKyAgICAgICAg c2VsZi5hc3NlcnRUcnVlKHNlbGYucnVuX2NoYW5nZWRfbGluZV9wYXR0ZXJuX21hdGNoKCdib3Ro JywgMSkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShzZWxmLnJ1bl9jaGFuZ2VkX2xpbmVfcGF0 dGVybl9tYXRjaCgnYnllJywgMSkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShzZWxmLnJ1bl9j aGFuZ2VkX2xpbmVfcGF0dGVybl9tYXRjaCgneScsIDEpKQorICAgICAgICBzZWxmLmFzc2VydEZh bHNlKHNlbGYucnVuX2NoYW5nZWRfbGluZV9wYXR0ZXJuX21hdGNoKCdvdGhlcicsIDEpKQpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L2ZpbGVuYW1l cGF0dGVybi5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlzdC9maWxl bmFtZXBhdHRlcm4ucHkKaW5kZXggNTY0NDljMjhkZmJiYjBlYmEzNjQ2M2QxM2I5OGM5OGYxYjk4 MzhkZi4uNzk5ZWViNDQ5NWFjYjUyMzNlNjE5NzE2Y2Y1Y2JhZWZiNTlmOTA5MyAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L2ZpbGVuYW1lcGF0dGVy bi5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3QvZmlsZW5h bWVwYXR0ZXJuLnB5CkBAIC0yNiwxMiArMjYsMTAgQEAKICMgKElOQ0xVRElORyBORUdMSUdFTkNF IE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9GIFRI SVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBE QU1BR0UuCiAKLWltcG9ydCByZQotCiAKIGNsYXNzIEZpbGVuYW1lUGF0dGVybjoKLSAgICBkZWYg X19pbml0X18oc2VsZiwgcmVnZXgpOgotICAgICAgICBzZWxmLl9yZWdleCA9IHJlLmNvbXBpbGUo cmVnZXggKyAnJCcpCisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGNvbXBpbGVkX3JlZ2V4KToKKyAg ICAgICAgc2VsZi5fcmVnZXggPSBjb21waWxlZF9yZWdleAogCiAgICAgZGVmIG1hdGNoKHNlbGYs IHBhdGgsIGRpZmZfZmlsZSk6CiAgICAgICAgIHJldHVybiBzZWxmLl9yZWdleC5tYXRjaChwYXRo KQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L2Zp bGVuYW1lcGF0dGVybl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L3dhdGNobGlzdC9maWxlbmFtZXBhdHRlcm5fdW5pdHRlc3QucHkKaW5kZXggYzI4YTUzZWIyNzE1 ZWE2NTcwODBkZTY4NjY3NmJmNDdmNWEzOTdjZC4uMGFmZGYzMDA1OTc2NTljMDVhNjcwZTg5NDQz ZDVmZjJiN2UxZDgwOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v d2F0Y2hsaXN0L2ZpbGVuYW1lcGF0dGVybl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3QvZmlsZW5hbWVwYXR0ZXJuX3VuaXR0ZXN0LnB5CkBA IC0yNiwyMiArMjYsMjUgQEAKICMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkg QVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9GIFRISVMgU09GVFdBUkUsIEVW RU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKK2ltcG9y dCByZQogaW1wb3J0IHVuaXR0ZXN0CisKKwogZnJvbSB3ZWJraXRweS5jb21tb24ud2F0Y2hsaXN0 LmZpbGVuYW1lcGF0dGVybiBpbXBvcnQgRmlsZW5hbWVQYXR0ZXJuCiAKIAogY2xhc3MgRmlsZU5h bWVQYXR0ZXJuVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIHRlc3RfZmlsZW5hbWVf cGF0dGVybl9saXRlcmFsKHNlbGYpOgotICAgICAgICBmaWxlbmFtZV9wYXR0ZXJuID0gRmlsZW5h bWVQYXR0ZXJuKHInTXlGaWxlTmFtZVwuY3BwJykKKyAgICAgICAgZmlsZW5hbWVfcGF0dGVybiA9 IEZpbGVuYW1lUGF0dGVybihyZS5jb21waWxlKHInTXlGaWxlTmFtZVwuY3BwJykpCiAKICAgICAg ICAgIyBOb3RlIHRoZSBmb2xsb3cgZmlsZW5hbWVzIGFyZSBub3QgcmVnZXguCiAgICAgICAgIHNl bGYuYXNzZXJ0VHJ1ZShmaWxlbmFtZV9wYXR0ZXJuLm1hdGNoKCdNeUZpbGVOYW1lLmNwcCcsIE5v bmUpKQotICAgICAgICBzZWxmLmFzc2VydEZhbHNlKGZpbGVuYW1lX3BhdHRlcm4ubWF0Y2goJ015 RmlsZU5hbWUuY3BwYScsIE5vbmUpKQorICAgICAgICBzZWxmLmFzc2VydFRydWUoZmlsZW5hbWVf cGF0dGVybi5tYXRjaCgnTXlGaWxlTmFtZS5jcHBhJywgTm9uZSkpCiAgICAgICAgIHNlbGYuYXNz ZXJ0RmFsc2UoZmlsZW5hbWVfcGF0dGVybi5tYXRjaCgnYU15RmlsZU5hbWUuY3BwJywgTm9uZSkp CiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoZmlsZW5hbWVfcGF0dGVybi5tYXRjaCgnTXlGaWxl TmFtZWJjcHAnLCBOb25lKSkKIAogICAgIGRlZiB0ZXN0X2ZpbGVuYW1lX3BhdHRlcm5fc3Vic3Ry aW5nKHNlbGYpOgotICAgICAgICBmaWxlbmFtZV9wYXR0ZXJuID0gRmlsZW5hbWVQYXR0ZXJuKHIn LipcXE15RmlsZU5hbWVcLi4qJykKKyAgICAgICAgZmlsZW5hbWVfcGF0dGVybiA9IEZpbGVuYW1l UGF0dGVybihyZS5jb21waWxlKHInLipcXE15RmlsZU5hbWVcLi4qJykpCiAKICAgICAgICAgIyBO b3RlIHRoZSBmb2xsb3cgZmlsZW5hbWVzIGFyZSBub3QgcmVnZXguCiAgICAgICAgIHNlbGYuYXNz ZXJ0VHJ1ZShmaWxlbmFtZV9wYXR0ZXJuLm1hdGNoKHInXFxNeUZpbGVOYW1lLmNwcCcsIE5vbmUp KQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L3dh dGNobGlzdHBhcnNlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlz dC93YXRjaGxpc3RwYXJzZXIucHkKaW5kZXggZmRmNGUzM2RjZTAyNjU0OGZiOWJkMGJlOWRjZDRk NmUzNTg1ZWY2ZS4uNWU0YWZiNjk3MTU0MjAyMzZkMjU5OGFkNDQwNTIxMDMwYmYzMWVlOSAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L3dhdGNobGlz dHBhcnNlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qv d2F0Y2hsaXN0cGFyc2VyLnB5CkBAIC01NywxMCArNTcsMTAgQEAgY2xhc3MgV2F0Y2hMaXN0UGFy c2VyKG9iamVjdCk6CiAgICAgICAgIH0KICAgICAgICAgc2VsZi5fZGVmaW5pdGlvbl9wYXR0ZXJu X3BhcnNlcnMgPSB7CiAgICAgICAgICAgICAnZmlsZW5hbWUnOiBGaWxlbmFtZVBhdHRlcm4sCi0g ICAgICAgICAgICAnaW5fYWRkZWRfbGluZXMnOiAobGFtYmRhIHJlZ2V4OiBDaGFuZ2VkTGluZVBh dHRlcm4ocmVnZXgsIDApKSwKLSAgICAgICAgICAgICdpbl9kZWxldGVkX2xpbmVzJzogKGxhbWJk YSByZWdleDogQ2hhbmdlZExpbmVQYXR0ZXJuKHJlZ2V4LCAxKSksCi0gICAgICAgICAgICAnbGVz cyc6IChsYW1iZGEgcmVnZXg6IEFtb3VudENoYW5nZWRQYXR0ZXJuKHJlZ2V4LCAxKSksCi0gICAg ICAgICAgICAnbW9yZSc6IChsYW1iZGEgcmVnZXg6IEFtb3VudENoYW5nZWRQYXR0ZXJuKHJlZ2V4 LCAwKSksCisgICAgICAgICAgICAnaW5fYWRkZWRfbGluZXMnOiAobGFtYmRhIGNvbXBpbGVkX3Jl Z2V4OiBDaGFuZ2VkTGluZVBhdHRlcm4oY29tcGlsZWRfcmVnZXgsIDApKSwKKyAgICAgICAgICAg ICdpbl9kZWxldGVkX2xpbmVzJzogKGxhbWJkYSBjb21waWxlZF9yZWdleDogQ2hhbmdlZExpbmVQ YXR0ZXJuKGNvbXBpbGVkX3JlZ2V4LCAxKSksCisgICAgICAgICAgICAnbGVzcyc6IChsYW1iZGEg Y29tcGlsZWRfcmVnZXg6IEFtb3VudENoYW5nZWRQYXR0ZXJuKGNvbXBpbGVkX3JlZ2V4LCAxKSks CisgICAgICAgICAgICAnbW9yZSc6IChsYW1iZGEgY29tcGlsZWRfcmVnZXg6IEFtb3VudENoYW5n ZWRQYXR0ZXJuKGNvbXBpbGVkX3JlZ2V4LCAwKSksCiAgICAgICAgIH0KIAogICAgIGRlZiBwYXJz ZShzZWxmLCB3YXRjaF9saXN0X2NvbnRlbnRzKToKQEAgLTEwOSw3ICsxMDksMTMgQEAgY2xhc3Mg V2F0Y2hMaXN0UGFyc2VyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAlIChwYXR0ZXJuX3R5cGUsIG5hbWUpKQogICAgICAgICAgICAgICAgICAgICBjb250aW51 ZQogCi0gICAgICAgICAgICAgICAgcGF0dGVybiA9IHBhdHRlcm5fcGFyc2VyKGRlZmluaXRpb25b cGF0dGVybl90eXBlXSkKKyAgICAgICAgICAgICAgICB0cnk6CisgICAgICAgICAgICAgICAgICAg IGNvbXBpbGVkX3JlZ2V4ID0gcmUuY29tcGlsZShkZWZpbml0aW9uW3BhdHRlcm5fdHlwZV0pCisg ICAgICAgICAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiwgZToKKyAgICAgICAgICAgICAgICAgICAg c2VsZi5fbG9nX2Vycm9yKCdUaGUgcmVnZXggIiVzIiBpcyBpbnZhbGlkIGR1ZSB0byAiJXMiLicg JSAoZGVmaW5pdGlvbltwYXR0ZXJuX3R5cGVdLCBzdHIoZSkpKQorICAgICAgICAgICAgICAgICAg ICBjb250aW51ZQorCisgICAgICAgICAgICAgICAgcGF0dGVybiA9IHBhdHRlcm5fcGFyc2VyKGNv bXBpbGVkX3JlZ2V4KQogICAgICAgICAgICAgICAgIGRlZmluaXRpb25zW25hbWVdLmFwcGVuZChw YXR0ZXJuKQogICAgICAgICAgICAgaWYgbm90IGRlZmluaXRpb25zW25hbWVdOgogICAgICAgICAg ICAgICAgIHNlbGYuX2xvZ19lcnJvcignVGhlIGRlZmluaXRpb24gIiVzIiBoYXMgbm8gcGF0dGVy bnMsIHNvIGl0IHNob3VsZCBiZSBkZWxldGVkLicgJSBuYW1lKQpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L3dhdGNobGlzdHBhcnNlcl91bml0dGVz dC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlzdC93YXRjaGxpc3Rw YXJzZXJfdW5pdHRlc3QucHkKaW5kZXggOTFhNDY3YTI1ZmNiNzAxZDkwNGJiZTZiNDI3YjE1ZWFi OWM5YWMyYy4uM2JkNGRjMmQ5NTcyM2M5NTM5M2IzNDVkYzA0M2ZkZDljZGYxMjZhNCAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L3dhdGNobGlzdHBh cnNlcl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRj aGxpc3Qvd2F0Y2hsaXN0cGFyc2VyX3VuaXR0ZXN0LnB5CkBAIC02Nyw2ICs2Nyw0MCBAQCBjbGFz cyBXYXRjaExpc3RQYXJzZXJUZXN0KHdlYmtpdHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAg T3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHNlbGYuX3dhdGNoX2xpc3RfcGFy c2VyLnBhcnNlLCBhcmdzPVt3YXRjaF9saXN0XSwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGV4cGVjdGVkX2xvZ3M9J0ludmFsaWQgY2hhcmFjdGVyICJ8IiBpbiBkZWZp bml0aW9uICJXYXRjaExpc3QxfEEiLlxuJykKIAorICAgIGRlZiB0ZXN0X2JhZF9maWxlbmFtZV9y ZWdleChzZWxmKToKKyAgICAgICAgd2F0Y2hfbGlzdCA9ICgKKyAgICAgICAgICAgICd7JworICAg ICAgICAgICAgJyAgICAiREVGSU5JVElPTlMiOiB7JworICAgICAgICAgICAgJyAgICAgICAgIldh dGNoTGlzdDEiOiB7JworICAgICAgICAgICAgJyAgICAgICAgICAgICJmaWxlbmFtZSI6IHIiKiIs JworICAgICAgICAgICAgJyAgICAgICAgICAgICJtb3JlIjogciJSZWZDb3VudGVkIiwnCisgICAg ICAgICAgICAnICAgICAgICB9LCcKKyAgICAgICAgICAgICcgICAgIH0sJworICAgICAgICAgICAg JyAgICAiQ0NfUlVMRVMiOiB7JworICAgICAgICAgICAgJyAgICAgICAgIldhdGNoTGlzdDEiOiBb ImxldmluQGNocm9taXVtLm9yZyJdLCcKKyAgICAgICAgICAgICcgICAgIH0sJworICAgICAgICAg ICAgJ30nKQorCisgICAgICAgIE91dHB1dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBz ZWxmLl93YXRjaF9saXN0X3BhcnNlci5wYXJzZSwgYXJncz1bd2F0Y2hfbGlzdF0sCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBleHBlY3RlZF9sb2dzPSdUaGUgcmVnZXgg IioiIGlzIGludmFsaWQgZHVlIHRvICJub3RoaW5nIHRvIHJlcGVhdCIuXG4nKQorCisgICAgZGVm IHRlc3RfYmFkX21vcmVfcmVnZXgoc2VsZik6CisgICAgICAgIHdhdGNoX2xpc3QgPSAoCisgICAg ICAgICAgICAneycKKyAgICAgICAgICAgICcgICAgIkRFRklOSVRJT05TIjogeycKKyAgICAgICAg ICAgICcgICAgICAgICJXYXRjaExpc3QxIjogeycKKyAgICAgICAgICAgICcgICAgICAgICAgICAi ZmlsZW5hbWUiOiByImFGaWxlTmFtZVxcLmNwcCIsJworICAgICAgICAgICAgJyAgICAgICAgICAg ICJtb3JlIjogciIqIiwnCisgICAgICAgICAgICAnICAgICAgICB9LCcKKyAgICAgICAgICAgICcg ICAgIH0sJworICAgICAgICAgICAgJyAgICAiQ0NfUlVMRVMiOiB7JworICAgICAgICAgICAgJyAg ICAgICAgIldhdGNoTGlzdDEiOiBbImxldmluQGNocm9taXVtLm9yZyJdLCcKKyAgICAgICAgICAg ICcgICAgIH0sJworICAgICAgICAgICAgJ30nKQorCisgICAgICAgIE91dHB1dENhcHR1cmUoKS5h c3NlcnRfb3V0cHV0cyhzZWxmLCBzZWxmLl93YXRjaF9saXN0X3BhcnNlci5wYXJzZSwgYXJncz1b d2F0Y2hfbGlzdF0sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBleHBl Y3RlZF9sb2dzPSdUaGUgcmVnZXggIioiIGlzIGludmFsaWQgZHVlIHRvICJub3RoaW5nIHRvIHJl cGVhdCIuXG4nKQorCiAgICAgZGVmIHRlc3RfYmFkX21hdGNoX3R5cGUoc2VsZik6CiAgICAgICAg IHdhdGNoX2xpc3QgPSAoCiAgICAgICAgICAgICAneycK