69481 2011-10-05 17:03:07 -0700 The GTK+ WebKit2 headers produce a lot of style warnings 2011-10-06 15:43:56 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mrobinson mrobinson abarth cgarcia dbates levin webkit.review.bot xan.lopez oldest_to_newest 478796 0 mrobinson 2011-10-05 17:03:07 -0700 We should be smarter about what warnings we emit for what files. 478803 1 109886 mrobinson 2011-10-05 17:17:57 -0700 Created attachment 109886 Patch 478999 2 cgarcia 2011-10-06 00:00:12 -0700 *** Bug 65179 has been marked as a duplicate of this bug. *** 479340 3 109886 mrobinson 2011-10-06 11:46:14 -0700 Comment on attachment 109886 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109886&action=review > Tools/Scripts/webkitpy/style/checker_unittest.py:317 > + # Check unskipped files This comment is missing a period. Assuming this pach is r+'d I will fix it before landing. 479373 4 109886 dbates 2011-10-06 12:11:38 -0700 Comment on attachment 109886 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109886&action=review > Tools/Scripts/webkitpy/style/checker.py:468 > + def _should_skip_file_path(self, file_path, skip_array_entry): Nit: The body of this function looks like it was indented too much. The indentation for the first if-statement should be four space characters. > Tools/Scripts/webkitpy/style/checker.py:469 > + if isinstance(skip_array_entry, re._pattern_type): Is there some other way we can accomplish instead of type checking or using non-public API (*)? (*) From my understanding of Python conventions, anything that begins with an underscore ('_') isn't part of the public API and hence its existence isn't guaranteed in future versions. >> Tools/Scripts/webkitpy/style/checker_unittest.py:317 >> + # Check unskipped files > > This comment is missing a period. Assuming this pach is r+'d I will fix it before landing. Nit: I think "non-skipped" better describes this than "unskipped". "Unskipped files" implies to me that we chose to skip these files at some point in time, but now we're reverting that decision. The phrase "non-skipped files" implies that these are files we always warned about (i.e. these were the files that we didn't skip). 479480 5 109886 levin 2011-10-06 14:21:52 -0700 Comment on attachment 109886 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109886&action=review Just one comment beyond what Daniel said (whose comments I agree with). Thanks Daniel! > Tools/Scripts/webkitpy/style/checker.py:285 > + re.compile('Source/WebKit2/UIProcess/API/gtk/WebKit(?!.*Private.h).*.h$'), Should be: re.compile(r'Source/WebKit2/UIProcess/API/gtk/WebKit(?!.*Private\.h).*\.h$'), 479527 6 110036 mrobinson 2011-10-06 14:58:32 -0700 Created attachment 110036 Patch 479534 7 110036 mrobinson 2011-10-06 15:04:14 -0700 Comment on attachment 110036 Patch Thank you both for the prompt and thorough reviews. 479570 8 110036 webkit.review.bot 2011-10-06 15:43:51 -0700 Comment on attachment 110036 Patch Clearing flags on attachment: 110036 Committed r96866: <http://trac.webkit.org/changeset/96866> 479571 9 webkit.review.bot 2011-10-06 15:43:56 -0700 All reviewed patches have been landed. Closing bug. 109886 2011-10-05 17:17:57 -0700 2011-10-06 14:58:29 -0700 Patch bug-69481-20111005171756.patch text/plain 8709 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogOTY3MTUKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwZGFlODc3NDRhOWM3YTc2NTY2NWViMGNlNTY1NWFkMmZk NzZiMTliLi4xMmRiNGY0ZTE2NjE1YTJhMGIyNTJmYzQ0NTllYzA2NGNjZjA4NTBhIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTEtMTAtMDUgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgor CisgICAgICAgIFRoZSBHVEsrIFdlYktpdDIgaGVhZGVycyBwcm9kdWNlIGEgbG90IG9mIHN0eWxl IHdhcm5pbmdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02OTQ4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFByZXZlbnQgZW1pdHRpbmcgc28gbWFueSBzdHlsZSB3YXJuaW5ncyBmb3IgR1RLKyBBUEkuIFdl IHNraXAgaGVhZGVyCisgICAgICAgIGZpbGVzIGluIHRoZSBXZWJLaXQyIEdUSysgQVBJIGRpcmVj dG9yeSBhbmQgYWxzbyBhdm9pZCB3YXJuaW5ncyBhYm91dAorICAgICAgICBpZGVudGlmaWVyIG5h bWVzIHRoYXQgYmVnaW4gd2l0aCAid2Via2l0XyIgaW4gZmlsZXMgdGhhdCBjb250YWluIHRoZQor ICAgICAgICBzdHJpbmcgImd0ayIuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXIucHk6IERvIG5vdCBjaGVjayBoZWFkZXIgZmlsZXMgaW4KKyAgICAgICAgU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsgdGhhdCBkbyBub3QgZW5kIGluIFByaXZhdGUuaC4g VGhpcyByZXF1aXJlZAorICAgICAgICBhZGRpbmcgdGhlIGFiaWxpdHkgdG8gc3BlY2lmeSBhIHJl Z3VsYXIgZXhwcmVzc2lvbiBpbiB0aGUgc2tpcCBsaXN0LiBSZW1vdmUKKyAgICAgICAgYSBmZXcg ZmlsZXMgZnJvbSB0aGUgc2tpcHBlZCBsaXN0IHRoYXQgbm8gbG9uZ2VyIGV4aXN0LgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcl91bml0dGVzdC5weTogQWRkZWQgYSB0 ZXN0IGZvciB0aGlzIGJlaGF2aW9yLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUv Y2hlY2tlcnMvY3BwLnB5OiBJZiBhIHBhdGggY29udGFpbnMgImd0ayIgZG9uJ3Qgd2FybgorICAg ICAgICBhYm91dCBpZGVudGlmaWVycyB0aGF0IGJlZ2luIHdpdGggIndlYmtpdF8iLgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5OiBBZGRl ZCBhIHRlc3QgZm9yIHRoaXMgYmVoYXZpb3IuCisKIDIwMTEtMTAtMDUgIEJhbGF6cyBLZWxlbWVu ICA8a2JhbGF6c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFtRdF1bV0syXSBVbnJldmlld2VkIGJ1 aWxkIGZpeC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tl ci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weQppbmRleCAwMWRj Y2FjN2QzNjFjZTU4NjZmMmNkYTk4MzU0MzlhZDU1NTBhNGU4Li43NWNiM2M3MDUyNTg2ZDkzYzZl ZmQxMmJjN2FkOGIzNGZkNzA3ZjA1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3N0eWxlL2NoZWNrZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVj a2VyLnB5CkBAIC0zMiw2ICszMiw3IEBACiAKIGltcG9ydCBsb2dnaW5nCiBpbXBvcnQgb3MucGF0 aAoraW1wb3J0IHJlCiBpbXBvcnQgc3lzCiAKIGZyb20gY2hlY2tlcnMuY29tbW9uIGltcG9ydCBj YXRlZ29yaWVzIGFzIENvbW1vbkNhdGVnb3JpZXMKQEAgLTI3NywxNSArMjc4LDEyIEBAIF9YTUxf RklMRV9FWFRFTlNJT05TID0gWwogIyBXZWJLaXQgbWFpbnRhaW5zIHNvbWUgZmlsZXMgaW4gTW96 aWxsYSBzdHlsZSBvbiBwdXJwb3NlIHRvIGVhc2UKICMgZnV0dXJlIG1lcmdlcy4KIF9TS0lQUEVE X0ZJTEVTX1dJVEhfV0FSTklORyA9IFsKLSAgICAiZ3RrMmRyYXdpbmcuYyIsICMgV2ViQ29yZS9w bGF0Zm9ybS9ndGsvZ3RrMmRyYXdpbmcuYwotICAgICJndGtkcmF3aW5nLmgiLCAjIFdlYkNvcmUv cGxhdGZvcm0vZ3RrL2d0a2RyYXdpbmcuaAogICAgICJTb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy8i LAotICAgICMgU291cCBBUEkgdGhhdCBpcyBzdGlsbCBiZWluZyBjb29rZWQsIHdpbGwgYmUgcmVt b3ZlZCBmcm9tIFdlYktpdAotICAgICMgaW4gYSBmZXcgbW9udGhzIHdoZW4gaXQgaXMgbWVyZ2Vk IGludG8gc291cCBwcm9wZXIuIFRoZSBzdHlsZQotICAgICMgZm9sbG93cyB0aGUgbGlic291cCBz dHlsZSBjb21wbGV0ZWx5LgotICAgICJTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3Nv dXAvY2FjaGUvIiwKLSAgICBdCi0KKyAgICAjIEFsbCBXZWJLaXQqLmggZmlsZXMgaW4gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGssCisgICAgIyBleGNlcHQgdGhvc2UgZW5kaW5nIGlu IC4uLlByaXZhdGUuaCBhcmUgR1RLKyBBUEkgaGVhZGVycywKKyAgICAjIHdoaWNoIGRpZmZlciBn cmVhdGx5IGZyb20gV2ViS2l0IGNvZGluZyBzdHlsZS4KKyAgICByZS5jb21waWxlKCdTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXQoPyEuKlByaXZhdGUuaCkuKi5oJCcpLAor ICAgICdTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay93ZWJraXQyLmgnXQogCiAjIEZp bGVzIHRvIHNraXAgdGhhdCBhcmUgbW9yZSBjb21tb24gb3Igb2J2aW91cy4KICMKQEAgLTQ2Nywx MCArNDY1LDE4IEBAIGNsYXNzIENoZWNrZXJEaXNwYXRjaGVyKG9iamVjdCk6CiAgICAgICAgICIi IlJldHVybiB0aGUgZmlsZSBleHRlbnNpb24gd2l0aG91dCB0aGUgbGVhZGluZyBkb3QuIiIiCiAg ICAgICAgIHJldHVybiBvcy5wYXRoLnNwbGl0ZXh0KGZpbGVfcGF0aClbMV0ubHN0cmlwKCIuIikK IAorICAgIGRlZiBfc2hvdWxkX3NraXBfZmlsZV9wYXRoKHNlbGYsIGZpbGVfcGF0aCwgc2tpcF9h cnJheV9lbnRyeSk6CisgICAgICAgICAgICBpZiBpc2luc3RhbmNlKHNraXBfYXJyYXlfZW50cnks IHJlLl9wYXR0ZXJuX3R5cGUpOgorICAgICAgICAgICAgICAgIGlmIHNraXBfYXJyYXlfZW50cnku bWF0Y2goZmlsZV9wYXRoKToKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFRydWUKKyAgICAg ICAgICAgIGVsaWYgZmlsZV9wYXRoLmZpbmQoc2tpcF9hcnJheV9lbnRyeSkgPj0gMDoKKyAgICAg ICAgICAgICAgICByZXR1cm4gVHJ1ZQorICAgICAgICAgICAgcmV0dXJuIEZhbHNlCisKICAgICBk ZWYgc2hvdWxkX3NraXBfd2l0aF93YXJuaW5nKHNlbGYsIGZpbGVfcGF0aCk6CiAgICAgICAgICIi IlJldHVybiB3aGV0aGVyIHRoZSBnaXZlbiBmaWxlIHNob3VsZCBiZSBza2lwcGVkIHdpdGggYSB3 YXJuaW5nLiIiIgogICAgICAgICBmb3Igc2tpcHBlZF9maWxlIGluIF9TS0lQUEVEX0ZJTEVTX1dJ VEhfV0FSTklORzoKLSAgICAgICAgICAgIGlmIGZpbGVfcGF0aC5maW5kKHNraXBwZWRfZmlsZSkg Pj0gMDoKKyAgICAgICAgICAgIGlmIHNlbGYuX3Nob3VsZF9za2lwX2ZpbGVfcGF0aChmaWxlX3Bh dGgsIHNraXBwZWRfZmlsZSk6CiAgICAgICAgICAgICAgICAgcmV0dXJuIFRydWUKICAgICAgICAg cmV0dXJuIEZhbHNlCiAKQEAgLTQ5Miw3ICs0OTgsNyBAQCBjbGFzcyBDaGVja2VyRGlzcGF0Y2hl cihvYmplY3QpOgogICAgICAgICBlbGlmIGJhc2VuYW1lID09ICd0ZXN0X2V4cGVjdGF0aW9ucy50 eHQnIG9yIGJhc2VuYW1lID09ICdkcnRfZXhwZWN0YXRpb25zLnR4dCc6CiAgICAgICAgICAgICBy ZXR1cm4gRmFsc2UKICAgICAgICAgZm9yIHNraXBwZWRfZmlsZSBpbiBfU0tJUFBFRF9GSUxFU19X SVRIT1VUX1dBUk5JTkc6Ci0gICAgICAgICAgICBpZiBmaWxlX3BhdGguZmluZChza2lwcGVkX2Zp bGUpID49IDA6CisgICAgICAgICAgICBpZiBzZWxmLl9zaG91bGRfc2tpcF9maWxlX3BhdGgoZmls ZV9wYXRoLCBza2lwcGVkX2ZpbGUpOgogICAgICAgICAgICAgICAgIHJldHVybiBUcnVlCiAgICAg ICAgIHJldHVybiBGYWxzZQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0 eWxlL2NoZWNrZXJfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2No ZWNrZXJfdW5pdHRlc3QucHkKaW5kZXggNDMxZGJiOGRiNmYzMzY4YjExNWRmMDRhNjE5YzhiNzI5 MmI4NjU5NS4uMDA5MWUxMWIwZTgwZWJkN2ZiZWE5NjVmOThjNjdmOTBjZWFkYmQ1NCAxMDA3NTUK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyX3VuaXR0ZXN0LnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcl91bml0dGVzdC5weQpAQCAt MzAyLDIyICszMDIsMzAgQEAgY2xhc3MgQ2hlY2tlckRpc3BhdGNoZXJTa2lwVGVzdCh1bml0dGVz dC5UZXN0Q2FzZSk6CiAKICAgICBkZWYgdGVzdF9zaG91bGRfc2tpcF93aXRoX3dhcm5pbmcoc2Vs Zik6CiAgICAgICAgICIiIlRlc3Qgc2hvdWxkX3NraXBfd2l0aF93YXJuaW5nKCkuIiIiCi0gICAg ICAgICMgQ2hlY2sgYSBub24tc2tpcHBlZCBmaWxlLgotICAgICAgICBzZWxmLmFzc2VydEZhbHNl KHNlbGYuX2Rpc3BhdGNoZXIuc2hvdWxkX3NraXBfd2l0aF93YXJuaW5nKCJmb28udHh0IikpCi0K ICAgICAgICAgIyBDaGVjayBza2lwcGVkIGZpbGVzLgogICAgICAgICBwYXRoc190b19za2lwID0g WwotICAgICAgICAgICAiZ3RrMmRyYXdpbmcuYyIsCi0gICAgICAgICAgICJndGtkcmF3aW5nLmgi LAotICAgICAgICAgICAiU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL2d0azJkcmF3aW5nLmMi LAotICAgICAgICAgICAiU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL2d0a2RyYXdpbmcuaCIs CiAgICAgICAgICAgICJTb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0YXRrLmMiLAorICAgICAg ICAgICAiU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvd2Via2l0Mi5oIiwKKyAgICAg ICAgICAgIlNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuaCIs CisgICAgICAgICAgICJTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRMb2Fk ZXIuaCIsCiAgICAgICAgICAgICBdCiAKICAgICAgICAgZm9yIHBhdGggaW4gcGF0aHNfdG9fc2tp cDoKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShzZWxmLl9kaXNwYXRjaGVyLnNob3VsZF9z a2lwX3dpdGhfd2FybmluZyhwYXRoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiQ2hl Y2tpbmc6ICIgKyBwYXRoKQogCisgICAgICAgICMgQ2hlY2sgdW5za2lwcGVkIGZpbGVzCisgICAg ICAgIHBhdGhzX25vdF90b19za2lwID0gWworICAgICAgICAgICAiZm9vLnR4dCIsCisgICAgICAg ICAgICJTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9IZWxwZXJDbGFzcy5jcHAiLAor ICAgICAgICAgICAiU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvSGVscGVyQ2xhc3Mu aCIsCisgICAgICAgICAgICJTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRX ZWJWaWV3LmNwcCIsCisgICAgICAgICAgICJTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRXZWJWaWV3UHJpdmF0ZS5oIiwKKyAgICAgICAgICAgIF0KKworICAgICAgICBmb3Ig cGF0aCBpbiBwYXRoc19ub3RfdG9fc2tpcDoKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2Uo c2VsZi5fZGlzcGF0Y2hlci5zaG91bGRfc2tpcF93aXRoX3dhcm5pbmcocGF0aCkpCisKICAgICBk ZWYgX2Fzc2VydF9zaG91bGRfc2tpcF93aXRob3V0X3dhcm5pbmcoc2VsZiwgcGF0aCwgaXNfY2hl Y2tlcl9ub25lLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBl eHBlY3RlZCk6CiAgICAgICAgICMgQ2hlY2sgdGhlIGZpbGUgdHlwZSBiZWZvcmUgYXNzZXJ0aW5n IHRoZSByZXR1cm4gdmFsdWUuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0 eWxlL2NoZWNrZXJzL2NwcC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tl cnMvY3BwLnB5CmluZGV4IDUyZmZhZTM2NTkwZTkyMzJiNTcyOGE5ZGU0OTg4OWMyNzU4NzhjM2Mu Ljk2ZjllM2IzMGM3ZGZlNWNmODM0YjYxOWI2ZWZjYTU4NjU2NWI0OWIgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CkBAIC0zMDU2LDYgKzMwNTYsNyBA QCBkZWYgY2hlY2tfaWRlbnRpZmllcl9uYW1lX2luX2RlY2xhcmF0aW9uKGZpbGVuYW1lLCBsaW5l X251bWJlciwgbGluZSwgZmlsZV9zdGF0ZQogICAgICAgICBpZiBub3QgZmlsZV9zdGF0ZS5pc19v YmplY3RpdmVfYygpIGFuZCBtb2RpZmllZF9pZGVudGlmaWVyLmZpbmQoJ18nKSA+PSAwOgogICAg ICAgICAgICAgIyBWYXJpb3VzIGV4Y2VwdGlvbnMgdG8gdGhlIHJ1bGU6IEphdmFTY3JpcHQgb3Ag Y29kZXMgZnVuY3Rpb25zLCBjb25zdF9pdGVyYXRvci4KICAgICAgICAgICAgIGlmIChub3QgKGZp bGVuYW1lLmZpbmQoJ0phdmFTY3JpcHRDb3JlJykgPj0gMCBhbmQgbW9kaWZpZWRfaWRlbnRpZmll ci5maW5kKCdvcF8nKSA+PSAwKQorICAgICAgICAgICAgICAgIGFuZCBub3QgKGZpbGVuYW1lLmZp bmQoJ2d0aycpID49IDAgYW5kIG1vZGlmaWVkX2lkZW50aWZpZXIuc3RhcnRzd2l0aCgnd2Via2l0 XycpID49IDApCiAgICAgICAgICAgICAgICAgYW5kIG5vdCBtb2RpZmllZF9pZGVudGlmaWVyLnN0 YXJ0c3dpdGgoJ3RzdF8nKQogICAgICAgICAgICAgICAgIGFuZCBub3QgbW9kaWZpZWRfaWRlbnRp Zmllci5zdGFydHN3aXRoKCd3ZWJraXRfZG9tX29iamVjdF8nKQogICAgICAgICAgICAgICAgIGFu ZCBub3QgbW9kaWZpZWRfaWRlbnRpZmllci5zdGFydHN3aXRoKCdOUE5fJykKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHBfdW5pdHRlc3QucHkKaW5k ZXggMzdlYWIzMzYzYWEwMWYxYjUzMjIwYjcyYzJjYjUyOGIzZmIyZGZhNy4uNGMyMjY5M2RhZGM5 NzAxYmRhMzJkODMyYjI0YTQ1NzNlZjY3MWQ4ZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHBfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHBfdW5pdHRlc3QucHkKQEAgLTQzOTksNiArNDM5 OSwxOSBAQCBjbGFzcyBXZWJLaXRTdHlsZVRlc3QoQ3BwU3R5bGVUZXN0QmFzZSk6CiAgICAgICAg IHNlbGYuYXNzZXJ0X2xpbnQoJ3ZvaWQgd2Via2l0X2RvbV9vYmplY3RfaW5pdCgpOycsICcnKQog ICAgICAgICBzZWxmLmFzc2VydF9saW50KCd2b2lkIHdlYmtpdF9kb21fb2JqZWN0X2NsYXNzX2lu aXQoKTsnLCAnJykKIAorICAgICAgICAjIFRoZXJlIGlzIGFuIGV4Y2VwdGlvbiBmb3IgR1RLKyBB UEkuCisgICAgICAgIHNlbGYuYXNzZXJ0X2xpbnQoJ3ZvaWQgd2Via2l0X3dlYl92aWV3X2xvYWQo aW50IHZhcjEsIGludCB2YXIyKScsICcnLCAnU291cmNlL1dlYmtpdC9ndGsvd2Via2l0L2Zvby5j cHAnKQorICAgICAgICBzZWxmLmFzc2VydF9saW50KCd2b2lkIHdlYmtpdF93ZWJfdmlld19sb2Fk KGludCB2YXIxLCBpbnQgdmFyMiknLCAnJywgJ1NvdXJjZS9XZWJraXQyL1VJUHJvY2Vzcy9ndGsv Zm9vLmNwcCcpCisKKyAgICAgICAgIyBUZXN0IHRoYXQgdGhpcyBkb2Vzbid0IGFsc28gYXBwbHkg dG8gZmlsZXMgbm90IGluIGEgJ2d0aycgZGlyZWN0b3J5LgorICAgICAgICBzZWxmLmFzc2VydF9s aW50KCd2b2lkIHdlYmtpdF93ZWJfdmlld19sb2FkKGludCB2YXIxLCBpbnQgdmFyMiknLAorICAg ICAgICAgICAgJ3dlYmtpdF93ZWJfdmlld19sb2FkIGlzIGluY29ycmVjdGx5IG5hbWVkLiBEb25c J3QgdXNlIHVuZGVyc2NvcmVzIGluIHlvdXIgaWRlbnRpZmllciBuYW1lcy4nCisgICAgICAgICAg ICAnICBbcmVhZGFiaWxpdHkvbmFtaW5nXSBbNF0nLCAnU291cmNlL1dlYmtpdC8vd2Via2l0L2Zv by5jcHAnKQorICAgICAgICAjIFRlc3QgdGhhdCB0aGlzIGRvZXNuJ3QgYWxzbyBhcHBseSB0byBu YW1lcyB0aGF0IGRvbid0IHN0YXJ0IHdpdGggJ3dlYmtpdF8nLgorICAgICAgICBzZWxmLmFzc2Vy dF9saW50X29uZV9vZl9tYW55X2Vycm9yc19yZSgndm9pZCBvdGhlcmtpdF93ZWJfdmlld19sb2Fk KGludCB2YXIxLCBpbnQgdmFyMiknLAorICAgICAgICAgICAgJ290aGVya2l0X3dlYl92aWV3X2xv YWQgaXMgaW5jb3JyZWN0bHkgbmFtZWQuIERvblwndCB1c2UgdW5kZXJzY29yZXMgaW4geW91ciBp ZGVudGlmaWVyIG5hbWVzLicKKyAgICAgICAgICAgICcgIFtyZWFkYWJpbGl0eS9uYW1pbmddIFs0 XScsICdTb3VyY2UvV2Via2l0L2d0ay93ZWJraXQvZm9vLmNwcCcpCisKICAgICAgICAgIyBUaGVy ZSBpcyBhbiBleGNlcHRpb24gZm9yIHNvbWUgdW5pdCB0ZXN0cyB0aGF0IGJlZ2luIHdpdGggInRz dF8iLgogICAgICAgICBzZWxmLmFzc2VydF9saW50KCd2b2lkIHRzdF9RV2ViRnJhbWU6OmFycmF5 T2JqZWN0RW51bWVyYWJsZShpbnQgdmFyMSwgaW50IHZhcjIpJywgJycpCiAK 110036 2011-10-06 14:58:32 -0700 2011-10-06 15:43:51 -0700 Patch bug-69481-20111006145831.patch text/plain 8692 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogOTY3MTUKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwZGFlODc3NDRhOWM3YTc2NTY2NWViMGNlNTY1NWFkMmZk NzZiMTliLi4xMmRiNGY0ZTE2NjE1YTJhMGIyNTJmYzQ0NTllYzA2NGNjZjA4NTBhIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTEtMTAtMDUgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgor CisgICAgICAgIFRoZSBHVEsrIFdlYktpdDIgaGVhZGVycyBwcm9kdWNlIGEgbG90IG9mIHN0eWxl IHdhcm5pbmdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02OTQ4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFByZXZlbnQgZW1pdHRpbmcgc28gbWFueSBzdHlsZSB3YXJuaW5ncyBmb3IgR1RLKyBBUEkuIFdl IHNraXAgaGVhZGVyCisgICAgICAgIGZpbGVzIGluIHRoZSBXZWJLaXQyIEdUSysgQVBJIGRpcmVj dG9yeSBhbmQgYWxzbyBhdm9pZCB3YXJuaW5ncyBhYm91dAorICAgICAgICBpZGVudGlmaWVyIG5h bWVzIHRoYXQgYmVnaW4gd2l0aCAid2Via2l0XyIgaW4gZmlsZXMgdGhhdCBjb250YWluIHRoZQor ICAgICAgICBzdHJpbmcgImd0ayIuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxl L2NoZWNrZXIucHk6IERvIG5vdCBjaGVjayBoZWFkZXIgZmlsZXMgaW4KKyAgICAgICAgU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsgdGhhdCBkbyBub3QgZW5kIGluIFByaXZhdGUuaC4g VGhpcyByZXF1aXJlZAorICAgICAgICBhZGRpbmcgdGhlIGFiaWxpdHkgdG8gc3BlY2lmeSBhIHJl Z3VsYXIgZXhwcmVzc2lvbiBpbiB0aGUgc2tpcCBsaXN0LiBSZW1vdmUKKyAgICAgICAgYSBmZXcg ZmlsZXMgZnJvbSB0aGUgc2tpcHBlZCBsaXN0IHRoYXQgbm8gbG9uZ2VyIGV4aXN0LgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcl91bml0dGVzdC5weTogQWRkZWQgYSB0 ZXN0IGZvciB0aGlzIGJlaGF2aW9yLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUv Y2hlY2tlcnMvY3BwLnB5OiBJZiBhIHBhdGggY29udGFpbnMgImd0ayIgZG9uJ3Qgd2FybgorICAg ICAgICBhYm91dCBpZGVudGlmaWVycyB0aGF0IGJlZ2luIHdpdGggIndlYmtpdF8iLgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5OiBBZGRl ZCBhIHRlc3QgZm9yIHRoaXMgYmVoYXZpb3IuCisKIDIwMTEtMTAtMDUgIEJhbGF6cyBLZWxlbWVu ICA8a2JhbGF6c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFtRdF1bV0syXSBVbnJldmlld2VkIGJ1 aWxkIGZpeC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tl ci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weQppbmRleCAwMWRj Y2FjN2QzNjFjZTU4NjZmMmNkYTk4MzU0MzlhZDU1NTBhNGU4Li43YjhmZGQ0MTU2Y2Q1YjdmYzEy ZjQzOTFiYzZhM2I1NDE1MjhiYmU5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3N0eWxlL2NoZWNrZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVj a2VyLnB5CkBAIC0zMiw2ICszMiw3IEBACiAKIGltcG9ydCBsb2dnaW5nCiBpbXBvcnQgb3MucGF0 aAoraW1wb3J0IHJlCiBpbXBvcnQgc3lzCiAKIGZyb20gY2hlY2tlcnMuY29tbW9uIGltcG9ydCBj YXRlZ29yaWVzIGFzIENvbW1vbkNhdGVnb3JpZXMKQEAgLTI3NywxNSArMjc4LDEyIEBAIF9YTUxf RklMRV9FWFRFTlNJT05TID0gWwogIyBXZWJLaXQgbWFpbnRhaW5zIHNvbWUgZmlsZXMgaW4gTW96 aWxsYSBzdHlsZSBvbiBwdXJwb3NlIHRvIGVhc2UKICMgZnV0dXJlIG1lcmdlcy4KIF9TS0lQUEVE X0ZJTEVTX1dJVEhfV0FSTklORyA9IFsKLSAgICAiZ3RrMmRyYXdpbmcuYyIsICMgV2ViQ29yZS9w bGF0Zm9ybS9ndGsvZ3RrMmRyYXdpbmcuYwotICAgICJndGtkcmF3aW5nLmgiLCAjIFdlYkNvcmUv cGxhdGZvcm0vZ3RrL2d0a2RyYXdpbmcuaAogICAgICJTb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy8i LAotICAgICMgU291cCBBUEkgdGhhdCBpcyBzdGlsbCBiZWluZyBjb29rZWQsIHdpbGwgYmUgcmVt b3ZlZCBmcm9tIFdlYktpdAotICAgICMgaW4gYSBmZXcgbW9udGhzIHdoZW4gaXQgaXMgbWVyZ2Vk IGludG8gc291cCBwcm9wZXIuIFRoZSBzdHlsZQotICAgICMgZm9sbG93cyB0aGUgbGlic291cCBz dHlsZSBjb21wbGV0ZWx5LgotICAgICJTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3Nv dXAvY2FjaGUvIiwKLSAgICBdCi0KKyAgICAjIEFsbCBXZWJLaXQqLmggZmlsZXMgaW4gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGssCisgICAgIyBleGNlcHQgdGhvc2UgZW5kaW5nIGlu IC4uLlByaXZhdGUuaCBhcmUgR1RLKyBBUEkgaGVhZGVycywKKyAgICAjIHdoaWNoIGRpZmZlciBn cmVhdGx5IGZyb20gV2ViS2l0IGNvZGluZyBzdHlsZS4KKyAgICByZS5jb21waWxlKHInU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0KD8hLipQcml2YXRlXC5oKS4qXC5oJCcp LAorICAgICdTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay93ZWJraXQyLmgnXQogCiAj IEZpbGVzIHRvIHNraXAgdGhhdCBhcmUgbW9yZSBjb21tb24gb3Igb2J2aW91cy4KICMKQEAgLTQ2 NywxMCArNDY1LDE4IEBAIGNsYXNzIENoZWNrZXJEaXNwYXRjaGVyKG9iamVjdCk6CiAgICAgICAg ICIiIlJldHVybiB0aGUgZmlsZSBleHRlbnNpb24gd2l0aG91dCB0aGUgbGVhZGluZyBkb3QuIiIi CiAgICAgICAgIHJldHVybiBvcy5wYXRoLnNwbGl0ZXh0KGZpbGVfcGF0aClbMV0ubHN0cmlwKCIu IikKIAorICAgIGRlZiBfc2hvdWxkX3NraXBfZmlsZV9wYXRoKHNlbGYsIGZpbGVfcGF0aCwgc2tp cF9hcnJheV9lbnRyeSk6CisgICAgICAgIGlmIGlzaW5zdGFuY2Uoc2tpcF9hcnJheV9lbnRyeSwg c3RyKToKKyAgICAgICAgICAgIGlmIGZpbGVfcGF0aC5maW5kKHNraXBfYXJyYXlfZW50cnkpID49 IDA6CisgICAgICAgICAgICAgICAgcmV0dXJuIFRydWUKKyAgICAgICAgZWxpZiBza2lwX2FycmF5 X2VudHJ5Lm1hdGNoKGZpbGVfcGF0aCk6CisgICAgICAgICAgICAgICAgcmV0dXJuIFRydWUKKyAg ICAgICAgcmV0dXJuIEZhbHNlCisKICAgICBkZWYgc2hvdWxkX3NraXBfd2l0aF93YXJuaW5nKHNl bGYsIGZpbGVfcGF0aCk6CiAgICAgICAgICIiIlJldHVybiB3aGV0aGVyIHRoZSBnaXZlbiBmaWxl IHNob3VsZCBiZSBza2lwcGVkIHdpdGggYSB3YXJuaW5nLiIiIgogICAgICAgICBmb3Igc2tpcHBl ZF9maWxlIGluIF9TS0lQUEVEX0ZJTEVTX1dJVEhfV0FSTklORzoKLSAgICAgICAgICAgIGlmIGZp bGVfcGF0aC5maW5kKHNraXBwZWRfZmlsZSkgPj0gMDoKKyAgICAgICAgICAgIGlmIHNlbGYuX3No b3VsZF9za2lwX2ZpbGVfcGF0aChmaWxlX3BhdGgsIHNraXBwZWRfZmlsZSk6CiAgICAgICAgICAg ICAgICAgcmV0dXJuIFRydWUKICAgICAgICAgcmV0dXJuIEZhbHNlCiAKQEAgLTQ5Miw3ICs0OTgs NyBAQCBjbGFzcyBDaGVja2VyRGlzcGF0Y2hlcihvYmplY3QpOgogICAgICAgICBlbGlmIGJhc2Vu YW1lID09ICd0ZXN0X2V4cGVjdGF0aW9ucy50eHQnIG9yIGJhc2VuYW1lID09ICdkcnRfZXhwZWN0 YXRpb25zLnR4dCc6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKICAgICAgICAgZm9yIHNraXBw ZWRfZmlsZSBpbiBfU0tJUFBFRF9GSUxFU19XSVRIT1VUX1dBUk5JTkc6Ci0gICAgICAgICAgICBp ZiBmaWxlX3BhdGguZmluZChza2lwcGVkX2ZpbGUpID49IDA6CisgICAgICAgICAgICBpZiBzZWxm Ll9zaG91bGRfc2tpcF9maWxlX3BhdGgoZmlsZV9wYXRoLCBza2lwcGVkX2ZpbGUpOgogICAgICAg ICAgICAgICAgIHJldHVybiBUcnVlCiAgICAgICAgIHJldHVybiBGYWxzZQogCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJfdW5pdHRlc3QucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJfdW5pdHRlc3QucHkKaW5kZXggNDMxZGJi OGRiNmYzMzY4YjExNWRmMDRhNjE5YzhiNzI5MmI4NjU5NS4uNzc2YjIxNzcyYzU4ZDA4NWM5OTM5 OWQwYTAzMTA4OWU3MWY0YTc1OSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9z dHlsZS9jaGVja2VyX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5 bGUvY2hlY2tlcl91bml0dGVzdC5weQpAQCAtMzAyLDIyICszMDIsMzAgQEAgY2xhc3MgQ2hlY2tl ckRpc3BhdGNoZXJTa2lwVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAKICAgICBkZWYgdGVzdF9z aG91bGRfc2tpcF93aXRoX3dhcm5pbmcoc2VsZik6CiAgICAgICAgICIiIlRlc3Qgc2hvdWxkX3Nr aXBfd2l0aF93YXJuaW5nKCkuIiIiCi0gICAgICAgICMgQ2hlY2sgYSBub24tc2tpcHBlZCBmaWxl LgotICAgICAgICBzZWxmLmFzc2VydEZhbHNlKHNlbGYuX2Rpc3BhdGNoZXIuc2hvdWxkX3NraXBf d2l0aF93YXJuaW5nKCJmb28udHh0IikpCi0KICAgICAgICAgIyBDaGVjayBza2lwcGVkIGZpbGVz LgogICAgICAgICBwYXRoc190b19za2lwID0gWwotICAgICAgICAgICAiZ3RrMmRyYXdpbmcuYyIs Ci0gICAgICAgICAgICJndGtkcmF3aW5nLmgiLAotICAgICAgICAgICAiU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3RrL2d0azJkcmF3aW5nLmMiLAotICAgICAgICAgICAiU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3RrL2d0a2RyYXdpbmcuaCIsCiAgICAgICAgICAgICJTb3VyY2UvV2ViS2l0L2d0 ay90ZXN0cy90ZXN0YXRrLmMiLAorICAgICAgICAgICAiU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvd2Via2l0Mi5oIiwKKyAgICAgICAgICAgIlNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuaCIsCisgICAgICAgICAgICJTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRMb2FkZXIuaCIsCiAgICAgICAgICAgICBdCiAKICAgICAg ICAgZm9yIHBhdGggaW4gcGF0aHNfdG9fc2tpcDoKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1 ZShzZWxmLl9kaXNwYXRjaGVyLnNob3VsZF9za2lwX3dpdGhfd2FybmluZyhwYXRoKSwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAiQ2hlY2tpbmc6ICIgKyBwYXRoKQogCisgICAgICAgICMg VmVyaWZ5IHRoYXQgc29tZSBmaWxlcyBhcmUgbm90IHNraXBwZWQuCisgICAgICAgIHBhdGhzX25v dF90b19za2lwID0gWworICAgICAgICAgICAiZm9vLnR4dCIsCisgICAgICAgICAgICJTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9IZWxwZXJDbGFzcy5jcHAiLAorICAgICAgICAgICAi U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvSGVscGVyQ2xhc3MuaCIsCisgICAgICAg ICAgICJTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcCIs CisgICAgICAgICAgICJTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJW aWV3UHJpdmF0ZS5oIiwKKyAgICAgICAgICAgIF0KKworICAgICAgICBmb3IgcGF0aCBpbiBwYXRo c19ub3RfdG9fc2tpcDoKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2Uoc2VsZi5fZGlzcGF0 Y2hlci5zaG91bGRfc2tpcF93aXRoX3dhcm5pbmcocGF0aCkpCisKICAgICBkZWYgX2Fzc2VydF9z aG91bGRfc2tpcF93aXRob3V0X3dhcm5pbmcoc2VsZiwgcGF0aCwgaXNfY2hlY2tlcl9ub25lLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBleHBlY3RlZCk6CiAg ICAgICAgICMgQ2hlY2sgdGhlIGZpbGUgdHlwZSBiZWZvcmUgYXNzZXJ0aW5nIHRoZSByZXR1cm4g dmFsdWUuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJz L2NwcC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5Cmlu ZGV4IDUyZmZhZTM2NTkwZTkyMzJiNTcyOGE5ZGU0OTg4OWMyNzU4NzhjM2MuLjk2ZjllM2IzMGM3 ZGZlNWNmODM0YjYxOWI2ZWZjYTU4NjU2NWI0OWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CkBAIC0zMDU2LDYgKzMwNTYsNyBAQCBkZWYgY2hlY2tf aWRlbnRpZmllcl9uYW1lX2luX2RlY2xhcmF0aW9uKGZpbGVuYW1lLCBsaW5lX251bWJlciwgbGlu ZSwgZmlsZV9zdGF0ZQogICAgICAgICBpZiBub3QgZmlsZV9zdGF0ZS5pc19vYmplY3RpdmVfYygp IGFuZCBtb2RpZmllZF9pZGVudGlmaWVyLmZpbmQoJ18nKSA+PSAwOgogICAgICAgICAgICAgIyBW YXJpb3VzIGV4Y2VwdGlvbnMgdG8gdGhlIHJ1bGU6IEphdmFTY3JpcHQgb3AgY29kZXMgZnVuY3Rp b25zLCBjb25zdF9pdGVyYXRvci4KICAgICAgICAgICAgIGlmIChub3QgKGZpbGVuYW1lLmZpbmQo J0phdmFTY3JpcHRDb3JlJykgPj0gMCBhbmQgbW9kaWZpZWRfaWRlbnRpZmllci5maW5kKCdvcF8n KSA+PSAwKQorICAgICAgICAgICAgICAgIGFuZCBub3QgKGZpbGVuYW1lLmZpbmQoJ2d0aycpID49 IDAgYW5kIG1vZGlmaWVkX2lkZW50aWZpZXIuc3RhcnRzd2l0aCgnd2Via2l0XycpID49IDApCiAg ICAgICAgICAgICAgICAgYW5kIG5vdCBtb2RpZmllZF9pZGVudGlmaWVyLnN0YXJ0c3dpdGgoJ3Rz dF8nKQogICAgICAgICAgICAgICAgIGFuZCBub3QgbW9kaWZpZWRfaWRlbnRpZmllci5zdGFydHN3 aXRoKCd3ZWJraXRfZG9tX29iamVjdF8nKQogICAgICAgICAgICAgICAgIGFuZCBub3QgbW9kaWZp ZWRfaWRlbnRpZmllci5zdGFydHN3aXRoKCdOUE5fJykKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHBfdW5pdHRlc3QucHkKaW5kZXggMzdlYWIzMzYz YWEwMWYxYjUzMjIwYjcyYzJjYjUyOGIzZmIyZGZhNy4uZDE1OGMyNmE2MGNkOTA5MTI4NDk4Yjk1 NDkzMWRlMTk5MDY2YzE5NCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHls ZS9jaGVja2Vycy9jcHBfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9z dHlsZS9jaGVja2Vycy9jcHBfdW5pdHRlc3QucHkKQEAgLTQzOTksNiArNDM5OSwxOSBAQCBjbGFz cyBXZWJLaXRTdHlsZVRlc3QoQ3BwU3R5bGVUZXN0QmFzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0 X2xpbnQoJ3ZvaWQgd2Via2l0X2RvbV9vYmplY3RfaW5pdCgpOycsICcnKQogICAgICAgICBzZWxm LmFzc2VydF9saW50KCd2b2lkIHdlYmtpdF9kb21fb2JqZWN0X2NsYXNzX2luaXQoKTsnLCAnJykK IAorICAgICAgICAjIFRoZXJlIGlzIGFuIGV4Y2VwdGlvbiBmb3IgR1RLKyBBUEkuCisgICAgICAg IHNlbGYuYXNzZXJ0X2xpbnQoJ3ZvaWQgd2Via2l0X3dlYl92aWV3X2xvYWQoaW50IHZhcjEsIGlu dCB2YXIyKScsICcnLCAnU291cmNlL1dlYmtpdC9ndGsvd2Via2l0L2Zvby5jcHAnKQorICAgICAg ICBzZWxmLmFzc2VydF9saW50KCd2b2lkIHdlYmtpdF93ZWJfdmlld19sb2FkKGludCB2YXIxLCBp bnQgdmFyMiknLCAnJywgJ1NvdXJjZS9XZWJraXQyL1VJUHJvY2Vzcy9ndGsvZm9vLmNwcCcpCisK KyAgICAgICAgIyBUZXN0IHRoYXQgdGhpcyBkb2Vzbid0IGFsc28gYXBwbHkgdG8gZmlsZXMgbm90 IGluIGEgJ2d0aycgZGlyZWN0b3J5LgorICAgICAgICBzZWxmLmFzc2VydF9saW50KCd2b2lkIHdl YmtpdF93ZWJfdmlld19sb2FkKGludCB2YXIxLCBpbnQgdmFyMiknLAorICAgICAgICAgICAgJ3dl YmtpdF93ZWJfdmlld19sb2FkIGlzIGluY29ycmVjdGx5IG5hbWVkLiBEb25cJ3QgdXNlIHVuZGVy c2NvcmVzIGluIHlvdXIgaWRlbnRpZmllciBuYW1lcy4nCisgICAgICAgICAgICAnICBbcmVhZGFi aWxpdHkvbmFtaW5nXSBbNF0nLCAnU291cmNlL1dlYmtpdC93ZWJraXQvZm9vLmNwcCcpCisgICAg ICAgICMgVGVzdCB0aGF0IHRoaXMgZG9lc24ndCBhbHNvIGFwcGx5IHRvIG5hbWVzIHRoYXQgZG9u J3Qgc3RhcnQgd2l0aCAnd2Via2l0XycuCisgICAgICAgIHNlbGYuYXNzZXJ0X2xpbnRfb25lX29m X21hbnlfZXJyb3JzX3JlKCd2b2lkIG90aGVya2l0X3dlYl92aWV3X2xvYWQoaW50IHZhcjEsIGlu dCB2YXIyKScsCisgICAgICAgICAgICAnb3RoZXJraXRfd2ViX3ZpZXdfbG9hZCBpcyBpbmNvcnJl Y3RseSBuYW1lZC4gRG9uXCd0IHVzZSB1bmRlcnNjb3JlcyBpbiB5b3VyIGlkZW50aWZpZXIgbmFt ZXMuJworICAgICAgICAgICAgJyAgW3JlYWRhYmlsaXR5L25hbWluZ10gWzRdJywgJ1NvdXJjZS9X ZWJraXQvd2Via2l0L2Zvby5jcHAnKQorCiAgICAgICAgICMgVGhlcmUgaXMgYW4gZXhjZXB0aW9u IGZvciBzb21lIHVuaXQgdGVzdHMgdGhhdCBiZWdpbiB3aXRoICJ0c3RfIi4KICAgICAgICAgc2Vs Zi5hc3NlcnRfbGludCgndm9pZCB0c3RfUVdlYkZyYW1lOjphcnJheU9iamVjdEVudW1lcmFibGUo aW50IHZhcjEsIGludCB2YXIyKScsICcnKQogCg==