206061 2020-01-10 04:53:01 -0800 [GTK][WPE] EWS should not wipe the JHBuild in the unapply patch step 2020-01-10 11:37:12 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=202361 InRadar P2 Normal --- 1 clopez clopez aakash_jain ap bugs-noreply dbates dpino ews-watchlist glenn jbedard psaavedra slewis webkit-bug-importer oldest_to_newest 1605073 0 clopez 2020-01-10 04:53:01 -0800 When a patch fails to build or pass tests, the EWS unapplies the patch and tries to run the build or tests again without the patch. The issue is that to unapply the patch, the EWS its currently calling Tools/Scripts/clean-webkit, which wipes everything. That means that the JHBuild (step InstallGtkDependencies) has to be rebuilt from scratch and that its expensive (around 30 minutes even with ccache). The JHBuild scripts already have logic to detect when they should wipe the JHBuild (if a patch touches the moduleset). Ideally we should not be wiping the JHBuild for GTK and WPE to avoid having to rebuild it after unapplying the patch. 1605106 1 387336 clopez 2020-01-10 08:05:04 -0800 Created attachment 387336 Patch 1605108 2 387338 clopez 2020-01-10 08:13:36 -0800 Created attachment 387338 Patch typo fix 1605179 3 387338 aakash_jain 2020-01-10 10:26:20 -0800 Comment on attachment 387338 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=387338&action=review > Tools/BuildSlaveSupport/ews-build/steps.py:174 > + self.setCommand(self.command + ['--keep-jhbuild-directory']) Please add following line at the end of this start method: return shell.ShellCommand.start(self) This will also fix the unit-tests. > Tools/Scripts/clean-webkit:48 > + if fs.isdir("WebKitBuild"): Would this path work if the script is invoked from another directory? 1605205 4 clopez 2020-01-10 11:03:06 -0800 (In reply to Aakash Jain from comment #3) > Comment on attachment 387338 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=387338&action=review > > > Tools/BuildSlaveSupport/ews-build/steps.py:174 > > + self.setCommand(self.command + ['--keep-jhbuild-directory']) > > Please add following line at the end of this start method: > return shell.ShellCommand.start(self) > > This will also fix the unit-tests. > ups, sure. > > Tools/Scripts/clean-webkit:48 > > + if fs.isdir("WebKitBuild"): > > Would this path work if the script is invoked from another directory? Yes and no... The current clean-webkit script its not prepared to be ran outside of the main directory. For example, if you run: cd Tools/Scripts && ./clean-webkit Then the script only cleans the files inside the dir Tools/Scripts/ And if you run from another directory (for example from /tmp) it fails completely (python backtrace) So the clean-webkit script doesn't seem at all prepared to be ran from other directory than the main one, and this patch doesn't change that. 1605206 5 387355 clopez 2020-01-10 11:04:46 -0800 Created attachment 387355 Patch Add missing return shell.ShellCommand.start(self) 1605214 6 387355 clopez 2020-01-10 11:36:31 -0800 Comment on attachment 387355 Patch Clearing flags on attachment: 387355 Committed r254359: <https://trac.webkit.org/changeset/254359> 1605215 7 clopez 2020-01-10 11:36:36 -0800 All reviewed patches have been landed. Closing bug. 1605216 8 webkit-bug-importer 2020-01-10 11:37:12 -0800 <rdar://problem/58485543> 387336 2020-01-10 08:05:04 -0800 2020-01-10 08:13:15 -0800 Patch bug-206061-20200110170503.patch text/plain 6092 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MzM5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjlmMTIyYzUzZjI1NWEwYmY1NDgzNTJlYjk2NGFhOTQ0 ZTI1ZWY2OS4uNTllODcxYzFiOTg2MzQzOWU5NjE4YTNiOThjNWZmNWIxNDM2YjczYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDIwLTAxLTEwICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtHVEtdW1dQRV0gRVdTIHNob3VsZCBub3Qgd2lwZSB0aGUgSkhC dWlsZCBpbiB0aGUgdW5hcHBseSBwYXRjaCBzdGVwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDYwNjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY3VycmVudCB1bmFwcGx5IHBhdGNoIHN0ZXAgb24g dGhlIEVXUyBjYWxscyB0aGUgc2NyaXB0IGNsZWFuLXdlYmtpdCwgd2hpY2ggd2lwZXMgZXZlcnl0 aGluZy4KKyAgICAgICAgUmVidWlsZGluZyB0aGUgSkhCdWlsZCB0YWtlcyBhcm91bmQgMzAgbWlu dXRlcywgZXZlbiB3aXRoIGNjYWNoZS4KKyAgICAgICAgQW5kIGl0cyBub3QgbmVlZGVkIHRvIHdp cGUgdGhlIEpIQnVpbGQgZGlyZWN0b3JpZXMgb24gdGhlIGNsZWFuLXdlYmtpdCBzdGVwLCBiZWNh dXNlIHRoZSBXZWJLaXQKKyAgICAgICAgdG9vbGluZyBmb3IgYnVpbGRpbmcgdGhlIEpIQnVpbGQg KHVwZGF0ZS13ZWJraXRndGstbGlicykgYWxyZWFkeSBkZXRlY3RzIHdoZW4gdGhlIG1vZHVsZXNl dCBoYQorICAgICAgICBiZWVuIG1vZGlmaWVkIGFuZCB3aXBlcyBpdCB3aGVuIG5lY2Vzc2FyeS4K KworICAgICAgICBUaGlzIHBhdGNoIGFkZHMgdGhlIG9wdGlvbmFsIGFyZ3VtZW50IC0ta2VlcC1q aGJ1aWxkLWRpcmVjdG9yeSB0byB0aGUgc2NyaXB0IGNsZWFuLXdlYmtpdCwKKyAgICAgICAgdGhh dCB0aGUgRVdTIHdpbGwgcGFzcyB3aGVuIGRvaW5nIHRoZSB1bmFwcGx5IHBhdGNoIHN0ZXAgZm9y IHBsYXRmb3JtIEdUSyBvciBXUEUuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3Mt YnVpbGQvc3RlcHMucHk6CisgICAgICAgIChDbGVhbldvcmtpbmdEaXJlY3Rvcnkuc3RhcnQpOgor ICAgICAgICAqIFNjcmlwdHMvY2xlYW4td2Via2l0OgorICAgICAgICAobWFpbik6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weToKKyAgICAgICAg KFNDTS5kaXNjYXJkX3VudHJhY2tlZF9maWxlcyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5weToKKwogMjAyMC0wMS0xMCAgQWRy aWFuIFBlcmV6IGRlIENhc3RybyAgPGFwZXJlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtGbGF0 cGFrXSBVcGRhdGUgSWNlQ0MgdG8gdmVyc2lvbiAxLjIKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weSBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2V3cy1idWlsZC9zdGVwcy5weQppbmRleCA0N2NiMmE0MzUzNjk4NjRlMzQ4ZmFkZmQ4ZTczYjk0 MGViOWEyMGQyLi40MzhkNGNiMDg0OGMxZmI0OGRhYzAzNjYxY2U1MjcyMzg3ZTJhNWZmIDEwMDY0 NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKKysrIGIv VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CkBAIC0xNjgsNiArMTY4 LDExIEBAIGNsYXNzIENsZWFuV29ya2luZ0RpcmVjdG9yeShzaGVsbC5TaGVsbENvbW1hbmQpOgog ICAgIGRlZiBfX2luaXRfXyhzZWxmLCAqKmt3YXJncyk6CiAgICAgICAgIHN1cGVyKENsZWFuV29y a2luZ0RpcmVjdG9yeSwgc2VsZikuX19pbml0X18obG9nRW52aXJvbj1GYWxzZSwgKiprd2FyZ3Mp CiAKKyAgICBkZWYgc3RhcnQoc2VsZik6CisgICAgICAgIHBsYXRmb3JtID0gc2VsZi5nZXRQcm9w ZXJ0eSgncGxhdGZvcm0nKQorICAgICAgICBpZiBwbGF0Zm9ybSBpbiAoJ2d0aycsICd3cGUnKToK KyAgICAgICAgICAgIHNlbGYuc2V0Q29tbWFuZChzZWxmLmNvbW1hbmQgKyBbJy0ta2VlcC1qaGJ1 aWxkLWRpcmVjdG9yeSddKQorCiAKIGNsYXNzIFVwZGF0ZVdvcmtpbmdEaXJlY3Rvcnkoc2hlbGwu U2hlbGxDb21tYW5kKToKICAgICBuYW1lID0gJ3VwZGF0ZS13b3JraW5nLWRpcmVjdG9yeScKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvY2xlYW4td2Via2l0IGIvVG9vbHMvU2NyaXB0cy9jbGVh bi13ZWJraXQKaW5kZXggMGE1NDE2NmZkYTVlMDJmOWE0NmMwYzk5YzY2ODRiNTQ3MzFmNjM0NS4u MzhmNTFhY2I5M2VkMjUwY2MxYjQzZjBjNDNkNzBlYzc2NTA0NWM1NCAxMDA3NTUKLS0tIGEvVG9v bHMvU2NyaXB0cy9jbGVhbi13ZWJraXQKKysrIGIvVG9vbHMvU2NyaXB0cy9jbGVhbi13ZWJraXQK QEAgLTI4LDE5ICsyOCwzOSBAQAogIyBTVUNIIERBTUFHRS4KIAogaW1wb3J0IHN5cworaW1wb3J0 IGFyZ3BhcnNlCiAKIGZyb20gd2Via2l0cHkuY29tbW9uLmNoZWNrb3V0LnNjbS5kZXRlY3Rpb24g aW1wb3J0IFNDTURldGVjdG9yCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5ob3N0IGltcG9ydCBIb3N0 CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZmlsZXN5c3RlbSBpbXBvcnQgRmlsZVN5c3Rl bQogCiAKLWRlZiBtYWluKCk6CitkZWYgbWFpbihhcmdzKToKICAgICBmcyA9IEZpbGVTeXN0ZW0o KQogICAgIGhvc3QgPSBIb3N0KCkKICAgICBzY20gPSBTQ01EZXRlY3RvcihmcywgaG9zdC5leGVj dXRpdmUpLmRldGVjdF9zY21fc3lzdGVtKGZzLmdldGN3ZCgpKQotICAgIAorCiAgICAgc2NtLmRp c2NhcmRfd29ya2luZ19kaXJlY3RvcnlfY2hhbmdlcygpCi0gICAgc2NtLmRpc2NhcmRfdW50cmFj a2VkX2ZpbGVzKGRpc2NhcmRfaWdub3JlZF9maWxlcz1UcnVlKQogCisgICAgaWYgYXJncy5rZWVw X2poYnVpbGRfZGlyZWN0b3J5OgorICAgICAgICAjIENsZWFuIGV2ZXJ5dGhpbmcgaW5zaWRlIFdl YktpdEJ1aWxkLCBleGNlcHQgdGhlIEpIQnVpbGQgZGlyZWN0b3JpZXMuCisgICAgICAgIHNjbS5k aXNjYXJkX3VudHJhY2tlZF9maWxlcyhkaXNjYXJkX2lnbm9yZWRfZmlsZXM9VHJ1ZSwga2VlcF93 ZWJraXRidWlsZF9kaXJlY3Rvcnk9VHJ1ZSkKKyAgICAgICAgaWYgZnMuaXNkaXIoIldlYktpdEJ1 aWxkIik6CisgICAgICAgICAgICBmb3IgYnVpbGRfZGlyIGluIGZzLmxpc3RkaXIoIldlYktpdEJ1 aWxkIik6CisgICAgICAgICAgICAgICAgYnVpbGRfcGF0aCA9IGZzLmpvaW4oIldlYktpdEJ1aWxk IiwgYnVpbGRfZGlyKQorICAgICAgICAgICAgICAgIGlmIGZzLmlzZGlyKGJ1aWxkX3BhdGgpOgor ICAgICAgICAgICAgICAgICAgICBpZiBidWlsZF9kaXIgbm90IGluIFsiRGVwZW5kZW5jaWVzR1RL IiwgIkRlcGVuZGVuY2llc1dQRSJdOgorICAgICAgICAgICAgICAgICAgICAgICAgZnMucm10cmVl KGJ1aWxkX3BhdGgpCisgICAgICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICAgICAg ZnMucmVtb3ZlKGJ1aWxkX3BhdGgpCisgICAgZWxzZToKKyAgICAgICAgc2NtLmRpc2NhcmRfdW50 cmFja2VkX2ZpbGVzKGRpc2NhcmRfaWdub3JlZF9maWxlcz1UcnVlKQorCisKK2lmIF9fbmFtZV9f ID09ICJfX21haW5fXyI6CisgICAgcGFyc2VyID0gYXJncGFyc2UuQXJndW1lbnRQYXJzZXIoZGVz Y3JpcHRpb249IkNsZWFuIFdlYktpdCIpCisgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgiLS1rZWVw LWpoYnVpbGQtZGlyZWN0b3J5IiwgYWN0aW9uPSJzdG9yZV90cnVlIiwKKyAgICAgICAgICAgICAg ICAgICAgICAgIGhlbHA9IkRvbid0IHdpcGUgdGhlIEpIQnVpbGQgYnVpbGQgZGlyZWN0b3JpZXMu IikKIAotc3lzLmV4aXQobWFpbigpKQorICAgIGFyZ3MgPSBwYXJzZXIucGFyc2VfYXJncygpCisg ICAgc3lzLmV4aXQobWFpbihhcmdzKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9jaGVja291dC9zY20vc2NtLnB5CmluZGV4IGIyMTgwMTNjY2Q3MTI5M2Q1NjA3ZGMwZmVh YzA2MjVhN2U3NmFjY2IuLjlhOTQzYjRlNTI0MjA2Y2M5MTU0YmJmZTRjODMyYzEzODdiZDdiYzgg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9z Y20ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3Nj bS5weQpAQCAtMjEzLDkgKzIxMywxMSBAQCBjbGFzcyBTQ006CiAgICAgZGVmIHVudHJhY2tlZF9m aWxlcyhzZWxmLCBpbmNsdWRlX2lnbm9yZWRfZmlsZXM9RmFsc2UpOgogICAgICAgICBzZWxmLl9z dWJjbGFzc19tdXN0X2ltcGxlbWVudCgpCiAKLSAgICBkZWYgZGlzY2FyZF91bnRyYWNrZWRfZmls ZXMoc2VsZiwgZGlzY2FyZF9pZ25vcmVkX2ZpbGVzPUZhbHNlKToKKyAgICBkZWYgZGlzY2FyZF91 bnRyYWNrZWRfZmlsZXMoc2VsZiwgZGlzY2FyZF9pZ25vcmVkX2ZpbGVzPUZhbHNlLCBrZWVwX3dl YmtpdGJ1aWxkX2RpcmVjdG9yeT1GYWxzZSk6CiAgICAgICAgIGZvciBmaWxlbmFtZSBpbiBzZWxm LnVudHJhY2tlZF9maWxlcyhkaXNjYXJkX2lnbm9yZWRfZmlsZXMpOgogICAgICAgICAgICAgaWYg c2VsZi5fZmlsZXN5c3RlbS5pc2RpcihmaWxlbmFtZSk6CisgICAgICAgICAgICAgICAgaWYga2Vl cF93ZWJraXRidWlsZF9kaXJlY3RvcnkgYW5kIGZpbGVuYW1lID09ICJXZWJLaXRCdWlsZCI6Cisg ICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAgICAgICAgICAgICAgICAgc2VsZi5fZmlsZXN5 c3RlbS5ybXRyZWUoZmlsZW5hbWUpCiAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAg IHNlbGYuX2ZpbGVzeXN0ZW0ucmVtb3ZlKGZpbGVuYW1lKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHkKaW5k ZXggNzUxZWM5Y2ZhMTQ1ZTgxYTQyMzQxYTUwODZhNWUzYTIyNjU2ODhjYy4uMzI1MzMzZmQxMmEw ZWU4YTZiNjM4OGY1MjQxNzZjNDYyYjY1NWIzOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5CkBAIC0z NTksNiArMzU5LDEzIEBAIGNsYXNzIFNDTVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAg ICBzY20uZGlzY2FyZF91bnRyYWNrZWRfZmlsZXMoZGlzY2FyZF9pZ25vcmVkX2ZpbGVzPVRydWUp CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2NtLnVudHJhY2tlZF9maWxlcyhUcnVlKSwgW10p CiAKKyAgICAgICAgb3MubWtkaXIoIldlYktpdEJ1aWxkIikKKyAgICAgICAgc2VsZi5hc3NlcnRF cXVhbChzY20udW50cmFja2VkX2ZpbGVzKFRydWUpLCBbIldlYktpdEJ1aWxkIl0pCisgICAgICAg IHNjbS5kaXNjYXJkX3VudHJhY2tlZF9maWxlcyhkaXNjYXJkX2lnbm9yZWRfZmlsZXM9VHJ1ZSwg a2VlcF93ZWJraXRidWlsZF9kaXJlY3Rvcnk9VHJ1ZSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChzY20udW50cmFja2VkX2ZpbGVzKFRydWUpLCBbIldlYktpdEJ1aWxkIl0pCisgICAgICAgIHNj bS5kaXNjYXJkX3VudHJhY2tlZF9maWxlcyhkaXNjYXJkX2lnbm9yZWRfZmlsZXM9VHJ1ZSwga2Vl cF93ZWJraXRidWlsZF9kaXJlY3Rvcnk9RmFsc2UpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo c2NtLnVudHJhY2tlZF9maWxlcyhUcnVlKSwgW10pCisKICAgICAgICAgaWYgb3MucGF0aC5pc2Rp cigidGVzdF9kaXJfbmV3Iik6CiAgICAgICAgICAgICBzaHV0aWwucm10cmVlKCJ0ZXN0X2Rpcl9u ZXciKQogICAgICAgICBpZiBvcy5wYXRoLmlzZmlsZSgidGVzdF9maWxlX25ldyIpOgo= 387338 2020-01-10 08:13:36 -0800 2020-01-10 11:04:21 -0800 Patch bug-206061-20200110171335.patch text/plain 6093 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MzM5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjlmMTIyYzUzZjI1NWEwYmY1NDgzNTJlYjk2NGFhOTQ0 ZTI1ZWY2OS4uN2YyOTE1ODBiN2RmZjdmODQzYTQ5OTUxZmZmNzU2MmEzOTE2NzFmOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDIwLTAxLTEwICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtHVEtdW1dQRV0gRVdTIHNob3VsZCBub3Qgd2lwZSB0aGUgSkhC dWlsZCBpbiB0aGUgdW5hcHBseSBwYXRjaCBzdGVwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDYwNjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY3VycmVudCB1bmFwcGx5IHBhdGNoIHN0ZXAgb24g dGhlIEVXUyBjYWxscyB0aGUgc2NyaXB0IGNsZWFuLXdlYmtpdCwgd2hpY2ggd2lwZXMgZXZlcnl0 aGluZy4KKyAgICAgICAgUmVidWlsZGluZyB0aGUgSkhCdWlsZCB0YWtlcyBhcm91bmQgMzAgbWlu dXRlcywgZXZlbiB3aXRoIGNjYWNoZS4KKyAgICAgICAgQW5kIGl0cyBub3QgbmVlZGVkIHRvIHdp cGUgdGhlIEpIQnVpbGQgZGlyZWN0b3JpZXMgb24gdGhlIGNsZWFuLXdlYmtpdCBzdGVwLCBiZWNh dXNlIHRoZSBXZWJLaXQKKyAgICAgICAgdG9vbGluZyBmb3IgYnVpbGRpbmcgdGhlIEpIQnVpbGQg KHVwZGF0ZS13ZWJraXRndGstbGlicykgYWxyZWFkeSBkZXRlY3RzIHdoZW4gdGhlIG1vZHVsZXNl dCBoYXMKKyAgICAgICAgYmVlbiBtb2RpZmllZCBhbmQgd2lwZXMgaXQgd2hlbiBuZWNlc3Nhcnku CisKKyAgICAgICAgVGhpcyBwYXRjaCBhZGRzIHRoZSBvcHRpb25hbCBhcmd1bWVudCAtLWtlZXAt amhidWlsZC1kaXJlY3RvcnkgdG8gdGhlIHNjcmlwdCBjbGVhbi13ZWJraXQsCisgICAgICAgIHRo YXQgdGhlIEVXUyB3aWxsIHBhc3Mgd2hlbiBkb2luZyB0aGUgdW5hcHBseSBwYXRjaCBzdGVwIGZv ciBwbGF0Zm9ybSBHVEsgb3IgV1BFLgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdz LWJ1aWxkL3N0ZXBzLnB5OgorICAgICAgICAoQ2xlYW5Xb3JraW5nRGlyZWN0b3J5LnN0YXJ0KToK KyAgICAgICAgKiBTY3JpcHRzL2NsZWFuLXdlYmtpdDoKKyAgICAgICAgKG1haW4pOgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHk6CisgICAgICAg IChTQ00uZGlzY2FyZF91bnRyYWNrZWRfZmlsZXMpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHk6CisKIDIwMjAtMDEtMTAgIEFk cmlhbiBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBbRmxh dHBha10gVXBkYXRlIEljZUNDIHRvIHZlcnNpb24gMS4yCmRpZmYgLS1naXQgYS9Ub29scy9CdWls ZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9y dC9ld3MtYnVpbGQvc3RlcHMucHkKaW5kZXggNDdjYjJhNDM1MzY5ODY0ZTM0OGZhZGZkOGU3M2I5 NDBlYjlhMjBkMi4uNDM4ZDRjYjA4NDhjMWZiNDhkYWMwMzY2MWNlNTI3MjM4N2UyYTVmZiAxMDA2 NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CisrKyBi L1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQpAQCAtMTY4LDYgKzE2 OCwxMSBAQCBjbGFzcyBDbGVhbldvcmtpbmdEaXJlY3Rvcnkoc2hlbGwuU2hlbGxDb21tYW5kKToK ICAgICBkZWYgX19pbml0X18oc2VsZiwgKiprd2FyZ3MpOgogICAgICAgICBzdXBlcihDbGVhbldv cmtpbmdEaXJlY3RvcnksIHNlbGYpLl9faW5pdF9fKGxvZ0Vudmlyb249RmFsc2UsICoqa3dhcmdz KQogCisgICAgZGVmIHN0YXJ0KHNlbGYpOgorICAgICAgICBwbGF0Zm9ybSA9IHNlbGYuZ2V0UHJv cGVydHkoJ3BsYXRmb3JtJykKKyAgICAgICAgaWYgcGxhdGZvcm0gaW4gKCdndGsnLCAnd3BlJyk6 CisgICAgICAgICAgICBzZWxmLnNldENvbW1hbmQoc2VsZi5jb21tYW5kICsgWyctLWtlZXAtamhi dWlsZC1kaXJlY3RvcnknXSkKKwogCiBjbGFzcyBVcGRhdGVXb3JraW5nRGlyZWN0b3J5KHNoZWxs LlNoZWxsQ29tbWFuZCk6CiAgICAgbmFtZSA9ICd1cGRhdGUtd29ya2luZy1kaXJlY3RvcnknCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2NsZWFuLXdlYmtpdCBiL1Rvb2xzL1NjcmlwdHMvY2xl YW4td2Via2l0CmluZGV4IDBhNTQxNjZmZGE1ZTAyZjlhNDZjMGM5OWM2Njg0YjU0NzMxZjYzNDUu LjM4ZjUxYWNiOTNlZDI1MGNjMWI0M2YwYzQzZDcwZWM3NjUwNDVjNTQgMTAwNzU1Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvY2xlYW4td2Via2l0CisrKyBiL1Rvb2xzL1NjcmlwdHMvY2xlYW4td2Via2l0 CkBAIC0yOCwxOSArMjgsMzkgQEAKICMgU1VDSCBEQU1BR0UuCiAKIGltcG9ydCBzeXMKK2ltcG9y dCBhcmdwYXJzZQogCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5jaGVja291dC5zY20uZGV0ZWN0aW9u IGltcG9ydCBTQ01EZXRlY3RvcgogZnJvbSB3ZWJraXRweS5jb21tb24uaG9zdCBpbXBvcnQgSG9z dAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmZpbGVzeXN0ZW0gaW1wb3J0IEZpbGVTeXN0 ZW0KIAogCi1kZWYgbWFpbigpOgorZGVmIG1haW4oYXJncyk6CiAgICAgZnMgPSBGaWxlU3lzdGVt KCkKICAgICBob3N0ID0gSG9zdCgpCiAgICAgc2NtID0gU0NNRGV0ZWN0b3IoZnMsIGhvc3QuZXhl Y3V0aXZlKS5kZXRlY3Rfc2NtX3N5c3RlbShmcy5nZXRjd2QoKSkKLSAgICAKKwogICAgIHNjbS5k aXNjYXJkX3dvcmtpbmdfZGlyZWN0b3J5X2NoYW5nZXMoKQotICAgIHNjbS5kaXNjYXJkX3VudHJh Y2tlZF9maWxlcyhkaXNjYXJkX2lnbm9yZWRfZmlsZXM9VHJ1ZSkKIAorICAgIGlmIGFyZ3Mua2Vl cF9qaGJ1aWxkX2RpcmVjdG9yeToKKyAgICAgICAgIyBDbGVhbiBldmVyeXRoaW5nIGluc2lkZSBX ZWJLaXRCdWlsZCwgZXhjZXB0IHRoZSBKSEJ1aWxkIGRpcmVjdG9yaWVzLgorICAgICAgICBzY20u ZGlzY2FyZF91bnRyYWNrZWRfZmlsZXMoZGlzY2FyZF9pZ25vcmVkX2ZpbGVzPVRydWUsIGtlZXBf d2Via2l0YnVpbGRfZGlyZWN0b3J5PVRydWUpCisgICAgICAgIGlmIGZzLmlzZGlyKCJXZWJLaXRC dWlsZCIpOgorICAgICAgICAgICAgZm9yIGJ1aWxkX2RpciBpbiBmcy5saXN0ZGlyKCJXZWJLaXRC dWlsZCIpOgorICAgICAgICAgICAgICAgIGJ1aWxkX3BhdGggPSBmcy5qb2luKCJXZWJLaXRCdWls ZCIsIGJ1aWxkX2RpcikKKyAgICAgICAgICAgICAgICBpZiBmcy5pc2RpcihidWlsZF9wYXRoKToK KyAgICAgICAgICAgICAgICAgICAgaWYgYnVpbGRfZGlyIG5vdCBpbiBbIkRlcGVuZGVuY2llc0dU SyIsICJEZXBlbmRlbmNpZXNXUEUiXToKKyAgICAgICAgICAgICAgICAgICAgICAgIGZzLnJtdHJl ZShidWlsZF9wYXRoKQorICAgICAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgICAg IGZzLnJlbW92ZShidWlsZF9wYXRoKQorICAgIGVsc2U6CisgICAgICAgIHNjbS5kaXNjYXJkX3Vu dHJhY2tlZF9maWxlcyhkaXNjYXJkX2lnbm9yZWRfZmlsZXM9VHJ1ZSkKKworCitpZiBfX25hbWVf XyA9PSAiX19tYWluX18iOgorICAgIHBhcnNlciA9IGFyZ3BhcnNlLkFyZ3VtZW50UGFyc2VyKGRl c2NyaXB0aW9uPSJDbGVhbiBXZWJLaXQiKQorICAgIHBhcnNlci5hZGRfYXJndW1lbnQoIi0ta2Vl cC1qaGJ1aWxkLWRpcmVjdG9yeSIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsCisgICAgICAgICAgICAg ICAgICAgICAgICBoZWxwPSJEb24ndCB3aXBlIHRoZSBKSEJ1aWxkIGJ1aWxkIGRpcmVjdG9yaWVz LiIpCiAKLXN5cy5leGl0KG1haW4oKSkKKyAgICBhcmdzID0gcGFyc2VyLnBhcnNlX2FyZ3MoKQor ICAgIHN5cy5leGl0KG1haW4oYXJncykpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vY2hlY2tvdXQvc2NtL3NjbS5weQppbmRleCBiMjE4MDEzY2NkNzEyOTNkNTYwN2RjMGZl YWMwNjI1YTdlNzZhY2NiLi45YTk0M2I0ZTUyNDIwNmNjOTE1NGJiZmU0YzgzMmMxMzg3YmQ3YmM4 IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20v c2NtLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9z Y20ucHkKQEAgLTIxMyw5ICsyMTMsMTEgQEAgY2xhc3MgU0NNOgogICAgIGRlZiB1bnRyYWNrZWRf ZmlsZXMoc2VsZiwgaW5jbHVkZV9pZ25vcmVkX2ZpbGVzPUZhbHNlKToKICAgICAgICAgc2VsZi5f c3ViY2xhc3NfbXVzdF9pbXBsZW1lbnQoKQogCi0gICAgZGVmIGRpc2NhcmRfdW50cmFja2VkX2Zp bGVzKHNlbGYsIGRpc2NhcmRfaWdub3JlZF9maWxlcz1GYWxzZSk6CisgICAgZGVmIGRpc2NhcmRf dW50cmFja2VkX2ZpbGVzKHNlbGYsIGRpc2NhcmRfaWdub3JlZF9maWxlcz1GYWxzZSwga2VlcF93 ZWJraXRidWlsZF9kaXJlY3Rvcnk9RmFsc2UpOgogICAgICAgICBmb3IgZmlsZW5hbWUgaW4gc2Vs Zi51bnRyYWNrZWRfZmlsZXMoZGlzY2FyZF9pZ25vcmVkX2ZpbGVzKToKICAgICAgICAgICAgIGlm IHNlbGYuX2ZpbGVzeXN0ZW0uaXNkaXIoZmlsZW5hbWUpOgorICAgICAgICAgICAgICAgIGlmIGtl ZXBfd2Via2l0YnVpbGRfZGlyZWN0b3J5IGFuZCBmaWxlbmFtZSA9PSAiV2ViS2l0QnVpbGQiOgor ICAgICAgICAgICAgICAgICAgICBjb250aW51ZQogICAgICAgICAgICAgICAgIHNlbGYuX2ZpbGVz eXN0ZW0ucm10cmVlKGZpbGVuYW1lKQogICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAg ICBzZWxmLl9maWxlc3lzdGVtLnJlbW92ZShmaWxlbmFtZSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5Cmlu ZGV4IDc1MWVjOWNmYTE0NWU4MWE0MjM0MWE1MDg2YTVlM2EyMjY1Njg4Y2MuLjMyNTMzM2ZkMTJh MGVlOGE2YjYzODhmNTI0MTc2YzQ2MmI2NTViMzggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHkKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5weQpAQCAt MzU5LDYgKzM1OSwxMyBAQCBjbGFzcyBTQ01UZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAg ICAgc2NtLmRpc2NhcmRfdW50cmFja2VkX2ZpbGVzKGRpc2NhcmRfaWdub3JlZF9maWxlcz1UcnVl KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNjbS51bnRyYWNrZWRfZmlsZXMoVHJ1ZSksIFtd KQogCisgICAgICAgIG9zLm1rZGlyKCJXZWJLaXRCdWlsZCIpCisgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoc2NtLnVudHJhY2tlZF9maWxlcyhUcnVlKSwgWyJXZWJLaXRCdWlsZCJdKQorICAgICAg ICBzY20uZGlzY2FyZF91bnRyYWNrZWRfZmlsZXMoZGlzY2FyZF9pZ25vcmVkX2ZpbGVzPVRydWUs IGtlZXBfd2Via2l0YnVpbGRfZGlyZWN0b3J5PVRydWUpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoc2NtLnVudHJhY2tlZF9maWxlcyhUcnVlKSwgWyJXZWJLaXRCdWlsZCJdKQorICAgICAgICBz Y20uZGlzY2FyZF91bnRyYWNrZWRfZmlsZXMoZGlzY2FyZF9pZ25vcmVkX2ZpbGVzPVRydWUsIGtl ZXBfd2Via2l0YnVpbGRfZGlyZWN0b3J5PUZhbHNlKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFs KHNjbS51bnRyYWNrZWRfZmlsZXMoVHJ1ZSksIFtdKQorCiAgICAgICAgIGlmIG9zLnBhdGguaXNk aXIoInRlc3RfZGlyX25ldyIpOgogICAgICAgICAgICAgc2h1dGlsLnJtdHJlZSgidGVzdF9kaXJf bmV3IikKICAgICAgICAgaWYgb3MucGF0aC5pc2ZpbGUoInRlc3RfZmlsZV9uZXciKToK 387355 2020-01-10 11:04:46 -0800 2020-01-10 11:36:31 -0800 Patch bug-206061-20200110200445.patch text/plain 6140 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MzM5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjlmMTIyYzUzZjI1NWEwYmY1NDgzNTJlYjk2NGFhOTQ0 ZTI1ZWY2OS4uN2YyOTE1ODBiN2RmZjdmODQzYTQ5OTUxZmZmNzU2MmEzOTE2NzFmOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDIwLTAxLTEwICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtHVEtdW1dQRV0gRVdTIHNob3VsZCBub3Qgd2lwZSB0aGUgSkhC dWlsZCBpbiB0aGUgdW5hcHBseSBwYXRjaCBzdGVwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDYwNjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY3VycmVudCB1bmFwcGx5IHBhdGNoIHN0ZXAgb24g dGhlIEVXUyBjYWxscyB0aGUgc2NyaXB0IGNsZWFuLXdlYmtpdCwgd2hpY2ggd2lwZXMgZXZlcnl0 aGluZy4KKyAgICAgICAgUmVidWlsZGluZyB0aGUgSkhCdWlsZCB0YWtlcyBhcm91bmQgMzAgbWlu dXRlcywgZXZlbiB3aXRoIGNjYWNoZS4KKyAgICAgICAgQW5kIGl0cyBub3QgbmVlZGVkIHRvIHdp cGUgdGhlIEpIQnVpbGQgZGlyZWN0b3JpZXMgb24gdGhlIGNsZWFuLXdlYmtpdCBzdGVwLCBiZWNh dXNlIHRoZSBXZWJLaXQKKyAgICAgICAgdG9vbGluZyBmb3IgYnVpbGRpbmcgdGhlIEpIQnVpbGQg KHVwZGF0ZS13ZWJraXRndGstbGlicykgYWxyZWFkeSBkZXRlY3RzIHdoZW4gdGhlIG1vZHVsZXNl dCBoYXMKKyAgICAgICAgYmVlbiBtb2RpZmllZCBhbmQgd2lwZXMgaXQgd2hlbiBuZWNlc3Nhcnku CisKKyAgICAgICAgVGhpcyBwYXRjaCBhZGRzIHRoZSBvcHRpb25hbCBhcmd1bWVudCAtLWtlZXAt amhidWlsZC1kaXJlY3RvcnkgdG8gdGhlIHNjcmlwdCBjbGVhbi13ZWJraXQsCisgICAgICAgIHRo YXQgdGhlIEVXUyB3aWxsIHBhc3Mgd2hlbiBkb2luZyB0aGUgdW5hcHBseSBwYXRjaCBzdGVwIGZv ciBwbGF0Zm9ybSBHVEsgb3IgV1BFLgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdz LWJ1aWxkL3N0ZXBzLnB5OgorICAgICAgICAoQ2xlYW5Xb3JraW5nRGlyZWN0b3J5LnN0YXJ0KToK KyAgICAgICAgKiBTY3JpcHRzL2NsZWFuLXdlYmtpdDoKKyAgICAgICAgKG1haW4pOgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHk6CisgICAgICAg IChTQ00uZGlzY2FyZF91bnRyYWNrZWRfZmlsZXMpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHk6CisKIDIwMjAtMDEtMTAgIEFk cmlhbiBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBbRmxh dHBha10gVXBkYXRlIEljZUNDIHRvIHZlcnNpb24gMS4yCmRpZmYgLS1naXQgYS9Ub29scy9CdWls ZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9y dC9ld3MtYnVpbGQvc3RlcHMucHkKaW5kZXggNDdjYjJhNDM1MzY5ODY0ZTM0OGZhZGZkOGU3M2I5 NDBlYjlhMjBkMi4uODNkMzdhMzg1ZTM1ZmQyN2UzYTNlYjU2NjFkMzEyNzRiOWY3ZTNhNCAxMDA2 NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CisrKyBi L1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQpAQCAtMTY4LDYgKzE2 OCwxMiBAQCBjbGFzcyBDbGVhbldvcmtpbmdEaXJlY3Rvcnkoc2hlbGwuU2hlbGxDb21tYW5kKToK ICAgICBkZWYgX19pbml0X18oc2VsZiwgKiprd2FyZ3MpOgogICAgICAgICBzdXBlcihDbGVhbldv cmtpbmdEaXJlY3RvcnksIHNlbGYpLl9faW5pdF9fKGxvZ0Vudmlyb249RmFsc2UsICoqa3dhcmdz KQogCisgICAgZGVmIHN0YXJ0KHNlbGYpOgorICAgICAgICBwbGF0Zm9ybSA9IHNlbGYuZ2V0UHJv cGVydHkoJ3BsYXRmb3JtJykKKyAgICAgICAgaWYgcGxhdGZvcm0gaW4gKCdndGsnLCAnd3BlJyk6 CisgICAgICAgICAgICBzZWxmLnNldENvbW1hbmQoc2VsZi5jb21tYW5kICsgWyctLWtlZXAtamhi dWlsZC1kaXJlY3RvcnknXSkKKyAgICAgICAgcmV0dXJuIHNoZWxsLlNoZWxsQ29tbWFuZC5zdGFy dChzZWxmKQorCiAKIGNsYXNzIFVwZGF0ZVdvcmtpbmdEaXJlY3Rvcnkoc2hlbGwuU2hlbGxDb21t YW5kKToKICAgICBuYW1lID0gJ3VwZGF0ZS13b3JraW5nLWRpcmVjdG9yeScKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvY2xlYW4td2Via2l0IGIvVG9vbHMvU2NyaXB0cy9jbGVhbi13ZWJraXQK aW5kZXggMGE1NDE2NmZkYTVlMDJmOWE0NmMwYzk5YzY2ODRiNTQ3MzFmNjM0NS4uMzhmNTFhY2I5 M2VkMjUwY2MxYjQzZjBjNDNkNzBlYzc2NTA0NWM1NCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0 cy9jbGVhbi13ZWJraXQKKysrIGIvVG9vbHMvU2NyaXB0cy9jbGVhbi13ZWJraXQKQEAgLTI4LDE5 ICsyOCwzOSBAQAogIyBTVUNIIERBTUFHRS4KIAogaW1wb3J0IHN5cworaW1wb3J0IGFyZ3BhcnNl CiAKIGZyb20gd2Via2l0cHkuY29tbW9uLmNoZWNrb3V0LnNjbS5kZXRlY3Rpb24gaW1wb3J0IFND TURldGVjdG9yCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5ob3N0IGltcG9ydCBIb3N0CiBmcm9tIHdl YmtpdHB5LmNvbW1vbi5zeXN0ZW0uZmlsZXN5c3RlbSBpbXBvcnQgRmlsZVN5c3RlbQogCiAKLWRl ZiBtYWluKCk6CitkZWYgbWFpbihhcmdzKToKICAgICBmcyA9IEZpbGVTeXN0ZW0oKQogICAgIGhv c3QgPSBIb3N0KCkKICAgICBzY20gPSBTQ01EZXRlY3RvcihmcywgaG9zdC5leGVjdXRpdmUpLmRl dGVjdF9zY21fc3lzdGVtKGZzLmdldGN3ZCgpKQotICAgIAorCiAgICAgc2NtLmRpc2NhcmRfd29y a2luZ19kaXJlY3RvcnlfY2hhbmdlcygpCi0gICAgc2NtLmRpc2NhcmRfdW50cmFja2VkX2ZpbGVz KGRpc2NhcmRfaWdub3JlZF9maWxlcz1UcnVlKQogCisgICAgaWYgYXJncy5rZWVwX2poYnVpbGRf ZGlyZWN0b3J5OgorICAgICAgICAjIENsZWFuIGV2ZXJ5dGhpbmcgaW5zaWRlIFdlYktpdEJ1aWxk LCBleGNlcHQgdGhlIEpIQnVpbGQgZGlyZWN0b3JpZXMuCisgICAgICAgIHNjbS5kaXNjYXJkX3Vu dHJhY2tlZF9maWxlcyhkaXNjYXJkX2lnbm9yZWRfZmlsZXM9VHJ1ZSwga2VlcF93ZWJraXRidWls ZF9kaXJlY3Rvcnk9VHJ1ZSkKKyAgICAgICAgaWYgZnMuaXNkaXIoIldlYktpdEJ1aWxkIik6Cisg ICAgICAgICAgICBmb3IgYnVpbGRfZGlyIGluIGZzLmxpc3RkaXIoIldlYktpdEJ1aWxkIik6Cisg ICAgICAgICAgICAgICAgYnVpbGRfcGF0aCA9IGZzLmpvaW4oIldlYktpdEJ1aWxkIiwgYnVpbGRf ZGlyKQorICAgICAgICAgICAgICAgIGlmIGZzLmlzZGlyKGJ1aWxkX3BhdGgpOgorICAgICAgICAg ICAgICAgICAgICBpZiBidWlsZF9kaXIgbm90IGluIFsiRGVwZW5kZW5jaWVzR1RLIiwgIkRlcGVu ZGVuY2llc1dQRSJdOgorICAgICAgICAgICAgICAgICAgICAgICAgZnMucm10cmVlKGJ1aWxkX3Bh dGgpCisgICAgICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICAgICAgZnMucmVtb3Zl KGJ1aWxkX3BhdGgpCisgICAgZWxzZToKKyAgICAgICAgc2NtLmRpc2NhcmRfdW50cmFja2VkX2Zp bGVzKGRpc2NhcmRfaWdub3JlZF9maWxlcz1UcnVlKQorCisKK2lmIF9fbmFtZV9fID09ICJfX21h aW5fXyI6CisgICAgcGFyc2VyID0gYXJncGFyc2UuQXJndW1lbnRQYXJzZXIoZGVzY3JpcHRpb249 IkNsZWFuIFdlYktpdCIpCisgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgiLS1rZWVwLWpoYnVpbGQt ZGlyZWN0b3J5IiwgYWN0aW9uPSJzdG9yZV90cnVlIiwKKyAgICAgICAgICAgICAgICAgICAgICAg IGhlbHA9IkRvbid0IHdpcGUgdGhlIEpIQnVpbGQgYnVpbGQgZGlyZWN0b3JpZXMuIikKIAotc3lz LmV4aXQobWFpbigpKQorICAgIGFyZ3MgPSBwYXJzZXIucGFyc2VfYXJncygpCisgICAgc3lzLmV4 aXQobWFpbihhcmdzKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L2NoZWNrb3V0L3NjbS9zY20ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVj a291dC9zY20vc2NtLnB5CmluZGV4IGIyMTgwMTNjY2Q3MTI5M2Q1NjA3ZGMwZmVhYzA2MjVhN2U3 NmFjY2IuLjlhOTQzYjRlNTI0MjA2Y2M5MTU0YmJmZTRjODMyYzEzODdiZDdiYzggMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weQpAQCAt MjEzLDkgKzIxMywxMSBAQCBjbGFzcyBTQ006CiAgICAgZGVmIHVudHJhY2tlZF9maWxlcyhzZWxm LCBpbmNsdWRlX2lnbm9yZWRfZmlsZXM9RmFsc2UpOgogICAgICAgICBzZWxmLl9zdWJjbGFzc19t dXN0X2ltcGxlbWVudCgpCiAKLSAgICBkZWYgZGlzY2FyZF91bnRyYWNrZWRfZmlsZXMoc2VsZiwg ZGlzY2FyZF9pZ25vcmVkX2ZpbGVzPUZhbHNlKToKKyAgICBkZWYgZGlzY2FyZF91bnRyYWNrZWRf ZmlsZXMoc2VsZiwgZGlzY2FyZF9pZ25vcmVkX2ZpbGVzPUZhbHNlLCBrZWVwX3dlYmtpdGJ1aWxk X2RpcmVjdG9yeT1GYWxzZSk6CiAgICAgICAgIGZvciBmaWxlbmFtZSBpbiBzZWxmLnVudHJhY2tl ZF9maWxlcyhkaXNjYXJkX2lnbm9yZWRfZmlsZXMpOgogICAgICAgICAgICAgaWYgc2VsZi5fZmls ZXN5c3RlbS5pc2RpcihmaWxlbmFtZSk6CisgICAgICAgICAgICAgICAgaWYga2VlcF93ZWJraXRi dWlsZF9kaXJlY3RvcnkgYW5kIGZpbGVuYW1lID09ICJXZWJLaXRCdWlsZCI6CisgICAgICAgICAg ICAgICAgICAgIGNvbnRpbnVlCiAgICAgICAgICAgICAgICAgc2VsZi5fZmlsZXN5c3RlbS5ybXRy ZWUoZmlsZW5hbWUpCiAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAgIHNlbGYuX2Zp bGVzeXN0ZW0ucmVtb3ZlKGZpbGVuYW1lKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHkKaW5kZXggNzUxZWM5 Y2ZhMTQ1ZTgxYTQyMzQxYTUwODZhNWUzYTIyNjU2ODhjYy4uMzI1MzMzZmQxMmEwZWU4YTZiNjM4 OGY1MjQxNzZjNDYyYjY1NWIzOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5CkBAIC0zNTksNiArMzU5 LDEzIEBAIGNsYXNzIFNDTVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzY20uZGlz Y2FyZF91bnRyYWNrZWRfZmlsZXMoZGlzY2FyZF9pZ25vcmVkX2ZpbGVzPVRydWUpCiAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwoc2NtLnVudHJhY2tlZF9maWxlcyhUcnVlKSwgW10pCiAKKyAgICAg ICAgb3MubWtkaXIoIldlYktpdEJ1aWxkIikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzY20u dW50cmFja2VkX2ZpbGVzKFRydWUpLCBbIldlYktpdEJ1aWxkIl0pCisgICAgICAgIHNjbS5kaXNj YXJkX3VudHJhY2tlZF9maWxlcyhkaXNjYXJkX2lnbm9yZWRfZmlsZXM9VHJ1ZSwga2VlcF93ZWJr aXRidWlsZF9kaXJlY3Rvcnk9VHJ1ZSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzY20udW50 cmFja2VkX2ZpbGVzKFRydWUpLCBbIldlYktpdEJ1aWxkIl0pCisgICAgICAgIHNjbS5kaXNjYXJk X3VudHJhY2tlZF9maWxlcyhkaXNjYXJkX2lnbm9yZWRfZmlsZXM9VHJ1ZSwga2VlcF93ZWJraXRi dWlsZF9kaXJlY3Rvcnk9RmFsc2UpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2NtLnVudHJh Y2tlZF9maWxlcyhUcnVlKSwgW10pCisKICAgICAgICAgaWYgb3MucGF0aC5pc2RpcigidGVzdF9k aXJfbmV3Iik6CiAgICAgICAgICAgICBzaHV0aWwucm10cmVlKCJ0ZXN0X2Rpcl9uZXciKQogICAg ICAgICBpZiBvcy5wYXRoLmlzZmlsZSgidGVzdF9maWxlX25ldyIpOgo=