211642 2020-05-08 13:58:15 -0700 webkitpy: 'iPhone SE' should match 'iPhone SE 1st generation' 2020-05-23 06:06:35 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain ap ews-watchlist giffypap79 glenn ryanhaddad webkit-bug-importer oldest_to_newest 1650752 0 jbedard 2020-05-08 13:58:15 -0700 In general, model matching should work such that '<model> 1st generation' matches '<model>' 1650754 1 jbedard 2020-05-08 14:00:05 -0700 <rdar://problems/62986242> 1650755 2 398886 jbedard 2020-05-08 14:03:28 -0700 Created attachment 398886 Patch 1650762 3 398886 aakash_jain 2020-05-08 14:18:31 -0700 Comment on attachment 398886 Patch rs=me 1650780 4 398886 ap 2020-05-08 14:46:45 -0700 Comment on attachment 398886 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=398886&action=review > Tools/Scripts/webkitpy/xcode/device_type_unittest.py:164 > + self.assertTrue(DeviceType.from_string('iPhone SE') == DeviceType.from_string('iPhone SE 1st generation')) Is this the actual string? I thought that there were parentheses there. 1650786 5 398893 jbedard 2020-05-08 15:03:08 -0700 Created attachment 398893 Patch 1650793 6 jbedard 2020-05-08 15:06:57 -0700 (In reply to Alexey Proskuryakov from comment #4) > Comment on attachment 398886 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=398886&action=review > > > Tools/Scripts/webkitpy/xcode/device_type_unittest.py:164 > > + self.assertTrue(DeviceType.from_string('iPhone SE') == DeviceType.from_string('iPhone SE 1st generation')) > > Is this the actual string? I thought that there were parentheses there. There are, and I missed a check we need in the case that we don't have an existing simulator with the type. Uploaded a new patch. 1650794 7 398896 jbedard 2020-05-08 15:09:57 -0700 Created attachment 398896 Patch for landing 1650811 8 ews-feeder 2020-05-08 15:56:52 -0700 Committed r261421: <https://trac.webkit.org/changeset/261421> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398896. 398886 2020-05-08 14:03:28 -0700 2020-05-08 15:03:06 -0700 Patch bug-211642-20200508140328.patch text/plain 4872 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2MTQxNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIwLTA1LTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogJ2lQaG9uZSBTRScgc2hvdWxkIG1hdGNoICdpUGhvbmUg U0UgMXN0IGdlbmVyYXRpb24nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTE2NDIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtcy82Mjk4NjI0Mj4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkveGNvZGUvZGV2aWNlX3R5cGUucHk6CisgICAgICAgIChEZXZpY2VUeXBlKToKKyAg ICAgICAgKERldmljZVR5cGUuc3RhbmRhcmRpemVkX2hhcmR3YXJlX3R5cGUpOiBTdHJpcCAnMXN0 IGdlbmVyYXRpb24nIGZyb20gbW9kZWxzLgorICAgICAgICAoRGV2aWNlVHlwZS5fX2VxX18pOiBV c2Ugc3RhbmRhcmRpemVkIGhhcmR3YXJlIHR5cGUuCisgICAgICAgIChEZXZpY2VUeXBlLl9fY29u dGFpbnNfXyk6IERpdHRvLgorICAgICAgICAoRGV2aWNlVHlwZS5fX2hhc2hfXyk6IERpdHRvLgor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkveGNvZGUvZGV2aWNlX3R5cGVfdW5pdHRlc3QucHk6 CisgICAgICAgIChEZXZpY2VUeXBlVGVzdC50ZXN0X2dlbmVyYXRpb25fbWF0Y2hpbmcpOgorCiAy MDIwLTA1LTA4ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgRml4IGJ1aWxkIG9uIHBsYXRmb3JtcyB3aXRob3V0IG5ldHdvcmsgZnJhbWV3b3Jr LgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS94Y29kZS9kZXZpY2VfdHlwZS5weQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL2RldmljZV90eXBlLnB5CShy ZXZpc2lvbiAyNjE0MTApCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL2RldmljZV90 eXBlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yNiw2ICsyNiw3IEBAIGZyb20gd2Via2l0cHkucG9y dC5jb25maWcgaW1wb3J0IGFwcGxlX2EKIAogIyBUaGlzIGNsYXNzIGlzIGRlc2lnbmVkIHRvIG1h dGNoIGRldmljZSB0eXBlcy4gQmVjYXVzZSBpdCBpcyB1c2VkIGZvciBtYXRjaGluZywgJ05vbmUn IGlzIHRyZWF0ZWQgYXMgYSB3aWxkLWNhcmQuCiBjbGFzcyBEZXZpY2VUeXBlKG9iamVjdCk6Cisg ICAgRklSU1RfR0VORVJBVElPTiA9ICcgMXN0IGdlbmVyYXRpb24nCiAKICAgICBAY2xhc3NtZXRo b2QKICAgICBkZWYgZnJvbV9zdHJpbmcoY2xzLCBkZXZpY2Vfc3RyaW5nLCB2ZXJzaW9uPU5vbmUp OgpAQCAtMTA4LDYgKzEwOSwxNSBAQCBjbGFzcyBEZXZpY2VUeXBlKG9iamVjdCk6CiAgICAgICAg IHNlbGYuX2RlZmluZV9zb2Z0d2FyZV92YXJpYW50X2Zyb21faGFyZHdhcmVfZmFtaWx5KCkKICAg ICAgICAgc2VsZi5jaGVja19jb25zaXN0ZW5jeSgpCiAKKyAgICBAcHJvcGVydHkKKyAgICBkZWYg c3RhbmRhcmRpemVkX2hhcmR3YXJlX3R5cGUoc2VsZik6CisgICAgICAgIGlmIG5vdCBzZWxmLmhh cmR3YXJlX3R5cGU6CisgICAgICAgICAgICByZXR1cm4gTm9uZQorCisgICAgICAgIGlmIHNlbGYu aGFyZHdhcmVfdHlwZS5sb3dlcigpLmVuZHN3aXRoKHNlbGYuRklSU1RfR0VORVJBVElPTik6Cisg ICAgICAgICAgICByZXR1cm4gc2VsZi5oYXJkd2FyZV90eXBlWzotbGVuKHNlbGYuRklSU1RfR0VO RVJBVElPTildCisgICAgICAgIHJldHVybiBzZWxmLmhhcmR3YXJlX3R5cGUKKwogICAgIGRlZiBf X3N0cl9fKHNlbGYpOgogICAgICAgICB2ZXJzaW9uID0gTm9uZQogICAgICAgICBpZiBzZWxmLnNv ZnR3YXJlX3ZlcnNpb24gYW5kIGFwcGxlX2FkZGl0aW9ucygpOgpAQCAtMTI2LDcgKzEzNiw3IEBA IGNsYXNzIERldmljZVR5cGUob2JqZWN0KToKICAgICAgICAgYXNzZXJ0IGlzaW5zdGFuY2Uob3Ro ZXIsIERldmljZVR5cGUpCiAgICAgICAgIGlmIHNlbGYuaGFyZHdhcmVfZmFtaWx5IGlzIG5vdCBO b25lIGFuZCBvdGhlci5oYXJkd2FyZV9mYW1pbHkgaXMgbm90IE5vbmUgYW5kIHNlbGYuaGFyZHdh cmVfZmFtaWx5Lmxvd2VyKCkgIT0gb3RoZXIuaGFyZHdhcmVfZmFtaWx5Lmxvd2VyKCk6CiAgICAg ICAgICAgICByZXR1cm4gRmFsc2UKLSAgICAgICAgaWYgc2VsZi5oYXJkd2FyZV90eXBlIGlzIG5v dCBOb25lIGFuZCBvdGhlci5oYXJkd2FyZV90eXBlIGlzIG5vdCBOb25lIGFuZCBzZWxmLmhhcmR3 YXJlX3R5cGUubG93ZXIoKSAhPSBvdGhlci5oYXJkd2FyZV90eXBlLmxvd2VyKCk6CisgICAgICAg IGlmIHNlbGYuc3RhbmRhcmRpemVkX2hhcmR3YXJlX3R5cGUgaXMgbm90IE5vbmUgYW5kIG90aGVy LnN0YW5kYXJkaXplZF9oYXJkd2FyZV90eXBlIGlzIG5vdCBOb25lIGFuZCBzZWxmLnN0YW5kYXJk aXplZF9oYXJkd2FyZV90eXBlLmxvd2VyKCkgIT0gb3RoZXIuc3RhbmRhcmRpemVkX2hhcmR3YXJl X3R5cGUubG93ZXIoKToKICAgICAgICAgICAgIHJldHVybiBGYWxzZQogICAgICAgICBpZiBzZWxm LnNvZnR3YXJlX3ZhcmlhbnQgaXMgbm90IE5vbmUgYW5kIG90aGVyLnNvZnR3YXJlX3ZhcmlhbnQg aXMgbm90IE5vbmUgYW5kIHNlbGYuc29mdHdhcmVfdmFyaWFudC5sb3dlcigpICE9IG90aGVyLnNv ZnR3YXJlX3ZhcmlhbnQubG93ZXIoKToKICAgICAgICAgICAgIHJldHVybiBGYWxzZQpAQCAtMTM4 LDcgKzE0OCw3IEBAIGNsYXNzIERldmljZVR5cGUob2JqZWN0KToKICAgICAgICAgYXNzZXJ0IGlz aW5zdGFuY2Uob3RoZXIsIERldmljZVR5cGUpCiAgICAgICAgIGlmIHNlbGYuaGFyZHdhcmVfZmFt aWx5IGlzIG5vdCBOb25lIGFuZCAobm90IG90aGVyLmhhcmR3YXJlX2ZhbWlseSBvciBzZWxmLmhh cmR3YXJlX2ZhbWlseS5sb3dlcigpICE9IG90aGVyLmhhcmR3YXJlX2ZhbWlseS5sb3dlcigpKToK ICAgICAgICAgICAgIHJldHVybiBGYWxzZQotICAgICAgICBpZiBzZWxmLmhhcmR3YXJlX3R5cGUg aXMgbm90IE5vbmUgYW5kIChub3Qgb3RoZXIuaGFyZHdhcmVfdHlwZSBvciBzZWxmLmhhcmR3YXJl X3R5cGUubG93ZXIoKSAhPSBvdGhlci5oYXJkd2FyZV90eXBlLmxvd2VyKCkpOgorICAgICAgICBp ZiBzZWxmLnN0YW5kYXJkaXplZF9oYXJkd2FyZV90eXBlIGlzIG5vdCBOb25lIGFuZCAobm90IG90 aGVyLnN0YW5kYXJkaXplZF9oYXJkd2FyZV90eXBlIG9yIHNlbGYuc3RhbmRhcmRpemVkX2hhcmR3 YXJlX3R5cGUubG93ZXIoKSAhPSBvdGhlci5zdGFuZGFyZGl6ZWRfaGFyZHdhcmVfdHlwZS5sb3dl cigpKToKICAgICAgICAgICAgIHJldHVybiBGYWxzZQogICAgICAgICBpZiBzZWxmLnNvZnR3YXJl X3ZhcmlhbnQgaXMgbm90IE5vbmUgYW5kIChub3Qgb3RoZXIuc29mdHdhcmVfdmFyaWFudCBvciBz ZWxmLnNvZnR3YXJlX3ZhcmlhbnQubG93ZXIoKSAhPSBvdGhlci5zb2Z0d2FyZV92YXJpYW50Lmxv d2VyKCkpOgogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCkBAIC0xNDcsNCArMTU3LDQgQEAgY2xh c3MgRGV2aWNlVHlwZShvYmplY3QpOgogICAgICAgICByZXR1cm4gVHJ1ZQogCiAgICAgZGVmIF9f aGFzaF9fKHNlbGYpOgotICAgICAgICByZXR1cm4gaGFzaCgoc2VsZi5oYXJkd2FyZV9mYW1pbHks IHNlbGYuaGFyZHdhcmVfdHlwZSwgc2VsZi5zb2Z0d2FyZV92YXJpYW50LCBzZWxmLnNvZnR3YXJl X3ZlcnNpb24pKQorICAgICAgICByZXR1cm4gaGFzaCgoc2VsZi5oYXJkd2FyZV9mYW1pbHksIHNl bGYuc3RhbmRhcmRpemVkX2hhcmR3YXJlX3R5cGUsIHNlbGYuc29mdHdhcmVfdmFyaWFudCwgc2Vs Zi5zb2Z0d2FyZV92ZXJzaW9uKSkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUv ZGV2aWNlX3R5cGVfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJr aXRweS94Y29kZS9kZXZpY2VfdHlwZV91bml0dGVzdC5weQkocmV2aXNpb24gMjYxNDEwKQorKysg VG9vbHMvU2NyaXB0cy93ZWJraXRweS94Y29kZS9kZXZpY2VfdHlwZV91bml0dGVzdC5weQkod29y a2luZyBjb3B5KQpAQCAtMTU4LDMgKzE1OCw4IEBAIGNsYXNzIERldmljZVR5cGVUZXN0KHVuaXR0 ZXN0LlRlc3RDYXNlKToKIAogICAgIGRlZiB0ZXN0X3VubWFwcGVkX3ZlcnNpb24oc2VsZik6CiAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ2lQaG9uZSBydW5uaW5nIGlPUycsIHN0cihEZXZpY2VU eXBlLmZyb21fc3RyaW5nKCdpUGhvbmUnLCBWZXJzaW9uKDkpKSkpCisKKyAgICBkZWYgdGVzdF9n ZW5lcmF0aW9uX21hdGNoaW5nKHNlbGYpOgorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKERldmlj ZVR5cGUuZnJvbV9zdHJpbmcoJ2lQaG9uZSBTRSAxc3QgZ2VuZXJhdGlvbicpLnN0YW5kYXJkaXpl ZF9oYXJkd2FyZV90eXBlLCAnU0UnKQorICAgICAgICBzZWxmLmFzc2VydFRydWUoRGV2aWNlVHlw ZS5mcm9tX3N0cmluZygnaVBob25lIFNFJykgPT0gRGV2aWNlVHlwZS5mcm9tX3N0cmluZygnaVBo b25lIFNFIDFzdCBnZW5lcmF0aW9uJykpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShEZXZpY2VU eXBlLmZyb21fc3RyaW5nKCdpUGhvbmUgU0UnKSAhPSBEZXZpY2VUeXBlLmZyb21fc3RyaW5nKCdp UGhvbmUgU0UgMm5kIGdlbmVyYXRpb24nKSkK 398893 2020-05-08 15:03:08 -0700 2020-05-08 15:09:53 -0700 Patch bug-211642-20200508150307.patch text/plain 7123 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2MTQxOCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI1IEBACisyMDIwLTA1LTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogJ2lQaG9uZSBTRScgc2hvdWxkIG1hdGNoICdpUGhvbmUg U0UgMXN0IGdlbmVyYXRpb24nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTE2NDIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtcy82Mjk4NjI0Mj4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkveGNvZGUvZGV2aWNlX3R5cGUucHk6CisgICAgICAgIChEZXZpY2VUeXBlKToKKyAg ICAgICAgKERldmljZVR5cGUuc3RhbmRhcmRpemVkX2hhcmR3YXJlX3R5cGUpOiBTdHJpcCAnMXN0 IGdlbmVyYXRpb24nIGZyb20gbW9kZWxzLgorICAgICAgICAoRGV2aWNlVHlwZS5fX2VxX18pOiBV c2Ugc3RhbmRhcmRpemVkIGhhcmR3YXJlIHR5cGUuCisgICAgICAgIChEZXZpY2VUeXBlLl9fY29u dGFpbnNfXyk6IERpdHRvLgorICAgICAgICAoRGV2aWNlVHlwZS5fX2hhc2hfXyk6IERpdHRvLgor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkveGNvZGUvZGV2aWNlX3R5cGVfdW5pdHRlc3QucHk6 CisgICAgICAgIChEZXZpY2VUeXBlVGVzdCk6CisgICAgICAgIChEZXZpY2VUeXBlVGVzdC50ZXN0 X2dlbmVyYXRpb25fbWF0Y2hpbmcpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkveGNvZGUv c2ltdWxhdGVkX2RldmljZS5weToKKyAgICAgICAgKFNpbXVsYXRlZERldmljZU1hbmFnZXIuX2dl dF9kZXZpY2VfaWRlbnRpZmllcl9mb3JfdHlwZSk6IEhhbmRsZSBjYXNlIHdoZXJlIHRoZSByZXF1 ZXN0cyBtb2RlbCBkb2VzIG5vdAorICAgICAgICBlbmQgd2l0aCAnKDFzdCBnZW5lcmF0aW9uKScs IGJ1dCB0aGUgc2ltY3RsIG1vZGVsIGRvZXMuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS94 Y29kZS9zaW11bGF0ZWRfZGV2aWNlX3VuaXR0ZXN0LnB5OgorCiAyMDIwLTA1LTA4ICBSeWFuIEhh ZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUuY29tPgogCiAgICAgICAgIFRlc3RXZWJLaXRBUEkuV2Vi S2l0LkFsbG93c0NvbnRlbnRKYXZhU2NyaXB0IGZhaWxzIG9uIGlQYWQgc2ltdWxhdG9yCkluZGV4 OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL2RldmljZV90eXBlLnB5Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUvZGV2aWNlX3R5cGUucHkJKHJldmlzaW9u IDI2MTQxMCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUvZGV2aWNlX3R5cGUucHkJ KHdvcmtpbmcgY29weSkKQEAgLTI2LDYgKzI2LDcgQEAgZnJvbSB3ZWJraXRweS5wb3J0LmNvbmZp ZyBpbXBvcnQgYXBwbGVfYQogCiAjIFRoaXMgY2xhc3MgaXMgZGVzaWduZWQgdG8gbWF0Y2ggZGV2 aWNlIHR5cGVzLiBCZWNhdXNlIGl0IGlzIHVzZWQgZm9yIG1hdGNoaW5nLCAnTm9uZScgaXMgdHJl YXRlZCBhcyBhIHdpbGQtY2FyZC4KIGNsYXNzIERldmljZVR5cGUob2JqZWN0KToKKyAgICBGSVJT VF9HRU5FUkFUSU9OID0gJyAoMXN0IGdlbmVyYXRpb24pJwogCiAgICAgQGNsYXNzbWV0aG9kCiAg ICAgZGVmIGZyb21fc3RyaW5nKGNscywgZGV2aWNlX3N0cmluZywgdmVyc2lvbj1Ob25lKToKQEAg LTEwOCw2ICsxMDksMTUgQEAgY2xhc3MgRGV2aWNlVHlwZShvYmplY3QpOgogICAgICAgICBzZWxm Ll9kZWZpbmVfc29mdHdhcmVfdmFyaWFudF9mcm9tX2hhcmR3YXJlX2ZhbWlseSgpCiAgICAgICAg IHNlbGYuY2hlY2tfY29uc2lzdGVuY3koKQogCisgICAgQHByb3BlcnR5CisgICAgZGVmIHN0YW5k YXJkaXplZF9oYXJkd2FyZV90eXBlKHNlbGYpOgorICAgICAgICBpZiBub3Qgc2VsZi5oYXJkd2Fy ZV90eXBlOgorICAgICAgICAgICAgcmV0dXJuIE5vbmUKKworICAgICAgICBpZiBzZWxmLmhhcmR3 YXJlX3R5cGUubG93ZXIoKS5lbmRzd2l0aChzZWxmLkZJUlNUX0dFTkVSQVRJT04pOgorICAgICAg ICAgICAgcmV0dXJuIHNlbGYuaGFyZHdhcmVfdHlwZVs6LWxlbihzZWxmLkZJUlNUX0dFTkVSQVRJ T04pXQorICAgICAgICByZXR1cm4gc2VsZi5oYXJkd2FyZV90eXBlCisKICAgICBkZWYgX19zdHJf XyhzZWxmKToKICAgICAgICAgdmVyc2lvbiA9IE5vbmUKICAgICAgICAgaWYgc2VsZi5zb2Z0d2Fy ZV92ZXJzaW9uIGFuZCBhcHBsZV9hZGRpdGlvbnMoKToKQEAgLTEyNiw3ICsxMzYsNyBAQCBjbGFz cyBEZXZpY2VUeXBlKG9iamVjdCk6CiAgICAgICAgIGFzc2VydCBpc2luc3RhbmNlKG90aGVyLCBE ZXZpY2VUeXBlKQogICAgICAgICBpZiBzZWxmLmhhcmR3YXJlX2ZhbWlseSBpcyBub3QgTm9uZSBh bmQgb3RoZXIuaGFyZHdhcmVfZmFtaWx5IGlzIG5vdCBOb25lIGFuZCBzZWxmLmhhcmR3YXJlX2Zh bWlseS5sb3dlcigpICE9IG90aGVyLmhhcmR3YXJlX2ZhbWlseS5sb3dlcigpOgogICAgICAgICAg ICAgcmV0dXJuIEZhbHNlCi0gICAgICAgIGlmIHNlbGYuaGFyZHdhcmVfdHlwZSBpcyBub3QgTm9u ZSBhbmQgb3RoZXIuaGFyZHdhcmVfdHlwZSBpcyBub3QgTm9uZSBhbmQgc2VsZi5oYXJkd2FyZV90 eXBlLmxvd2VyKCkgIT0gb3RoZXIuaGFyZHdhcmVfdHlwZS5sb3dlcigpOgorICAgICAgICBpZiBz ZWxmLnN0YW5kYXJkaXplZF9oYXJkd2FyZV90eXBlIGlzIG5vdCBOb25lIGFuZCBvdGhlci5zdGFu ZGFyZGl6ZWRfaGFyZHdhcmVfdHlwZSBpcyBub3QgTm9uZSBhbmQgc2VsZi5zdGFuZGFyZGl6ZWRf aGFyZHdhcmVfdHlwZS5sb3dlcigpICE9IG90aGVyLnN0YW5kYXJkaXplZF9oYXJkd2FyZV90eXBl Lmxvd2VyKCk6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKICAgICAgICAgaWYgc2VsZi5zb2Z0 d2FyZV92YXJpYW50IGlzIG5vdCBOb25lIGFuZCBvdGhlci5zb2Z0d2FyZV92YXJpYW50IGlzIG5v dCBOb25lIGFuZCBzZWxmLnNvZnR3YXJlX3ZhcmlhbnQubG93ZXIoKSAhPSBvdGhlci5zb2Z0d2Fy ZV92YXJpYW50Lmxvd2VyKCk6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKQEAgLTEzOCw3ICsx NDgsNyBAQCBjbGFzcyBEZXZpY2VUeXBlKG9iamVjdCk6CiAgICAgICAgIGFzc2VydCBpc2luc3Rh bmNlKG90aGVyLCBEZXZpY2VUeXBlKQogICAgICAgICBpZiBzZWxmLmhhcmR3YXJlX2ZhbWlseSBp cyBub3QgTm9uZSBhbmQgKG5vdCBvdGhlci5oYXJkd2FyZV9mYW1pbHkgb3Igc2VsZi5oYXJkd2Fy ZV9mYW1pbHkubG93ZXIoKSAhPSBvdGhlci5oYXJkd2FyZV9mYW1pbHkubG93ZXIoKSk6CiAgICAg ICAgICAgICByZXR1cm4gRmFsc2UKLSAgICAgICAgaWYgc2VsZi5oYXJkd2FyZV90eXBlIGlzIG5v dCBOb25lIGFuZCAobm90IG90aGVyLmhhcmR3YXJlX3R5cGUgb3Igc2VsZi5oYXJkd2FyZV90eXBl Lmxvd2VyKCkgIT0gb3RoZXIuaGFyZHdhcmVfdHlwZS5sb3dlcigpKToKKyAgICAgICAgaWYgc2Vs Zi5zdGFuZGFyZGl6ZWRfaGFyZHdhcmVfdHlwZSBpcyBub3QgTm9uZSBhbmQgKG5vdCBvdGhlci5z dGFuZGFyZGl6ZWRfaGFyZHdhcmVfdHlwZSBvciBzZWxmLnN0YW5kYXJkaXplZF9oYXJkd2FyZV90 eXBlLmxvd2VyKCkgIT0gb3RoZXIuc3RhbmRhcmRpemVkX2hhcmR3YXJlX3R5cGUubG93ZXIoKSk6 CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKICAgICAgICAgaWYgc2VsZi5zb2Z0d2FyZV92YXJp YW50IGlzIG5vdCBOb25lIGFuZCAobm90IG90aGVyLnNvZnR3YXJlX3ZhcmlhbnQgb3Igc2VsZi5z b2Z0d2FyZV92YXJpYW50Lmxvd2VyKCkgIT0gb3RoZXIuc29mdHdhcmVfdmFyaWFudC5sb3dlcigp KToKICAgICAgICAgICAgIHJldHVybiBGYWxzZQpAQCAtMTQ3LDQgKzE1Nyw0IEBAIGNsYXNzIERl dmljZVR5cGUob2JqZWN0KToKICAgICAgICAgcmV0dXJuIFRydWUKIAogICAgIGRlZiBfX2hhc2hf XyhzZWxmKToKLSAgICAgICAgcmV0dXJuIGhhc2goKHNlbGYuaGFyZHdhcmVfZmFtaWx5LCBzZWxm LmhhcmR3YXJlX3R5cGUsIHNlbGYuc29mdHdhcmVfdmFyaWFudCwgc2VsZi5zb2Z0d2FyZV92ZXJz aW9uKSkKKyAgICAgICAgcmV0dXJuIGhhc2goKHNlbGYuaGFyZHdhcmVfZmFtaWx5LCBzZWxmLnN0 YW5kYXJkaXplZF9oYXJkd2FyZV90eXBlLCBzZWxmLnNvZnR3YXJlX3ZhcmlhbnQsIHNlbGYuc29m dHdhcmVfdmVyc2lvbikpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL2Rldmlj ZV90eXBlX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv eGNvZGUvZGV2aWNlX3R5cGVfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI2MTQxMCkKKysrIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkveGNvZGUvZGV2aWNlX3R5cGVfdW5pdHRlc3QucHkJKHdvcmtpbmcg Y29weSkKQEAgLTE1OCwzICsxNTgsOCBAQCBjbGFzcyBEZXZpY2VUeXBlVGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6CiAKICAgICBkZWYgdGVzdF91bm1hcHBlZF92ZXJzaW9uKHNlbGYpOgogICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKCdpUGhvbmUgcnVubmluZyBpT1MnLCBzdHIoRGV2aWNlVHlwZS5m cm9tX3N0cmluZygnaVBob25lJywgVmVyc2lvbig5KSkpKQorCisgICAgZGVmIHRlc3RfZ2VuZXJh dGlvbl9tYXRjaGluZyhzZWxmKToKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChEZXZpY2VUeXBl LmZyb21fc3RyaW5nKCdpUGhvbmUgU0UgKDFzdCBnZW5lcmF0aW9uKScpLnN0YW5kYXJkaXplZF9o YXJkd2FyZV90eXBlLCAnU0UnKQorICAgICAgICBzZWxmLmFzc2VydFRydWUoRGV2aWNlVHlwZS5m cm9tX3N0cmluZygnaVBob25lIFNFJykgPT0gRGV2aWNlVHlwZS5mcm9tX3N0cmluZygnaVBob25l IFNFICgxc3QgZ2VuZXJhdGlvbiknKSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKERldmljZVR5 cGUuZnJvbV9zdHJpbmcoJ2lQaG9uZSBTRScpICE9IERldmljZVR5cGUuZnJvbV9zdHJpbmcoJ2lQ aG9uZSBTRSAoMm5kIGdlbmVyYXRpb24pJykpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3hjb2RlL3NpbXVsYXRlZF9kZXZpY2UucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93 ZWJraXRweS94Y29kZS9zaW11bGF0ZWRfZGV2aWNlLnB5CShyZXZpc2lvbiAyNjE0MTApCisrKyBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRlZF9kZXZpY2UucHkJKHdvcmtpbmcg Y29weSkKQEAgLTI0OSw4ICsyNDksMTEgQEAgY2xhc3MgU2ltdWxhdGVkRGV2aWNlTWFuYWdlcihv YmplY3QpOgogCiAgICAgQHN0YXRpY21ldGhvZAogICAgIGRlZiBfZ2V0X2RldmljZV9pZGVudGlm aWVyX2Zvcl90eXBlKGRldmljZV90eXBlKToKKyAgICAgICAgdHlwZV9uYW1lX2Zvcl9yZXF1ZXN0 ID0gdSd7fSB7fScuZm9ybWF0KGRldmljZV90eXBlLmhhcmR3YXJlX2ZhbWlseS5sb3dlcigpLCBk ZXZpY2VfdHlwZS5zdGFuZGFyZGl6ZWRfaGFyZHdhcmVfdHlwZS5sb3dlcigpKQogICAgICAgICBm b3IgdHlwZV9pZCwgdHlwZV9uYW1lIGluIFNpbXVsYXRlZERldmljZU1hbmFnZXIuX2RldmljZV9p ZGVudGlmaWVyX3RvX25hbWUuaXRlbXMoKToKLSAgICAgICAgICAgIGlmIHR5cGVfbmFtZS5sb3dl cigpID09IHUne30ge30nLmZvcm1hdChkZXZpY2VfdHlwZS5oYXJkd2FyZV9mYW1pbHkubG93ZXIo KSwgZGV2aWNlX3R5cGUuaGFyZHdhcmVfdHlwZS5sb3dlcigpKToKKyAgICAgICAgICAgIGlmIHR5 cGVfbmFtZS5sb3dlcigpID09IHR5cGVfbmFtZV9mb3JfcmVxdWVzdDoKKyAgICAgICAgICAgICAg ICByZXR1cm4gdHlwZV9pZAorICAgICAgICAgICAgaWYgdHlwZV9uYW1lLmxvd2VyKCkuZW5kc3dp dGgoRGV2aWNlVHlwZS5GSVJTVF9HRU5FUkFUSU9OKSBhbmQgdHlwZV9uYW1lLmxvd2VyKClbOi1s ZW4oRGV2aWNlVHlwZS5GSVJTVF9HRU5FUkFUSU9OKV0gPT0gdHlwZV9uYW1lX2Zvcl9yZXF1ZXN0 OgogICAgICAgICAgICAgICAgIHJldHVybiB0eXBlX2lkCiAgICAgICAgIHJldHVybiBOb25lCiAK SW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUvc2ltdWxhdGVkX2RldmljZV91bml0 dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVs YXRlZF9kZXZpY2VfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI2MTQxMCkKKysrIFRvb2xzL1Njcmlw dHMvd2Via2l0cHkveGNvZGUvc2ltdWxhdGVkX2RldmljZV91bml0dGVzdC5weQkod29ya2luZyBj b3B5KQpAQCAtNjcsNyArNjcsNyBAQCBzaW1jdGxfanNvbl9vdXRwdXQgPSAiIiJ7CiAgICAgICJp ZGVudGlmaWVyIiA6ICJjb20uYXBwbGUuQ29yZVNpbXVsYXRvci5TaW1EZXZpY2VUeXBlLmlQaG9u ZS04LVBsdXMiCiAgICB9LAogICAgewotICAgICAibmFtZSIgOiAiaVBob25lIFNFIiwKKyAgICAg Im5hbWUiIDogImlQaG9uZSBTRSAoMXN0IGdlbmVyYXRpb24pIiwKICAgICAgImlkZW50aWZpZXIi IDogImNvbS5hcHBsZS5Db3JlU2ltdWxhdG9yLlNpbURldmljZVR5cGUuaVBob25lLVNFIgogICAg fSwKICAgIHsKQEAgLTM3Myw3ICszNzMsNyBAQCBzaW1jdGxfanNvbl9vdXRwdXQgPSAiIiJ7CiAg ICAgIHsKICAgICAgICAic3RhdGUiIDogIlNodXRkb3duIiwKICAgICAgICAiYXZhaWxhYmlsaXR5 IiA6ICIoYXZhaWxhYmxlKSIsCi0gICAgICAgIm5hbWUiIDogImlQaG9uZSBTRSIsCisgICAgICAg Im5hbWUiIDogImlQaG9uZSBTRSAoMXN0IGdlbmVyYXRpb24pIiwKICAgICAgICAidWRpZCIgOiAi REI0NkQwREItNTEwRS00OTI4LUJEQjQtMUEwMTkyRUQ0QTM4IgogICAgICB9LAogICAgICB7Cg== 398896 2020-05-08 15:09:57 -0700 2020-05-08 15:56:52 -0700 Patch for landing bug-211642-20200508150955.patch text/plain 7126 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2MTQxOCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI1IEBACisyMDIwLTA1LTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogJ2lQaG9uZSBTRScgc2hvdWxkIG1hdGNoICdpUGhvbmUg U0UgMXN0IGdlbmVyYXRpb24nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTE2NDIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtcy82Mjk4NjI0Mj4KKwor ICAgICAgICBSdWJiZXItc3RhbXBlZCBieSBBYWthc2ggSmFpbi4KKworICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkveGNvZGUvZGV2aWNlX3R5cGUucHk6CisgICAgICAgIChEZXZpY2VUeXBlKToK KyAgICAgICAgKERldmljZVR5cGUuc3RhbmRhcmRpemVkX2hhcmR3YXJlX3R5cGUpOiBTdHJpcCAn MXN0IGdlbmVyYXRpb24nIGZyb20gbW9kZWxzLgorICAgICAgICAoRGV2aWNlVHlwZS5fX2VxX18p OiBVc2Ugc3RhbmRhcmRpemVkIGhhcmR3YXJlIHR5cGUuCisgICAgICAgIChEZXZpY2VUeXBlLl9f Y29udGFpbnNfXyk6IERpdHRvLgorICAgICAgICAoRGV2aWNlVHlwZS5fX2hhc2hfXyk6IERpdHRv LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkveGNvZGUvZGV2aWNlX3R5cGVfdW5pdHRlc3Qu cHk6CisgICAgICAgIChEZXZpY2VUeXBlVGVzdCk6CisgICAgICAgIChEZXZpY2VUeXBlVGVzdC50 ZXN0X2dlbmVyYXRpb25fbWF0Y2hpbmcpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkveGNv ZGUvc2ltdWxhdGVkX2RldmljZS5weToKKyAgICAgICAgKFNpbXVsYXRlZERldmljZU1hbmFnZXIu X2dldF9kZXZpY2VfaWRlbnRpZmllcl9mb3JfdHlwZSk6IEhhbmRsZSBjYXNlIHdoZXJlIHRoZSBy ZXF1ZXN0cyBtb2RlbCBkb2VzIG5vdAorICAgICAgICBlbmQgd2l0aCAnKDFzdCBnZW5lcmF0aW9u KScsIGJ1dCB0aGUgc2ltY3RsIG1vZGVsIGRvZXMuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS94Y29kZS9zaW11bGF0ZWRfZGV2aWNlX3VuaXR0ZXN0LnB5OgorCiAyMDIwLTA1LTA4ICBSeWFu IEhhZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUuY29tPgogCiAgICAgICAgIFRlc3RXZWJLaXRBUEku V2ViS2l0LkFsbG93c0NvbnRlbnRKYXZhU2NyaXB0IGZhaWxzIG9uIGlQYWQgc2ltdWxhdG9yCklu ZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL2RldmljZV90eXBlLnB5Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUvZGV2aWNlX3R5cGUucHkJKHJldmlz aW9uIDI2MTQxMCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUvZGV2aWNlX3R5cGUu cHkJKHdvcmtpbmcgY29weSkKQEAgLTI2LDYgKzI2LDcgQEAgZnJvbSB3ZWJraXRweS5wb3J0LmNv bmZpZyBpbXBvcnQgYXBwbGVfYQogCiAjIFRoaXMgY2xhc3MgaXMgZGVzaWduZWQgdG8gbWF0Y2gg ZGV2aWNlIHR5cGVzLiBCZWNhdXNlIGl0IGlzIHVzZWQgZm9yIG1hdGNoaW5nLCAnTm9uZScgaXMg dHJlYXRlZCBhcyBhIHdpbGQtY2FyZC4KIGNsYXNzIERldmljZVR5cGUob2JqZWN0KToKKyAgICBG SVJTVF9HRU5FUkFUSU9OID0gJyAoMXN0IGdlbmVyYXRpb24pJwogCiAgICAgQGNsYXNzbWV0aG9k CiAgICAgZGVmIGZyb21fc3RyaW5nKGNscywgZGV2aWNlX3N0cmluZywgdmVyc2lvbj1Ob25lKToK QEAgLTEwOCw2ICsxMDksMTUgQEAgY2xhc3MgRGV2aWNlVHlwZShvYmplY3QpOgogICAgICAgICBz ZWxmLl9kZWZpbmVfc29mdHdhcmVfdmFyaWFudF9mcm9tX2hhcmR3YXJlX2ZhbWlseSgpCiAgICAg ICAgIHNlbGYuY2hlY2tfY29uc2lzdGVuY3koKQogCisgICAgQHByb3BlcnR5CisgICAgZGVmIHN0 YW5kYXJkaXplZF9oYXJkd2FyZV90eXBlKHNlbGYpOgorICAgICAgICBpZiBub3Qgc2VsZi5oYXJk d2FyZV90eXBlOgorICAgICAgICAgICAgcmV0dXJuIE5vbmUKKworICAgICAgICBpZiBzZWxmLmhh cmR3YXJlX3R5cGUubG93ZXIoKS5lbmRzd2l0aChzZWxmLkZJUlNUX0dFTkVSQVRJT04pOgorICAg ICAgICAgICAgcmV0dXJuIHNlbGYuaGFyZHdhcmVfdHlwZVs6LWxlbihzZWxmLkZJUlNUX0dFTkVS QVRJT04pXQorICAgICAgICByZXR1cm4gc2VsZi5oYXJkd2FyZV90eXBlCisKICAgICBkZWYgX19z dHJfXyhzZWxmKToKICAgICAgICAgdmVyc2lvbiA9IE5vbmUKICAgICAgICAgaWYgc2VsZi5zb2Z0 d2FyZV92ZXJzaW9uIGFuZCBhcHBsZV9hZGRpdGlvbnMoKToKQEAgLTEyNiw3ICsxMzYsNyBAQCBj bGFzcyBEZXZpY2VUeXBlKG9iamVjdCk6CiAgICAgICAgIGFzc2VydCBpc2luc3RhbmNlKG90aGVy LCBEZXZpY2VUeXBlKQogICAgICAgICBpZiBzZWxmLmhhcmR3YXJlX2ZhbWlseSBpcyBub3QgTm9u ZSBhbmQgb3RoZXIuaGFyZHdhcmVfZmFtaWx5IGlzIG5vdCBOb25lIGFuZCBzZWxmLmhhcmR3YXJl X2ZhbWlseS5sb3dlcigpICE9IG90aGVyLmhhcmR3YXJlX2ZhbWlseS5sb3dlcigpOgogICAgICAg ICAgICAgcmV0dXJuIEZhbHNlCi0gICAgICAgIGlmIHNlbGYuaGFyZHdhcmVfdHlwZSBpcyBub3Qg Tm9uZSBhbmQgb3RoZXIuaGFyZHdhcmVfdHlwZSBpcyBub3QgTm9uZSBhbmQgc2VsZi5oYXJkd2Fy ZV90eXBlLmxvd2VyKCkgIT0gb3RoZXIuaGFyZHdhcmVfdHlwZS5sb3dlcigpOgorICAgICAgICBp ZiBzZWxmLnN0YW5kYXJkaXplZF9oYXJkd2FyZV90eXBlIGlzIG5vdCBOb25lIGFuZCBvdGhlci5z dGFuZGFyZGl6ZWRfaGFyZHdhcmVfdHlwZSBpcyBub3QgTm9uZSBhbmQgc2VsZi5zdGFuZGFyZGl6 ZWRfaGFyZHdhcmVfdHlwZS5sb3dlcigpICE9IG90aGVyLnN0YW5kYXJkaXplZF9oYXJkd2FyZV90 eXBlLmxvd2VyKCk6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKICAgICAgICAgaWYgc2VsZi5z b2Z0d2FyZV92YXJpYW50IGlzIG5vdCBOb25lIGFuZCBvdGhlci5zb2Z0d2FyZV92YXJpYW50IGlz IG5vdCBOb25lIGFuZCBzZWxmLnNvZnR3YXJlX3ZhcmlhbnQubG93ZXIoKSAhPSBvdGhlci5zb2Z0 d2FyZV92YXJpYW50Lmxvd2VyKCk6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKQEAgLTEzOCw3 ICsxNDgsNyBAQCBjbGFzcyBEZXZpY2VUeXBlKG9iamVjdCk6CiAgICAgICAgIGFzc2VydCBpc2lu c3RhbmNlKG90aGVyLCBEZXZpY2VUeXBlKQogICAgICAgICBpZiBzZWxmLmhhcmR3YXJlX2ZhbWls eSBpcyBub3QgTm9uZSBhbmQgKG5vdCBvdGhlci5oYXJkd2FyZV9mYW1pbHkgb3Igc2VsZi5oYXJk d2FyZV9mYW1pbHkubG93ZXIoKSAhPSBvdGhlci5oYXJkd2FyZV9mYW1pbHkubG93ZXIoKSk6CiAg ICAgICAgICAgICByZXR1cm4gRmFsc2UKLSAgICAgICAgaWYgc2VsZi5oYXJkd2FyZV90eXBlIGlz IG5vdCBOb25lIGFuZCAobm90IG90aGVyLmhhcmR3YXJlX3R5cGUgb3Igc2VsZi5oYXJkd2FyZV90 eXBlLmxvd2VyKCkgIT0gb3RoZXIuaGFyZHdhcmVfdHlwZS5sb3dlcigpKToKKyAgICAgICAgaWYg c2VsZi5zdGFuZGFyZGl6ZWRfaGFyZHdhcmVfdHlwZSBpcyBub3QgTm9uZSBhbmQgKG5vdCBvdGhl ci5zdGFuZGFyZGl6ZWRfaGFyZHdhcmVfdHlwZSBvciBzZWxmLnN0YW5kYXJkaXplZF9oYXJkd2Fy ZV90eXBlLmxvd2VyKCkgIT0gb3RoZXIuc3RhbmRhcmRpemVkX2hhcmR3YXJlX3R5cGUubG93ZXIo KSk6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKICAgICAgICAgaWYgc2VsZi5zb2Z0d2FyZV92 YXJpYW50IGlzIG5vdCBOb25lIGFuZCAobm90IG90aGVyLnNvZnR3YXJlX3ZhcmlhbnQgb3Igc2Vs Zi5zb2Z0d2FyZV92YXJpYW50Lmxvd2VyKCkgIT0gb3RoZXIuc29mdHdhcmVfdmFyaWFudC5sb3dl cigpKToKICAgICAgICAgICAgIHJldHVybiBGYWxzZQpAQCAtMTQ3LDQgKzE1Nyw0IEBAIGNsYXNz IERldmljZVR5cGUob2JqZWN0KToKICAgICAgICAgcmV0dXJuIFRydWUKIAogICAgIGRlZiBfX2hh c2hfXyhzZWxmKToKLSAgICAgICAgcmV0dXJuIGhhc2goKHNlbGYuaGFyZHdhcmVfZmFtaWx5LCBz ZWxmLmhhcmR3YXJlX3R5cGUsIHNlbGYuc29mdHdhcmVfdmFyaWFudCwgc2VsZi5zb2Z0d2FyZV92 ZXJzaW9uKSkKKyAgICAgICAgcmV0dXJuIGhhc2goKHNlbGYuaGFyZHdhcmVfZmFtaWx5LCBzZWxm LnN0YW5kYXJkaXplZF9oYXJkd2FyZV90eXBlLCBzZWxmLnNvZnR3YXJlX3ZhcmlhbnQsIHNlbGYu c29mdHdhcmVfdmVyc2lvbikpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL2Rl dmljZV90eXBlX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkveGNvZGUvZGV2aWNlX3R5cGVfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI2MTQxMCkKKysrIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUvZGV2aWNlX3R5cGVfdW5pdHRlc3QucHkJKHdvcmtp bmcgY29weSkKQEAgLTE1OCwzICsxNTgsOCBAQCBjbGFzcyBEZXZpY2VUeXBlVGVzdCh1bml0dGVz dC5UZXN0Q2FzZSk6CiAKICAgICBkZWYgdGVzdF91bm1hcHBlZF92ZXJzaW9uKHNlbGYpOgogICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKCdpUGhvbmUgcnVubmluZyBpT1MnLCBzdHIoRGV2aWNlVHlw ZS5mcm9tX3N0cmluZygnaVBob25lJywgVmVyc2lvbig5KSkpKQorCisgICAgZGVmIHRlc3RfZ2Vu ZXJhdGlvbl9tYXRjaGluZyhzZWxmKToKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChEZXZpY2VU eXBlLmZyb21fc3RyaW5nKCdpUGhvbmUgU0UgKDFzdCBnZW5lcmF0aW9uKScpLnN0YW5kYXJkaXpl ZF9oYXJkd2FyZV90eXBlLCAnU0UnKQorICAgICAgICBzZWxmLmFzc2VydFRydWUoRGV2aWNlVHlw ZS5mcm9tX3N0cmluZygnaVBob25lIFNFJykgPT0gRGV2aWNlVHlwZS5mcm9tX3N0cmluZygnaVBo b25lIFNFICgxc3QgZ2VuZXJhdGlvbiknKSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKERldmlj ZVR5cGUuZnJvbV9zdHJpbmcoJ2lQaG9uZSBTRScpICE9IERldmljZVR5cGUuZnJvbV9zdHJpbmco J2lQaG9uZSBTRSAoMm5kIGdlbmVyYXRpb24pJykpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtp dHB5L3hjb2RlL3NpbXVsYXRlZF9kZXZpY2UucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0 cy93ZWJraXRweS94Y29kZS9zaW11bGF0ZWRfZGV2aWNlLnB5CShyZXZpc2lvbiAyNjE0MTApCisr KyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRlZF9kZXZpY2UucHkJKHdvcmtp bmcgY29weSkKQEAgLTI0OSw4ICsyNDksMTEgQEAgY2xhc3MgU2ltdWxhdGVkRGV2aWNlTWFuYWdl cihvYmplY3QpOgogCiAgICAgQHN0YXRpY21ldGhvZAogICAgIGRlZiBfZ2V0X2RldmljZV9pZGVu dGlmaWVyX2Zvcl90eXBlKGRldmljZV90eXBlKToKKyAgICAgICAgdHlwZV9uYW1lX2Zvcl9yZXF1 ZXN0ID0gdSd7fSB7fScuZm9ybWF0KGRldmljZV90eXBlLmhhcmR3YXJlX2ZhbWlseS5sb3dlcigp LCBkZXZpY2VfdHlwZS5zdGFuZGFyZGl6ZWRfaGFyZHdhcmVfdHlwZS5sb3dlcigpKQogICAgICAg ICBmb3IgdHlwZV9pZCwgdHlwZV9uYW1lIGluIFNpbXVsYXRlZERldmljZU1hbmFnZXIuX2Rldmlj ZV9pZGVudGlmaWVyX3RvX25hbWUuaXRlbXMoKToKLSAgICAgICAgICAgIGlmIHR5cGVfbmFtZS5s b3dlcigpID09IHUne30ge30nLmZvcm1hdChkZXZpY2VfdHlwZS5oYXJkd2FyZV9mYW1pbHkubG93 ZXIoKSwgZGV2aWNlX3R5cGUuaGFyZHdhcmVfdHlwZS5sb3dlcigpKToKKyAgICAgICAgICAgIGlm IHR5cGVfbmFtZS5sb3dlcigpID09IHR5cGVfbmFtZV9mb3JfcmVxdWVzdDoKKyAgICAgICAgICAg ICAgICByZXR1cm4gdHlwZV9pZAorICAgICAgICAgICAgaWYgdHlwZV9uYW1lLmxvd2VyKCkuZW5k c3dpdGgoRGV2aWNlVHlwZS5GSVJTVF9HRU5FUkFUSU9OKSBhbmQgdHlwZV9uYW1lLmxvd2VyKClb Oi1sZW4oRGV2aWNlVHlwZS5GSVJTVF9HRU5FUkFUSU9OKV0gPT0gdHlwZV9uYW1lX2Zvcl9yZXF1 ZXN0OgogICAgICAgICAgICAgICAgIHJldHVybiB0eXBlX2lkCiAgICAgICAgIHJldHVybiBOb25l CiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUvc2ltdWxhdGVkX2RldmljZV91 bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3Np bXVsYXRlZF9kZXZpY2VfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI2MTQxMCkKKysrIFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkveGNvZGUvc2ltdWxhdGVkX2RldmljZV91bml0dGVzdC5weQkod29ya2lu ZyBjb3B5KQpAQCAtNjcsNyArNjcsNyBAQCBzaW1jdGxfanNvbl9vdXRwdXQgPSAiIiJ7CiAgICAg ICJpZGVudGlmaWVyIiA6ICJjb20uYXBwbGUuQ29yZVNpbXVsYXRvci5TaW1EZXZpY2VUeXBlLmlQ aG9uZS04LVBsdXMiCiAgICB9LAogICAgewotICAgICAibmFtZSIgOiAiaVBob25lIFNFIiwKKyAg ICAgIm5hbWUiIDogImlQaG9uZSBTRSAoMXN0IGdlbmVyYXRpb24pIiwKICAgICAgImlkZW50aWZp ZXIiIDogImNvbS5hcHBsZS5Db3JlU2ltdWxhdG9yLlNpbURldmljZVR5cGUuaVBob25lLVNFIgog ICAgfSwKICAgIHsKQEAgLTM3Myw3ICszNzMsNyBAQCBzaW1jdGxfanNvbl9vdXRwdXQgPSAiIiJ7 CiAgICAgIHsKICAgICAgICAic3RhdGUiIDogIlNodXRkb3duIiwKICAgICAgICAiYXZhaWxhYmls aXR5IiA6ICIoYXZhaWxhYmxlKSIsCi0gICAgICAgIm5hbWUiIDogImlQaG9uZSBTRSIsCisgICAg ICAgIm5hbWUiIDogImlQaG9uZSBTRSAoMXN0IGdlbmVyYXRpb24pIiwKICAgICAgICAidWRpZCIg OiAiREI0NkQwREItNTEwRS00OTI4LUJEQjQtMUEwMTkyRUQ0QTM4IgogICAgICB9LAogICAgICB7 Cg==