217856 2020-10-16 16:36:20 -0700 webkitcorepy: Allow one package to require another package 2020-10-18 20:47:20 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=217659 https://bugs.webkit.org/show_bug.cgi?id=217650 https://bugs.webkit.org/show_bug.cgi?id=217826 https://bugs.webkit.org/show_bug.cgi?id=217694 https://bugs.webkit.org/show_bug.cgi?id=215895 InRadar P2 Normal --- 1 lmoura lmoura cgarcia clopez dpino ews-watchlist glenn jbedard webkit-bug-importer oldest_to_newest 1698820 0 lmoura 2020-10-16 16:36:20 -0700 webkitcorepy: Allow one package to require another package 1698824 1 411630 lmoura 2020-10-16 16:49:12 -0700 Created attachment 411630 Patch 1698828 2 411630 jbedard 2020-10-16 16:54:23 -0700 Comment on attachment 411630 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=411630&action=review > Tools/Scripts/webkitpy/__init__.py:54 > +AutoInstall.register(Package('pytest', Version(3, 6, 2), implicit_deps=['pytest_timeout'])) I'm not against this, although I recently added a feature (for things like zone.interface) that might be easier. Does this work: AutoInstall.register(Package('pytest', Version(3, 6, 2)) AutoInstall.register(Package('pytest_timeout', Version(1, 4, 2), pypi_name='pytest-timeout', aliases=['pytest'])) 1698905 3 411654 lmoura 2020-10-16 21:27:20 -0700 Created attachment 411654 Patch 1699188 4 ews-feeder 2020-10-18 20:46:04 -0700 Committed r268662: <https://trac.webkit.org/changeset/268662> All reviewed patches have been landed. Closing bug and clearing flags on attachment 411654. 1699189 5 webkit-bug-importer 2020-10-18 20:47:20 -0700 <rdar://problem/70426657> 411630 2020-10-16 16:49:12 -0700 2020-10-16 21:27:16 -0700 Patch bug-217856-20201016204910.patch text/plain 6985 lmoura U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4NjE5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjY3N2NmZjc3NzI1MDM0ZTg3YTdiYTAyMDBhNzA1NWI4 MWQzNjg2ZC4uY2JlZjE2NDQyOGU2Y2RiZDY1MWIxY2IzNDM5NmIxZGNlNjAyMDYwMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3 IEBACisyMDIwLTEwLTE2ICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgorCisgICAg ICAgIHdlYmtpdGNvcmVweTogQWxsb3cgb25lIHBhY2thZ2UgdG8gcmVxdWlyZSBhbm90aGVyIHBh Y2thZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx Nzg1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElu IHNvbWUgY2FzZXMgYSBwYWNrYWdlIG1heSBjaGVjayB3aGV0aGVyIGFub3RoZXIgcGFja2FnZSBp cworICAgICAgICBpbnN0YWxsZWQgd2l0aG91dCBhY3R1YWxseSBpbXBvcnRpbmcgaXQsIHdoaWNo IHdvdWxkIG1ha2UKKyAgICAgICAgdGhlIEF1dG9JbnN0YWxsIHRvIG1pc3MgdGhlIGRlcGVuZGVu Y3kgYXMgaXQgd291bGQgbm90IGJlCisgICAgICAgIGltcG9ydGVkLiBBbiBleGFtcGxlIGlzIHB5 dGVzdCBhdXRvbG9hZCBmZWF0dXJlIHNlYXJjaGluZworICAgICAgICBmb3IgcGx1Z2lucyBsaWtl IHB5dGVzdF90aW1lb3V0LgorCisgICAgICAgIFNvLCB0aGlzIGNvbW1pdCBhZGRzIGEgbmV3IGFy Z3VtZW50IHRvIGF1dG9pbnN0YWxsLlBhY2thZ2U6CisgICAgICAgIGltcGxpY2l0X2RlcHMuIEl0 IGlzIG5vdCBpbnRlbmRlZCB0byBiZSBhIGZ1bGwgZmxlZGdlZCBkZXBlbmRlbmN5CisgICAgICAg IHRyYWNraW5nIHN5c3RlbSwganVzdCBjb3ZlcmluZyB0aGVzZSBjb3JuZXIgY2FzZXMuCisKKyAg ICAgICAgVGhpcyBjb21taXQgYWxzbyBkb3duZ3JhZGVzIHB5dGVzdCBmcm9tIDMuMTAgdG8gMy42 IHRvIG1hdGNoIHRoZQorICAgICAgICB2ZXJzaW9uIHVzZWQgaW4gV1BUIHRlc3RzLgorCisgICAg ICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRf Xy5weTogQnVtcCBtaW5pCisgICAgICAgIHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weToKKyAgICAgICAg KFBhY2thZ2UuX19pbml0X18pOiBBZGQgbmV3IGltcGxpY2l0X2RlcHMgYXJndW1lbnQuCisgICAg ICAgIChQYWNrYWdlLmluc3RhbGwpOiBJbnN0YWxsIGltcGxpY2l0X2RlcHMuCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9fX2luaXRfXy5weTogVXBkYXRlIHB5dGVzdCB2ZXJzaW9uIGFuZCBh ZGQKKyAgICAgICAgcHl0ZXN0X3RpbWVvdXQgZGVwZW5kZW5jeS4KKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3dlYmRyaXZlcl90ZXN0cy9weXRlc3RfcnVubmVyLnB5OgorICAgICAgICAocnVu KTogSWdub3JlIERJU0FCTEVfQVVUT0xPQUQgYXMgaXQgd2FzIGFkZGVkIGluIHB5dGVzdCAzLjgg YW5kIGdvCisgICAgICAgIGJhY2sgdG8gaW1wbGljaXRseSBsb2FkaW5nIHB5dGVzdF90aW1lb3V0 LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvd2ViZHJpdmVyX3Rlc3RzL3dlYmRyaXZlcl90 ZXN0X3J1bm5lcl9zZWxlbml1bS5weToKKyAgICAgICAgKFdlYkRyaXZlclRlc3RSdW5uZXJTZWxl bml1bS5ydW4pOiBBZGQgdGhlIGhhcm5lc3MgZXJyb3IgbG9nIG1lc3NhZ2VzCisgICAgICAgIGxp a2UgdGhlIG9uZXMgaW4gdGhlIHczYyBydW5uZXIgZnJvbSByMjY4NDAyLgorCiAyMDIwLTEwLTE2 ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIEVuYWJsZSBp bmRpdmlkdWFsIENTUyB0cmFuc2Zvcm0gcHJvcGVydGllcyBieSBkZWZhdWx0CmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9p bnN0YWxsLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNv cmVweS9hdXRvaW5zdGFsbC5weQppbmRleCBmYzExZGI5ZTBlODM2ZmUzNDc3OTQ5MGVmNzQ3ZDRm MmFlMDZkNzRmLi4zNWU4Y2YxM2RkNDA3Yzg5ZGI3OGY3OWM2ZTRlYzlhMDZhZGMyMmQ4IDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5 L2F1dG9pbnN0YWxsLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVw eS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHkKQEAgLTk0LDcgKzk0LDcgQEAgY2xhc3MgUGFj a2FnZShvYmplY3QpOgogICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICByYWlzZSBP U0Vycm9yKCd7fSBoYXMgYW4gIHVucmVjb2duaXplZCBwYWNrYWdlIGZvcm1hdCcuZm9ybWF0KHNl bGYucGF0aCkpCiAKLSAgICBkZWYgX19pbml0X18oc2VsZiwgaW1wb3J0X25hbWUsIHZlcnNpb249 Tm9uZSwgcHlwaV9uYW1lPU5vbmUsIHNsb3dfaW5zdGFsbD1GYWxzZSwgd2hlZWw9RmFsc2UsIGFs aWFzZXM9Tm9uZSk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGltcG9ydF9uYW1lLCB2ZXJzaW9u PU5vbmUsIHB5cGlfbmFtZT1Ob25lLCBzbG93X2luc3RhbGw9RmFsc2UsIHdoZWVsPUZhbHNlLCBh bGlhc2VzPU5vbmUsIGltcGxpY2l0X2RlcHM9Tm9uZSk6CiAgICAgICAgIHNlbGYubmFtZSA9IGlt cG9ydF9uYW1lCiAgICAgICAgIHNlbGYudmVyc2lvbiA9IHZlcnNpb24KICAgICAgICAgc2VsZi5f YXJjaGl2ZXMgPSBbXQpAQCAtMTAyLDYgKzEwMiw3IEBAIGNsYXNzIFBhY2thZ2Uob2JqZWN0KToK ICAgICAgICAgc2VsZi5zbG93X2luc3RhbGwgPSBzbG93X2luc3RhbGwKICAgICAgICAgc2VsZi53 aGVlbCA9IHdoZWVsCiAgICAgICAgIHNlbGYuYWxpYXNlcyA9IGFsaWFzZXMgb3IgW10KKyAgICAg ICAgc2VsZi5pbXBsaWNpdF9kZXBzID0gaW1wbGljaXRfZGVwcyBvciBbXQogCiAgICAgQHByb3Bl cnR5CiAgICAgZGVmIGxvY2F0aW9uKHNlbGYpOgpAQCAtMjExLDYgKzIxMiwxMyBAQCBjbGFzcyBQ YWNrYWdlKG9iamVjdCk6CiAgICAgICAgICAgICBBdXRvSW5zdGFsbC5pbnN0YWxsKCdzZXR1cHRv b2xzJykKICAgICAgICAgICAgIEF1dG9JbnN0YWxsLmluc3RhbGwoJ3doZWVsJykKIAorICAgICAg ICAjIEluIHNvbWUgY2FzZXMgYSBwYWNrYWdlIG1heSBjaGVjayBpZiBhbm90aGVyIHBhY2thZ2Ug aXMgaW5zdGFsbGVkIHdpdGhvdXQgYWN0dWFsbHkKKyAgICAgICAgIyBpbXBvcnRpbmcgaXQsIHdo aWNoIHdvdWxkIG1ha2UgdGhlIEF1dG9JbnN0YWxsIHRvIG1pc3MgdGhlIGRlcGVuZGVuY3kgYXMg aXQgd291bGQKKyAgICAgICAgIyBub3QgYmUgaW1wb3J0ZWQuIEFuIGV4YW1wbGUgaXMgcHl0ZXN0 IGF1dG9sb2FkIGZlYXR1cmUgdG8gc2VhcmNoIGZvciBwbHVnaW5zIGxpa2UKKyAgICAgICAgIyBw eXRlc3RfdGltZW91dC4KKyAgICAgICAgZm9yIGRlcGVuZGVuY3kgaW4gc2VsZi5pbXBsaWNpdF9k ZXBzOgorICAgICAgICAgICAgQXV0b0luc3RhbGwuaW5zdGFsbChkZXBlbmRlbmN5KQorCiAgICAg ICAgIGlmIG5vdCBzZWxmLmFyY2hpdmVzKCk6CiAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9y KCdObyBhcmNoaXZlcyBmb3Ige30te30gZm91bmQnLmZvcm1hdChzZWxmLnB5cGlfbmFtZSwgc2Vs Zi52ZXJzaW9uKSkKICAgICAgICAgYXJjaGl2ZSA9IHNlbGYuYXJjaGl2ZXMoKVstMV0KZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvX19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L19faW5pdF9fLnB5CmluZGV4IGEwODY0MzJjZGViYWI0ZjQ4NThhOTM1OTBkZWRh MGFmODgzOWZiYWMuLjM4OTE5MzBlMTM5YWYwYzFkMWY4MmVjYmMzZjU1ZDY1MTczMTNkMGUgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvX19pbml0X18ucHkKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9fX2luaXRfXy5weQpAQCAtNTEsNyArNTEsNyBAQCBBdXRvSW5zdGFs bC5yZWdpc3RlcihQYWNrYWdlKCdwbHVnZ3knLCBWZXJzaW9uKDAsIDEzLCAxKSkpCiBBdXRvSW5z dGFsbC5yZWdpc3RlcihQYWNrYWdlKCdweScsIFZlcnNpb24oMSwgOSwgMCkpKQogQXV0b0luc3Rh bGwucmVnaXN0ZXIoUGFja2FnZSgncHl0ZXN0X3RpbWVvdXQnLCBWZXJzaW9uKDEsIDQsIDIpLCBw eXBpX25hbWU9J3B5dGVzdC10aW1lb3V0JykpCiAjIFB5dGVzdCBoZWxkIHRvIDMueCBkdWUgdG8g V1BUIHdlYmRyaXZlciBjb21wYXRpYmlsaXR5Ci1BdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdl KCdweXRlc3QnLCBWZXJzaW9uKDMsIDEwLCAxKSkpCitBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNr YWdlKCdweXRlc3QnLCBWZXJzaW9uKDMsIDYsIDIpLCBpbXBsaWNpdF9kZXBzPVsncHl0ZXN0X3Rp bWVvdXQnXSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdweWNvZGVzdHlsZScsIFZl cnNpb24oMiwgNSwgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgncHlsaW50Jywg VmVyc2lvbigwLCAyNSwgMikpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnc2NhbmRp cicsIFZlcnNpb24oMSwgMTAsIDApKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvd2ViZHJpdmVyX3Rlc3RzL3B5dGVzdF9ydW5uZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3dlYmRyaXZlcl90ZXN0cy9weXRlc3RfcnVubmVyLnB5CmluZGV4IGUyNjUwMjU2YmIxMjJh OGYzNTk2NGI1NjdiNGYyMTZjOWQwNzY0MDMuLjhmMWQwNTVlMjE4Yzc1NDVmYjUwN2U1ODc1YjJl OWFhY2JhMzc3YzMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvd2ViZHJpdmVy X3Rlc3RzL3B5dGVzdF9ydW5uZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93ZWJk cml2ZXJfdGVzdHMvcHl0ZXN0X3J1bm5lci5weQpAQCAtMTg5LDEwICsxODksNiBAQCBkZWYgcnVu KHBhdGgsIGFyZ3MsIHRpbWVvdXQsIGVudiwgZXhwZWN0YXRpb25zLCBpZ25vcmVfcGFyYW09Tm9u ZSk6CiAgICAgX2Vudmlyb24gPSBkaWN0KG9zLmVudmlyb24pCiAgICAgb3MuZW52aXJvbi5jbGVh cigpCiAgICAgb3MuZW52aXJvbi51cGRhdGUoZW52KQotICAgICMgRGlzYWJsZSBhdXRvbG9hZCBt YWdpYyB0byBhdm9pZCBpc3N1ZXMgd2l0aCB3ZWJraXRjb3JlcHkgQXV0b0luc3RhbGwKLSAgICAj IFRoaXMgd2lsbCBmb3JjZSBweXRlc3QgdG8gYWN0dWFsbHkgaW1wb3J0IHRoZSBkZXNpcmVkIHBs dWdpbnMsIHdoaWNoCi0gICAgIyB3aWxsIHRyaWdnZXIgdGhlIEF1dG9JbnN0YWxsIHByb2NlZHVy ZS4KLSAgICBvcy5lbnZpcm9uWydQWVRFU1RfRElTQUJMRV9QTFVHSU5fQVVUT0xPQUQnXSA9ICcx JwogCiAgICAgd2l0aCBUZW1wb3JhcnlEaXJlY3RvcnkoKSBhcyBjYWNoZV9kaXJlY3Rvcnk6CiAg ICAgICAgIHRyeToKQEAgLTIwMSw4ICsxOTcsNyBAQCBkZWYgcnVuKHBhdGgsIGFyZ3MsIHRpbWVv dXQsIGVudiwgZXhwZWN0YXRpb25zLCBpZ25vcmVfcGFyYW09Tm9uZSk6CiAgICAgICAgICAgICAg ICAgICAgJy0tYmFzZXRlbXA9JXMnICUgY2FjaGVfZGlyZWN0b3J5LAogICAgICAgICAgICAgICAg ICAgICctLXNob3dsb2NhbHMnLAogICAgICAgICAgICAgICAgICAgICctLXRpbWVvdXQ9JXMnICUg dGltZW91dCwKLSAgICAgICAgICAgICAgICAgICAnLXAnLCAnbm86Y2FjaGVwcm92aWRlcicsCi0g ICAgICAgICAgICAgICAgICAgJy1wJywgJ3B5dGVzdF90aW1lb3V0J10KKyAgICAgICAgICAgICAg ICAgICAnLXAnLCAnbm86Y2FjaGVwcm92aWRlciddCiAgICAgICAgICAgICBjbWQuZXh0ZW5kKGFy Z3MpCiAgICAgICAgICAgICBjbWQuYXBwZW5kKHBhdGgpCiAgICAgICAgICAgICByZXN1bHQgPSBw eXRlc3QubWFpbihjbWQsIHBsdWdpbnM9W2hhcm5lc3NfcmVjb3JkZXIsIHN1YnRlc3RzX3JlY29y ZGVyLCBleHBlY3RhdGlvbnNfbWFya2VyXSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvd2ViZHJpdmVyX3Rlc3RzL3dlYmRyaXZlcl90ZXN0X3J1bm5lcl9zZWxlbml1bS5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvd2ViZHJpdmVyX3Rlc3RzL3dlYmRyaXZlcl90ZXN0X3J1 bm5lcl9zZWxlbml1bS5weQppbmRleCAzZGU5ZTNiMmFjODUyMzA2M2ZkMWU5OTZkMjU4MzQzY2I2 YjI0MDBjLi5mYzY0ZmMwY2VhMzM0YzkxMzkyNzAxOTgwZTRmMmRlZjYyZGQzMmI5IDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3dlYmRyaXZlcl90ZXN0cy93ZWJkcml2ZXJfdGVz dF9ydW5uZXJfc2VsZW5pdW0ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93ZWJkcml2 ZXJfdGVzdHMvd2ViZHJpdmVyX3Rlc3RfcnVubmVyX3NlbGVuaXVtLnB5CkBAIC05MCw4ICs5MCw4 IEBAIGNsYXNzIFdlYkRyaXZlclRlc3RSdW5uZXJTZWxlbml1bShvYmplY3QpOgogICAgICAgICAg ICAgICAgIGZvciBzdWJ0ZXN0LCBzdGF0dXMsIG1lc3NhZ2UsIGJhY2t0cmFjZSBpbiB0ZXN0X3Jl c3VsdHM6CiAgICAgICAgICAgICAgICAgICAgIHJlc3VsdC5hZGRfc3VidGVzdF9yZXN1bHRzKG9z LnBhdGguYmFzZW5hbWUoc3VidGVzdCksIHN0YXR1cywgbWVzc2FnZSwgYmFja3RyYWNlKQogICAg ICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICAjIEZJWE1FOiBoYW5kbGUgb3RoZXIgcmVz dWx0cy4KLSAgICAgICAgICAgICAgICBwYXNzCisgICAgICAgICAgICAgICAgX2xvZy5lcnJvcigi VGVzdCAlcyBmYWlsZWQ6IiAlIHRlc3RfbmFtZSkKKyAgICAgICAgICAgICAgICBfbG9nLmVycm9y KGhhcm5lc3NfcmVzdWx0WzFdKQogICAgICAgICAgICAgc2VsZi5fcmVzdWx0cy5hcHBlbmQocmVz dWx0KQogCiAgICAgZGVmIHJlc3VsdHMoc2VsZik6Cg== 411654 2020-10-16 21:27:20 -0700 2020-10-18 20:46:04 -0700 Patch bug-217856-20201017012718.patch text/plain 7735 lmoura U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4NjI4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjY3N2NmZjc3NzI1MDM0ZTg3YTdiYTAyMDBhNzA1NWI4 MWQzNjg2ZC4uY2JlZjE2NDQyOGU2Y2RiZDY1MWIxY2IzNDM5NmIxZGNlNjAyMDYwMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3 IEBACisyMDIwLTEwLTE2ICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgorCisgICAg ICAgIHdlYmtpdGNvcmVweTogQWxsb3cgb25lIHBhY2thZ2UgdG8gcmVxdWlyZSBhbm90aGVyIHBh Y2thZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx Nzg1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElu IHNvbWUgY2FzZXMgYSBwYWNrYWdlIG1heSBjaGVjayB3aGV0aGVyIGFub3RoZXIgcGFja2FnZSBp cworICAgICAgICBpbnN0YWxsZWQgd2l0aG91dCBhY3R1YWxseSBpbXBvcnRpbmcgaXQsIHdoaWNo IHdvdWxkIG1ha2UKKyAgICAgICAgdGhlIEF1dG9JbnN0YWxsIHRvIG1pc3MgdGhlIGRlcGVuZGVu Y3kgYXMgaXQgd291bGQgbm90IGJlCisgICAgICAgIGltcG9ydGVkLiBBbiBleGFtcGxlIGlzIHB5 dGVzdCBhdXRvbG9hZCBmZWF0dXJlIHNlYXJjaGluZworICAgICAgICBmb3IgcGx1Z2lucyBsaWtl IHB5dGVzdF90aW1lb3V0LgorCisgICAgICAgIFNvLCB0aGlzIGNvbW1pdCBhZGRzIGEgbmV3IGFy Z3VtZW50IHRvIGF1dG9pbnN0YWxsLlBhY2thZ2U6CisgICAgICAgIGltcGxpY2l0X2RlcHMuIEl0 IGlzIG5vdCBpbnRlbmRlZCB0byBiZSBhIGZ1bGwgZmxlZGdlZCBkZXBlbmRlbmN5CisgICAgICAg IHRyYWNraW5nIHN5c3RlbSwganVzdCBjb3ZlcmluZyB0aGVzZSBjb3JuZXIgY2FzZXMuCisKKyAg ICAgICAgVGhpcyBjb21taXQgYWxzbyBkb3duZ3JhZGVzIHB5dGVzdCBmcm9tIDMuMTAgdG8gMy42 IHRvIG1hdGNoIHRoZQorICAgICAgICB2ZXJzaW9uIHVzZWQgaW4gV1BUIHRlc3RzLgorCisgICAg ICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRf Xy5weTogQnVtcCBtaW5pCisgICAgICAgIHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weToKKyAgICAgICAg KFBhY2thZ2UuX19pbml0X18pOiBBZGQgbmV3IGltcGxpY2l0X2RlcHMgYXJndW1lbnQuCisgICAg ICAgIChQYWNrYWdlLmluc3RhbGwpOiBJbnN0YWxsIGltcGxpY2l0X2RlcHMuCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9fX2luaXRfXy5weTogVXBkYXRlIHB5dGVzdCB2ZXJzaW9uIGFuZCBh ZGQKKyAgICAgICAgcHl0ZXN0X3RpbWVvdXQgZGVwZW5kZW5jeS4KKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3dlYmRyaXZlcl90ZXN0cy9weXRlc3RfcnVubmVyLnB5OgorICAgICAgICAocnVu KTogSWdub3JlIERJU0FCTEVfQVVUT0xPQUQgYXMgaXQgd2FzIGFkZGVkIGluIHB5dGVzdCAzLjgg YW5kIGdvCisgICAgICAgIGJhY2sgdG8gaW1wbGljaXRseSBsb2FkaW5nIHB5dGVzdF90aW1lb3V0 LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvd2ViZHJpdmVyX3Rlc3RzL3dlYmRyaXZlcl90 ZXN0X3J1bm5lcl9zZWxlbml1bS5weToKKyAgICAgICAgKFdlYkRyaXZlclRlc3RSdW5uZXJTZWxl bml1bS5ydW4pOiBBZGQgdGhlIGhhcm5lc3MgZXJyb3IgbG9nIG1lc3NhZ2VzCisgICAgICAgIGxp a2UgdGhlIG9uZXMgaW4gdGhlIHczYyBydW5uZXIgZnJvbSByMjY4NDAyLgorCiAyMDIwLTEwLTE2 ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIEVuYWJsZSBp bmRpdmlkdWFsIENTUyB0cmFuc2Zvcm0gcHJvcGVydGllcyBieSBkZWZhdWx0CmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5p dF9fLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVw eS9fX2luaXRfXy5weQppbmRleCA3ZTUzMmY3ZDgxZDY3YmE4MTJkMzllM2FmMDM3NWFkYjc0YzA4 OWRlLi45NTZiMGY0YmQwODMyMGU0NjFlODVjMzM1MmYxYzI5ZjRmMDFiNTk5IDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5p dF9fLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRj b3JlcHkvX19pbml0X18ucHkKQEAgLTM1LDcgKzM1LDcgQEAgZnJvbSB3ZWJraXRjb3JlcHkudGlt ZW91dCBpbXBvcnQgVGltZW91dAogZnJvbSB3ZWJraXRjb3JlcHkuc3VicHJvY2Vzc191dGlscyBp bXBvcnQgVGltZW91dEV4cGlyZWQsIENvbXBsZXRlZFByb2Nlc3MsIHJ1bgogZnJvbSB3ZWJraXRj b3JlcHkub3V0cHV0X2NhcHR1cmUgaW1wb3J0IExvZ2dlckNhcHR1cmUsIE91dHB1dENhcHR1cmUs IE91dHB1dER1cGxpY2F0ZQogCi12ZXJzaW9uID0gVmVyc2lvbigwLCA0LCAxOCkKK3ZlcnNpb24g PSBWZXJzaW9uKDAsIDQsIDE5KQogCiBmcm9tIHdlYmtpdGNvcmVweS5hdXRvaW5zdGFsbCBpbXBv cnQgUGFja2FnZSwgQXV0b0luc3RhbGwKIGlmIHN5cy52ZXJzaW9uX2luZm8gPiAoMywgMCk6CmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29y ZXB5L2F1dG9pbnN0YWxsLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5 L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weQppbmRleCBmYzExZGI5ZTBlODM2ZmUzNDc3OTQ5 MGVmNzQ3ZDRmMmFlMDZkNzRmLi4zNWU4Y2YxM2RkNDA3Yzg5ZGI3OGY3OWM2ZTRlYzlhMDZhZGMy MmQ4IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Vi a2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHkKQEAgLTk0LDcgKzk0LDcgQEAg Y2xhc3MgUGFja2FnZShvYmplY3QpOgogICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAg ICByYWlzZSBPU0Vycm9yKCd7fSBoYXMgYW4gIHVucmVjb2duaXplZCBwYWNrYWdlIGZvcm1hdCcu Zm9ybWF0KHNlbGYucGF0aCkpCiAKLSAgICBkZWYgX19pbml0X18oc2VsZiwgaW1wb3J0X25hbWUs IHZlcnNpb249Tm9uZSwgcHlwaV9uYW1lPU5vbmUsIHNsb3dfaW5zdGFsbD1GYWxzZSwgd2hlZWw9 RmFsc2UsIGFsaWFzZXM9Tm9uZSk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGltcG9ydF9uYW1l LCB2ZXJzaW9uPU5vbmUsIHB5cGlfbmFtZT1Ob25lLCBzbG93X2luc3RhbGw9RmFsc2UsIHdoZWVs PUZhbHNlLCBhbGlhc2VzPU5vbmUsIGltcGxpY2l0X2RlcHM9Tm9uZSk6CiAgICAgICAgIHNlbGYu bmFtZSA9IGltcG9ydF9uYW1lCiAgICAgICAgIHNlbGYudmVyc2lvbiA9IHZlcnNpb24KICAgICAg ICAgc2VsZi5fYXJjaGl2ZXMgPSBbXQpAQCAtMTAyLDYgKzEwMiw3IEBAIGNsYXNzIFBhY2thZ2Uo b2JqZWN0KToKICAgICAgICAgc2VsZi5zbG93X2luc3RhbGwgPSBzbG93X2luc3RhbGwKICAgICAg ICAgc2VsZi53aGVlbCA9IHdoZWVsCiAgICAgICAgIHNlbGYuYWxpYXNlcyA9IGFsaWFzZXMgb3Ig W10KKyAgICAgICAgc2VsZi5pbXBsaWNpdF9kZXBzID0gaW1wbGljaXRfZGVwcyBvciBbXQogCiAg ICAgQHByb3BlcnR5CiAgICAgZGVmIGxvY2F0aW9uKHNlbGYpOgpAQCAtMjExLDYgKzIxMiwxMyBA QCBjbGFzcyBQYWNrYWdlKG9iamVjdCk6CiAgICAgICAgICAgICBBdXRvSW5zdGFsbC5pbnN0YWxs KCdzZXR1cHRvb2xzJykKICAgICAgICAgICAgIEF1dG9JbnN0YWxsLmluc3RhbGwoJ3doZWVsJykK IAorICAgICAgICAjIEluIHNvbWUgY2FzZXMgYSBwYWNrYWdlIG1heSBjaGVjayBpZiBhbm90aGVy IHBhY2thZ2UgaXMgaW5zdGFsbGVkIHdpdGhvdXQgYWN0dWFsbHkKKyAgICAgICAgIyBpbXBvcnRp bmcgaXQsIHdoaWNoIHdvdWxkIG1ha2UgdGhlIEF1dG9JbnN0YWxsIHRvIG1pc3MgdGhlIGRlcGVu ZGVuY3kgYXMgaXQgd291bGQKKyAgICAgICAgIyBub3QgYmUgaW1wb3J0ZWQuIEFuIGV4YW1wbGUg aXMgcHl0ZXN0IGF1dG9sb2FkIGZlYXR1cmUgdG8gc2VhcmNoIGZvciBwbHVnaW5zIGxpa2UKKyAg ICAgICAgIyBweXRlc3RfdGltZW91dC4KKyAgICAgICAgZm9yIGRlcGVuZGVuY3kgaW4gc2VsZi5p bXBsaWNpdF9kZXBzOgorICAgICAgICAgICAgQXV0b0luc3RhbGwuaW5zdGFsbChkZXBlbmRlbmN5 KQorCiAgICAgICAgIGlmIG5vdCBzZWxmLmFyY2hpdmVzKCk6CiAgICAgICAgICAgICByYWlzZSBW YWx1ZUVycm9yKCdObyBhcmNoaXZlcyBmb3Ige30te30gZm91bmQnLmZvcm1hdChzZWxmLnB5cGlf bmFtZSwgc2VsZi52ZXJzaW9uKSkKICAgICAgICAgYXJjaGl2ZSA9IHNlbGYuYXJjaGl2ZXMoKVst MV0KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvX19pbml0X18ucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L19faW5pdF9fLnB5CmluZGV4IGEwODY0MzJjZGViYWI0ZjQ4NThh OTM1OTBkZWRhMGFmODgzOWZiYWMuLjM4OTE5MzBlMTM5YWYwYzFkMWY4MmVjYmMzZjU1ZDY1MTcz MTNkMGUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvX19pbml0X18ucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9fX2luaXRfXy5weQpAQCAtNTEsNyArNTEsNyBAQCBB dXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdwbHVnZ3knLCBWZXJzaW9uKDAsIDEzLCAxKSkp CiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdweScsIFZlcnNpb24oMSwgOSwgMCkpKQog QXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgncHl0ZXN0X3RpbWVvdXQnLCBWZXJzaW9uKDEs IDQsIDIpLCBweXBpX25hbWU9J3B5dGVzdC10aW1lb3V0JykpCiAjIFB5dGVzdCBoZWxkIHRvIDMu eCBkdWUgdG8gV1BUIHdlYmRyaXZlciBjb21wYXRpYmlsaXR5Ci1BdXRvSW5zdGFsbC5yZWdpc3Rl cihQYWNrYWdlKCdweXRlc3QnLCBWZXJzaW9uKDMsIDEwLCAxKSkpCitBdXRvSW5zdGFsbC5yZWdp c3RlcihQYWNrYWdlKCdweXRlc3QnLCBWZXJzaW9uKDMsIDYsIDIpLCBpbXBsaWNpdF9kZXBzPVsn cHl0ZXN0X3RpbWVvdXQnXSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdweWNvZGVz dHlsZScsIFZlcnNpb24oMiwgNSwgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgn cHlsaW50JywgVmVyc2lvbigwLCAyNSwgMikpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2Fn ZSgnc2NhbmRpcicsIFZlcnNpb24oMSwgMTAsIDApKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvd2ViZHJpdmVyX3Rlc3RzL3B5dGVzdF9ydW5uZXIucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3dlYmRyaXZlcl90ZXN0cy9weXRlc3RfcnVubmVyLnB5CmluZGV4IGUyNjUw MjU2YmIxMjJhOGYzNTk2NGI1NjdiNGYyMTZjOWQwNzY0MDMuLjhmMWQwNTVlMjE4Yzc1NDVmYjUw N2U1ODc1YjJlOWFhY2JhMzc3YzMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv d2ViZHJpdmVyX3Rlc3RzL3B5dGVzdF9ydW5uZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS93ZWJkcml2ZXJfdGVzdHMvcHl0ZXN0X3J1bm5lci5weQpAQCAtMTg5LDEwICsxODksNiBA QCBkZWYgcnVuKHBhdGgsIGFyZ3MsIHRpbWVvdXQsIGVudiwgZXhwZWN0YXRpb25zLCBpZ25vcmVf cGFyYW09Tm9uZSk6CiAgICAgX2Vudmlyb24gPSBkaWN0KG9zLmVudmlyb24pCiAgICAgb3MuZW52 aXJvbi5jbGVhcigpCiAgICAgb3MuZW52aXJvbi51cGRhdGUoZW52KQotICAgICMgRGlzYWJsZSBh dXRvbG9hZCBtYWdpYyB0byBhdm9pZCBpc3N1ZXMgd2l0aCB3ZWJraXRjb3JlcHkgQXV0b0luc3Rh bGwKLSAgICAjIFRoaXMgd2lsbCBmb3JjZSBweXRlc3QgdG8gYWN0dWFsbHkgaW1wb3J0IHRoZSBk ZXNpcmVkIHBsdWdpbnMsIHdoaWNoCi0gICAgIyB3aWxsIHRyaWdnZXIgdGhlIEF1dG9JbnN0YWxs IHByb2NlZHVyZS4KLSAgICBvcy5lbnZpcm9uWydQWVRFU1RfRElTQUJMRV9QTFVHSU5fQVVUT0xP QUQnXSA9ICcxJwogCiAgICAgd2l0aCBUZW1wb3JhcnlEaXJlY3RvcnkoKSBhcyBjYWNoZV9kaXJl Y3Rvcnk6CiAgICAgICAgIHRyeToKQEAgLTIwMSw4ICsxOTcsNyBAQCBkZWYgcnVuKHBhdGgsIGFy Z3MsIHRpbWVvdXQsIGVudiwgZXhwZWN0YXRpb25zLCBpZ25vcmVfcGFyYW09Tm9uZSk6CiAgICAg ICAgICAgICAgICAgICAgJy0tYmFzZXRlbXA9JXMnICUgY2FjaGVfZGlyZWN0b3J5LAogICAgICAg ICAgICAgICAgICAgICctLXNob3dsb2NhbHMnLAogICAgICAgICAgICAgICAgICAgICctLXRpbWVv dXQ9JXMnICUgdGltZW91dCwKLSAgICAgICAgICAgICAgICAgICAnLXAnLCAnbm86Y2FjaGVwcm92 aWRlcicsCi0gICAgICAgICAgICAgICAgICAgJy1wJywgJ3B5dGVzdF90aW1lb3V0J10KKyAgICAg ICAgICAgICAgICAgICAnLXAnLCAnbm86Y2FjaGVwcm92aWRlciddCiAgICAgICAgICAgICBjbWQu ZXh0ZW5kKGFyZ3MpCiAgICAgICAgICAgICBjbWQuYXBwZW5kKHBhdGgpCiAgICAgICAgICAgICBy ZXN1bHQgPSBweXRlc3QubWFpbihjbWQsIHBsdWdpbnM9W2hhcm5lc3NfcmVjb3JkZXIsIHN1YnRl c3RzX3JlY29yZGVyLCBleHBlY3RhdGlvbnNfbWFya2VyXSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvd2ViZHJpdmVyX3Rlc3RzL3dlYmRyaXZlcl90ZXN0X3J1bm5lcl9zZWxl bml1bS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvd2ViZHJpdmVyX3Rlc3RzL3dlYmRyaXZl cl90ZXN0X3J1bm5lcl9zZWxlbml1bS5weQppbmRleCAzZGU5ZTNiMmFjODUyMzA2M2ZkMWU5OTZk MjU4MzQzY2I2YjI0MDBjLi5mYzY0ZmMwY2VhMzM0YzkxMzkyNzAxOTgwZTRmMmRlZjYyZGQzMmI5 IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3dlYmRyaXZlcl90ZXN0cy93ZWJk cml2ZXJfdGVzdF9ydW5uZXJfc2VsZW5pdW0ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS93ZWJkcml2ZXJfdGVzdHMvd2ViZHJpdmVyX3Rlc3RfcnVubmVyX3NlbGVuaXVtLnB5CkBAIC05 MCw4ICs5MCw4IEBAIGNsYXNzIFdlYkRyaXZlclRlc3RSdW5uZXJTZWxlbml1bShvYmplY3QpOgog ICAgICAgICAgICAgICAgIGZvciBzdWJ0ZXN0LCBzdGF0dXMsIG1lc3NhZ2UsIGJhY2t0cmFjZSBp biB0ZXN0X3Jlc3VsdHM6CiAgICAgICAgICAgICAgICAgICAgIHJlc3VsdC5hZGRfc3VidGVzdF9y ZXN1bHRzKG9zLnBhdGguYmFzZW5hbWUoc3VidGVzdCksIHN0YXR1cywgbWVzc2FnZSwgYmFja3Ry YWNlKQogICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICAjIEZJWE1FOiBoYW5kbGUg b3RoZXIgcmVzdWx0cy4KLSAgICAgICAgICAgICAgICBwYXNzCisgICAgICAgICAgICAgICAgX2xv Zy5lcnJvcigiVGVzdCAlcyBmYWlsZWQ6IiAlIHRlc3RfbmFtZSkKKyAgICAgICAgICAgICAgICBf bG9nLmVycm9yKGhhcm5lc3NfcmVzdWx0WzFdKQogICAgICAgICAgICAgc2VsZi5fcmVzdWx0cy5h cHBlbmQocmVzdWx0KQogCiAgICAgZGVmIHJlc3VsdHMoc2VsZik6Cg==