205196 2019-12-12 21:37:08 -0800 Prefix CSS selectors with all applicable CSS groupings when generating a ChangeLog 2019-12-13 18:55:54 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue dbates ews-watchlist hi jbedard joepeck webkit-bug-importer oldest_to_newest 1598247 0 hi 2019-12-12 21:37:08 -0800 When modifying a style inside a @media grouping, `prepare-ChangeLog` currently adds the media query as a separate line instead of prefixing the modified rule's selector. e.g., modifying ``` @media (prefers-color-scheme: dark) { body { ... } div { ... } } ``` would generate ``` (@media (prefers-color-scheme: dark)): (body): (div): ``` instead of ``` (@media (prefers-color-scheme: dark) body): (@media (prefers-color-scheme: dark) div): ``` 1598248 1 385574 hi 2019-12-12 21:37:26 -0800 Created attachment 385574 Patch 1598249 2 385575 hi 2019-12-12 21:41:46 -0800 Created attachment 385575 Patch Oops. Forgot bug number :P 1598271 3 385575 joepeck 2019-12-12 23:08:13 -0800 Comment on attachment 385575 Patch This also needs tests. See Tools/Scripts/webkitperl/prepare-ChangeLog_unittest 1598272 4 joepeck 2019-12-12 23:09:15 -0800 > would generate > ``` > (@media (prefers-color-scheme: dark)): > (body): > (div): > ``` > instead of > ``` > (@media (prefers-color-scheme: dark) body): > (@media (prefers-color-scheme: dark) div): > ``` Awesome!! 1598294 5 385589 hi 2019-12-13 02:30:35 -0800 Created attachment 385589 Patch 1598353 6 385589 commit-queue 2019-12-13 08:43:05 -0800 Comment on attachment 385589 Patch Clearing flags on attachment: 385589 Committed r253478: <https://trac.webkit.org/changeset/253478> 1598354 7 commit-queue 2019-12-13 08:43:06 -0800 All reviewed patches have been landed. Closing bug. 1598357 8 webkit-bug-importer 2019-12-13 08:44:25 -0800 <rdar://problem/57913269> 1598590 9 385589 joepeck 2019-12-13 18:55:54 -0800 Comment on attachment 385589 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=385589&action=review > Tools/Scripts/prepare-ChangeLog:1906 > + $groupingPrefix .= " " Normally perl requires a semicolon. This happens to be the last statement of a block so it isn't required but it would be good to have. 385574 2019-12-12 21:37:26 -0800 2019-12-12 21:41:46 -0800 Patch 205196.diff text/plain 2652 hi ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4ODU4 NzQ2YmIwNy4uYmI2YTI5Y2ExNWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxOS0xMi0xMiAgRGV2aW4gUm91c3Nv ICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgUHJlZml4IENTUyBzZWxlY3RvcnMgd2l0 aCBhbGwgYXBwbGljYWJsZSBDU1MgZ3JvdXBpbmdzIHdoZW4gZ2VuZXJhdGluZyBhIENoYW5nZUxv ZworICAgICAgICBOZWVkIHRoZSBidWcgVVJMIChPT1BTISkuCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9n OgorICAgICAgICAoZ2V0X3NlbGVjdG9yX2xpbmVfcmFuZ2VzX2Zvcl9jc3MpOgorCiAyMDE5LTEy LTEwICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgR3lyb3Njb3Bl IChEZXZpY2VNb3Rpb24gcmVsYXRlZCkgcGVybWlzc2lvbiBjYW5ub3QgYmUgcmVxdWVzdGVkIGlu IFdLV2ViVmlldyB1bmxlc3MgdGhlIGNsaWVudCBhcHAgc2V0cyBhIFdLVUlEZWxlZ2F0ZQpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZyBiL1Rvb2xzL1NjcmlwdHMv cHJlcGFyZS1DaGFuZ2VMb2cKaW5kZXggOGExYjA2M2IxYzAuLjU5MDUwMTdjNTU3IDEwMDc1NQot LS0gYS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL1NjcmlwdHMv cHJlcGFyZS1DaGFuZ2VMb2cKQEAgLTE4NzYsNiArMTg3Niw3IEBAIHN1YiBnZXRfc2VsZWN0b3Jf bGluZV9yYW5nZXNfZm9yX2NzcygkJCkKICAgICBteSBAc3RhY2s7CiAgICAgbXkgJGNvbnRleHQ7 CiAgICAgbXkgQGN1cnJlbnRQYXJzZU1vZGUgPSAoImdsb2JhbCIpOworICAgIG15IEBncm91cGlu Z1N0YWNrOwogICAgIG15ICRzZWxlY3RvckJyYWNlcyA9IDA7CiAKICAgICB3aGlsZSAoPCRmaWxl SGFuZGxlPikgewpAQCAtMTg5NSwxMSArMTg5NiwyMCBAQCBzdWIgZ2V0X3NlbGVjdG9yX2xpbmVf cmFuZ2VzX2Zvcl9jc3MoJCQpCiAKICAgICAgICAgICAgICAgICAgICAgJGluQnJhY2UgLT0gMTsK IAotICAgICAgICAgICAgICAgICAgICBwb3AoQGN1cnJlbnRQYXJzZU1vZGUpOwotICAgICAgICAg ICAgICAgICAgICBteSAkbmFtZSA9IHBvcChAc3RhY2spOwotICAgICAgICAgICAgICAgICAgICBt eSAkc3RhcnRMaW5lID0gcG9wKEBzdGFjayk7Ci0gICAgICAgICAgICAgICAgICAgIG15ICRlbmRM aW5lID0gJC47Ci0gICAgICAgICAgICAgICAgICAgIHB1c2goQHJhbmdlcywgWyRzdGFydExpbmUs ICRlbmRMaW5lLCAkbmFtZV0pOworICAgICAgICAgICAgICAgICAgICBteSAkcGFyc2VNb2RlID0g cG9wKEBjdXJyZW50UGFyc2VNb2RlKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCRwYXJzZU1v ZGUgZXEgInNlbGVjdG9yIikgeworICAgICAgICAgICAgICAgICAgICAgICAgbXkgJG5hbWUgPSBw b3AoQHN0YWNrKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIG15ICRzdGFydExpbmUgPSBwb3Ao QHN0YWNrKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIG15ICRlbmRMaW5lID0gJC47CisgICAg ICAgICAgICAgICAgICAgICAgICBteSAkZ3JvdXBpbmdQcmVmaXggPSBqb2luKCIgIiwgQGdyb3Vw aW5nU3RhY2spOworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGxlbmd0aCAkZ3JvdXBpbmdQ cmVmaXgpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAkZ3JvdXBpbmdQcmVmaXggLj0g IiAiCisgICAgICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgICAgICBw dXNoKEByYW5nZXMsIFskc3RhcnRMaW5lLCAkZW5kTGluZSwgJGdyb3VwaW5nUHJlZml4IC4gJG5h bWVdKTsKKyAgICAgICAgICAgICAgICAgICAgfSBlbHNpZiAoJHBhcnNlTW9kZSBlcSAibWVkaWEi KSB7CisgICAgICAgICAgICAgICAgICAgICAgICBwb3AoQGdyb3VwaW5nU3RhY2spOworICAgICAg ICAgICAgICAgICAgICB9CisKICAgICAgICAgICAgICAgICAgICAgJHNlbGVjdG9yQnJhY2VzID0g MDsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9IGVsc2lmICgkdG9rZW4gZXEgIi8q IikgewpAQCAtMTkxMyw3ICsxOTIzLDcgQEAgc3ViIGdldF9zZWxlY3Rvcl9saW5lX3Jhbmdlc19m b3JfY3NzKCQkKQogICAgICAgICAgICAgICAgICAgICBteSAkc3RhcnRMaW5lID0gJC47CiAgICAg ICAgICAgICAgICAgICAgIGlmICgkdG9rZW4gPX4gL15cQG1lZGlhLykgewogICAgICAgICAgICAg ICAgICAgICAgICAgcHVzaChAY3VycmVudFBhcnNlTW9kZSwgIm1lZGlhIik7Ci0gICAgICAgICAg ICAgICAgICAgICAgICBwdXNoKEBzdGFjaywgKCRzdGFydExpbmUsICR0b2tlbikpOworICAgICAg ICAgICAgICAgICAgICAgICAgcHVzaChAZ3JvdXBpbmdTdGFjaywgJHRva2VuKTsKICAgICAgICAg ICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgICAgIHB1c2goQGN1cnJl bnRQYXJzZU1vZGUsICJzZWxlY3RvciIpOwogICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChA c3RhY2ssICgkc3RhcnRMaW5lLCAkdG9rZW4pKTsK 385575 2019-12-12 21:41:46 -0800 2019-12-13 02:30:33 -0800 Patch 205196.diff text/plain 2673 hi ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4ODU4 NzQ2YmIwNy4uYmI2YTI5Y2ExNWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxOS0xMi0xMiAgRGV2aW4gUm91c3Nv ICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgUHJlZml4IENTUyBzZWxlY3RvcnMgd2l0 aCBhbGwgYXBwbGljYWJsZSBDU1MgZ3JvdXBpbmdzIHdoZW4gZ2VuZXJhdGluZyBhIENoYW5nZUxv ZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1MTk2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3Jp cHRzL3ByZXBhcmUtQ2hhbmdlTG9nOgorICAgICAgICAoZ2V0X3NlbGVjdG9yX2xpbmVfcmFuZ2Vz X2Zvcl9jc3MpOgorCiAyMDE5LTEyLTEwICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+ CiAKICAgICAgICAgR3lyb3Njb3BlIChEZXZpY2VNb3Rpb24gcmVsYXRlZCkgcGVybWlzc2lvbiBj YW5ub3QgYmUgcmVxdWVzdGVkIGluIFdLV2ViVmlldyB1bmxlc3MgdGhlIGNsaWVudCBhcHAgc2V0 cyBhIFdLVUlEZWxlZ2F0ZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5n ZUxvZyBiL1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKaW5kZXggOGExYjA2M2IxYzAu LjU5MDUwMTdjNTU3IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9n CisrKyBiL1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKQEAgLTE4NzYsNiArMTg3Niw3 IEBAIHN1YiBnZXRfc2VsZWN0b3JfbGluZV9yYW5nZXNfZm9yX2NzcygkJCkKICAgICBteSBAc3Rh Y2s7CiAgICAgbXkgJGNvbnRleHQ7CiAgICAgbXkgQGN1cnJlbnRQYXJzZU1vZGUgPSAoImdsb2Jh bCIpOworICAgIG15IEBncm91cGluZ1N0YWNrOwogICAgIG15ICRzZWxlY3RvckJyYWNlcyA9IDA7 CiAKICAgICB3aGlsZSAoPCRmaWxlSGFuZGxlPikgewpAQCAtMTg5NSwxMSArMTg5NiwyMCBAQCBz dWIgZ2V0X3NlbGVjdG9yX2xpbmVfcmFuZ2VzX2Zvcl9jc3MoJCQpCiAKICAgICAgICAgICAgICAg ICAgICAgJGluQnJhY2UgLT0gMTsKIAotICAgICAgICAgICAgICAgICAgICBwb3AoQGN1cnJlbnRQ YXJzZU1vZGUpOwotICAgICAgICAgICAgICAgICAgICBteSAkbmFtZSA9IHBvcChAc3RhY2spOwot ICAgICAgICAgICAgICAgICAgICBteSAkc3RhcnRMaW5lID0gcG9wKEBzdGFjayk7Ci0gICAgICAg ICAgICAgICAgICAgIG15ICRlbmRMaW5lID0gJC47Ci0gICAgICAgICAgICAgICAgICAgIHB1c2go QHJhbmdlcywgWyRzdGFydExpbmUsICRlbmRMaW5lLCAkbmFtZV0pOworICAgICAgICAgICAgICAg ICAgICBteSAkcGFyc2VNb2RlID0gcG9wKEBjdXJyZW50UGFyc2VNb2RlKTsKKyAgICAgICAgICAg ICAgICAgICAgaWYgKCRwYXJzZU1vZGUgZXEgInNlbGVjdG9yIikgeworICAgICAgICAgICAgICAg ICAgICAgICAgbXkgJG5hbWUgPSBwb3AoQHN0YWNrKTsKKyAgICAgICAgICAgICAgICAgICAgICAg IG15ICRzdGFydExpbmUgPSBwb3AoQHN0YWNrKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIG15 ICRlbmRMaW5lID0gJC47CisgICAgICAgICAgICAgICAgICAgICAgICBteSAkZ3JvdXBpbmdQcmVm aXggPSBqb2luKCIgIiwgQGdyb3VwaW5nU3RhY2spOworICAgICAgICAgICAgICAgICAgICAgICAg aWYgKGxlbmd0aCAkZ3JvdXBpbmdQcmVmaXgpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAkZ3JvdXBpbmdQcmVmaXggLj0gIiAiCisgICAgICAgICAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICAgICAgICAgICAgICBwdXNoKEByYW5nZXMsIFskc3RhcnRMaW5lLCAkZW5kTGluZSwg JGdyb3VwaW5nUHJlZml4IC4gJG5hbWVdKTsKKyAgICAgICAgICAgICAgICAgICAgfSBlbHNpZiAo JHBhcnNlTW9kZSBlcSAibWVkaWEiKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBwb3AoQGdy b3VwaW5nU3RhY2spOworICAgICAgICAgICAgICAgICAgICB9CisKICAgICAgICAgICAgICAgICAg ICAgJHNlbGVjdG9yQnJhY2VzID0gMDsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9 IGVsc2lmICgkdG9rZW4gZXEgIi8qIikgewpAQCAtMTkxMyw3ICsxOTIzLDcgQEAgc3ViIGdldF9z ZWxlY3Rvcl9saW5lX3Jhbmdlc19mb3JfY3NzKCQkKQogICAgICAgICAgICAgICAgICAgICBteSAk c3RhcnRMaW5lID0gJC47CiAgICAgICAgICAgICAgICAgICAgIGlmICgkdG9rZW4gPX4gL15cQG1l ZGlhLykgewogICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAY3VycmVudFBhcnNlTW9kZSwg Im1lZGlhIik7Ci0gICAgICAgICAgICAgICAgICAgICAgICBwdXNoKEBzdGFjaywgKCRzdGFydExp bmUsICR0b2tlbikpOworICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAZ3JvdXBpbmdTdGFj aywgJHRva2VuKTsKICAgICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAg ICAgICAgICAgIHB1c2goQGN1cnJlbnRQYXJzZU1vZGUsICJzZWxlY3RvciIpOwogICAgICAgICAg ICAgICAgICAgICAgICAgcHVzaChAc3RhY2ssICgkc3RhcnRMaW5lLCAkdG9rZW4pKTsK 385589 2019-12-13 02:30:35 -0800 2019-12-13 08:43:05 -0800 Patch bug-205196-20191213023034.patch text/plain 4202 hi ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkNWM4 NmIzMDQ4ZDU3NWI2OGNjMjcwOGMzMzFlOGJlMTQ0ZmI5NTI1Li5hNmMyNTU1ZTQwYjU0OWE0ZDQy NTNhYmZhNmU0OGNlYmJkMWEzNWRjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTktMTItMTMgIERldmluIFJvdXNz byAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFByZWZpeCBDU1Mgc2VsZWN0b3JzIHdp dGggYWxsIGFwcGxpY2FibGUgQ1NTIGdyb3VwaW5ncyB3aGVuIGdlbmVyYXRpbmcgYSBDaGFuZ2VM b2cKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNTE5 NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2Ny aXB0cy9wcmVwYXJlLUNoYW5nZUxvZzoKKyAgICAgICAgKGdldF9zZWxlY3Rvcl9saW5lX3Jhbmdl c19mb3JfY3NzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHBlcmwvcHJlcGFyZS1DaGFuZ2VM b2dfdW5pdHRlc3QvcmVzb3VyY2VzL2Nzc191bml0dGVzdHMtZXhwZWN0ZWQudHh0OgorCiAyMDE5 LTEyLTEyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAg IE1vdmUgV0tXZWJWaWV3IGNvZGUgcmVsYXRlZCB0byB0ZXN0aW5nIHRvIG5ldyBmaWxlcywgd2l0 aCBuZXcgcHJpdmF0ZSAiZm9yIHRlc3RpbmciIGhlYWRlcnMuCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nIGIvVG9vbHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxv ZwppbmRleCA4YTFiMDYzYjFjMDg2Y2M4OTY3ODY4OTRiNjgyZGUxZGEyNzRkYThlLi41OTA1MDE3 YzU1N2JhOWE5ZjQwZGU2OGM1MmJmODZmZWE3NmYyNjVmIDEwMDc1NQotLS0gYS9Ub29scy9TY3Jp cHRzL3ByZXBhcmUtQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VM b2cKQEAgLTE4NzYsNiArMTg3Niw3IEBAIHN1YiBnZXRfc2VsZWN0b3JfbGluZV9yYW5nZXNfZm9y X2NzcygkJCkKICAgICBteSBAc3RhY2s7CiAgICAgbXkgJGNvbnRleHQ7CiAgICAgbXkgQGN1cnJl bnRQYXJzZU1vZGUgPSAoImdsb2JhbCIpOworICAgIG15IEBncm91cGluZ1N0YWNrOwogICAgIG15 ICRzZWxlY3RvckJyYWNlcyA9IDA7CiAKICAgICB3aGlsZSAoPCRmaWxlSGFuZGxlPikgewpAQCAt MTg5NSwxMSArMTg5NiwyMCBAQCBzdWIgZ2V0X3NlbGVjdG9yX2xpbmVfcmFuZ2VzX2Zvcl9jc3Mo JCQpCiAKICAgICAgICAgICAgICAgICAgICAgJGluQnJhY2UgLT0gMTsKIAotICAgICAgICAgICAg ICAgICAgICBwb3AoQGN1cnJlbnRQYXJzZU1vZGUpOwotICAgICAgICAgICAgICAgICAgICBteSAk bmFtZSA9IHBvcChAc3RhY2spOwotICAgICAgICAgICAgICAgICAgICBteSAkc3RhcnRMaW5lID0g cG9wKEBzdGFjayk7Ci0gICAgICAgICAgICAgICAgICAgIG15ICRlbmRMaW5lID0gJC47Ci0gICAg ICAgICAgICAgICAgICAgIHB1c2goQHJhbmdlcywgWyRzdGFydExpbmUsICRlbmRMaW5lLCAkbmFt ZV0pOworICAgICAgICAgICAgICAgICAgICBteSAkcGFyc2VNb2RlID0gcG9wKEBjdXJyZW50UGFy c2VNb2RlKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCRwYXJzZU1vZGUgZXEgInNlbGVjdG9y IikgeworICAgICAgICAgICAgICAgICAgICAgICAgbXkgJG5hbWUgPSBwb3AoQHN0YWNrKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgIG15ICRzdGFydExpbmUgPSBwb3AoQHN0YWNrKTsKKyAgICAg ICAgICAgICAgICAgICAgICAgIG15ICRlbmRMaW5lID0gJC47CisgICAgICAgICAgICAgICAgICAg ICAgICBteSAkZ3JvdXBpbmdQcmVmaXggPSBqb2luKCIgIiwgQGdyb3VwaW5nU3RhY2spOworICAg ICAgICAgICAgICAgICAgICAgICAgaWYgKGxlbmd0aCAkZ3JvdXBpbmdQcmVmaXgpIHsKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAkZ3JvdXBpbmdQcmVmaXggLj0gIiAiCisgICAgICAgICAg ICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgICAgICBwdXNoKEByYW5nZXMsIFsk c3RhcnRMaW5lLCAkZW5kTGluZSwgJGdyb3VwaW5nUHJlZml4IC4gJG5hbWVdKTsKKyAgICAgICAg ICAgICAgICAgICAgfSBlbHNpZiAoJHBhcnNlTW9kZSBlcSAibWVkaWEiKSB7CisgICAgICAgICAg ICAgICAgICAgICAgICBwb3AoQGdyb3VwaW5nU3RhY2spOworICAgICAgICAgICAgICAgICAgICB9 CisKICAgICAgICAgICAgICAgICAgICAgJHNlbGVjdG9yQnJhY2VzID0gMDsKICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICB9IGVsc2lmICgkdG9rZW4gZXEgIi8qIikgewpAQCAtMTkxMyw3 ICsxOTIzLDcgQEAgc3ViIGdldF9zZWxlY3Rvcl9saW5lX3Jhbmdlc19mb3JfY3NzKCQkKQogICAg ICAgICAgICAgICAgICAgICBteSAkc3RhcnRMaW5lID0gJC47CiAgICAgICAgICAgICAgICAgICAg IGlmICgkdG9rZW4gPX4gL15cQG1lZGlhLykgewogICAgICAgICAgICAgICAgICAgICAgICAgcHVz aChAY3VycmVudFBhcnNlTW9kZSwgIm1lZGlhIik7Ci0gICAgICAgICAgICAgICAgICAgICAgICBw dXNoKEBzdGFjaywgKCRzdGFydExpbmUsICR0b2tlbikpOworICAgICAgICAgICAgICAgICAgICAg ICAgcHVzaChAZ3JvdXBpbmdTdGFjaywgJHRva2VuKTsKICAgICAgICAgICAgICAgICAgICAgfSBl bHNlIHsKICAgICAgICAgICAgICAgICAgICAgICAgIHB1c2goQGN1cnJlbnRQYXJzZU1vZGUsICJz ZWxlY3RvciIpOwogICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAc3RhY2ssICgkc3RhcnRM aW5lLCAkdG9rZW4pKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9wcmVw YXJlLUNoYW5nZUxvZ191bml0dGVzdC9yZXNvdXJjZXMvY3NzX3VuaXR0ZXN0cy1leHBlY3RlZC50 eHQgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHBlcmwvcHJlcGFyZS1DaGFuZ2VMb2dfdW5pdHRlc3Qv cmVzb3VyY2VzL2Nzc191bml0dGVzdHMtZXhwZWN0ZWQudHh0CmluZGV4IDcyNjM0YTEzZDI3ZDEw M2ZjNjY0Mjk5NTE5M2Y4MmM0ZjVmNTFmYTkuLmNlZWI4YjBjNWFiMmVmZGJmYTQ4ZjhiM2JhZTM2 N2RjYWM3NmY0MmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9wcmVwYXJl LUNoYW5nZUxvZ191bml0dGVzdC9yZXNvdXJjZXMvY3NzX3VuaXR0ZXN0cy1leHBlY3RlZC50eHQK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL3ByZXBhcmUtQ2hhbmdlTG9nX3VuaXR0ZXN0 L3Jlc291cmNlcy9jc3NfdW5pdHRlc3RzLWV4cGVjdGVkLnR4dApAQCAtOTcsMzUgKzk3LDI1IEBA CiAgICAgICAnODcnLAogICAgICAgJy5tZWRpYS1xdWVyeTo6YmVmb3JlJwogICAgIF0sCi0gICAg WwotICAgICAgJzg5JywKLSAgICAgICc5NicsCi0gICAgICAnQG1lZGlhIG9ubHkgc2NyZWVuIGFu ZCAobWF4LXdpZHRoOiA5ODBweCknCi0gICAgXSwKICAgICBbCiAgICAgICAnOTAnLAogICAgICAg JzkwJywKLSAgICAgICcubWVkaWEtcXVlcnkgYScKLSAgICBdLAotICAgIFsKLSAgICAgICc5MScs Ci0gICAgICAnOTQnLAotICAgICAgJ0BtZWRpYSAoLXdlYmtpdC1taW4tZGV2aWNlLXBpeGVsLXJh dGlvOiAyKScKKyAgICAgICdAbWVkaWEgb25seSBzY3JlZW4gYW5kIChtYXgtd2lkdGg6IDk4MHB4 KSAubWVkaWEtcXVlcnkgYScKICAgICBdLAogICAgIFsKICAgICAgICc5MicsCiAgICAgICAnOTIn LAotICAgICAgJy5ib3RoIGEnCisgICAgICAnQG1lZGlhIG9ubHkgc2NyZWVuIGFuZCAobWF4LXdp ZHRoOiA5ODBweCkgQG1lZGlhICgtd2Via2l0LW1pbi1kZXZpY2UtcGl4ZWwtcmF0aW86IDIpIC5i b3RoIGEnCiAgICAgXSwKICAgICBbCiAgICAgICAnOTMnLAogICAgICAgJzkzJywKLSAgICAgICcu Ym90aCBiJworICAgICAgJ0BtZWRpYSBvbmx5IHNjcmVlbiBhbmQgKG1heC13aWR0aDogOTgwcHgp IEBtZWRpYSAoLXdlYmtpdC1taW4tZGV2aWNlLXBpeGVsLXJhdGlvOiAyKSAuYm90aCBiJwogICAg IF0sCiAgICAgWwogICAgICAgJzk1JywKICAgICAgICc5NScsCi0gICAgICAnLm1lZGlhLXF1ZXJ5 IGInCisgICAgICAnQG1lZGlhIG9ubHkgc2NyZWVuIGFuZCAobWF4LXdpZHRoOiA5ODBweCkgLm1l ZGlhLXF1ZXJ5IGInCiAgICAgXSwKICAgICBbCiAgICAgICAnOTgnLAo=