75857 2012-01-09 07:35:00 -0800 GTK+ EWS needs to run update-webkitgtk-libs after applying a patch 2012-01-17 11:19:58 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 gustavo gustavo abarth eric ojan ossy webkit.review.bot oldest_to_newest 532195 0 gustavo 2012-01-09 07:35:00 -0800 GTK+ EWS needs to run update-webkitgtk-libs after applying a patch 532198 1 121672 gustavo 2012-01-09 07:41:01 -0800 Created attachment 121672 Patch 532203 2 gustavo 2012-01-09 07:54:43 -0800 We need something like this for our EWS. I don't know the python tools code well, so I made this patch to get feedback on how we should go about implementing this from you EWS masters =) 532239 3 121672 abarth 2012-01-09 09:30:16 -0800 Comment on attachment 121672 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121672&action=review > Tools/Scripts/webkitpy/tool/bot/earlywarningsystemtask.py:79 > +class GtkEarlyWarningSystemTask(EarlyWarningSystemTask): > + def _buid(self): > + path = os.path.join(os.dirname(self._tool.path), 'update-webkitgtk-libs') > + self._tool.executive.run_command([path]) > + EarlyWarningSystemTask._build() This isn't the right approach. Port-specific logic should be in the Port classes: http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/ports.py Really, you should consider making this part of "update-webkit --gtk", maybe with some extra command line flag. 533821 4 gustavo 2012-01-11 05:33:50 -0800 > http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/ports.py > > Really, you should consider making this part of "update-webkit --gtk", maybe with some extra command line flag. Is that run after the patch has been applied? What we'd like to have is running that command after applying the patch and before build. Would making it part of update-webkit --gtk give us that? If not, do you have another approach to recommend? Thanks! 533998 5 abarth 2012-01-11 10:19:41 -0800 Ah, I understand. The Chromium port has a similar issue. If you look at: http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/ports.py#L239 you see that we pass --update-chromium to build-webkit. That causes build-webkit to make sure everything is updated properly. You might want to add a --update-gtk flag that's similar. 536499 6 gustavo 2012-01-16 05:28:47 -0800 (In reply to comment #5) > Ah, I understand. The Chromium port has a similar issue. If you look at: > > http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/ports.py#L239 > > you see that we pass --update-chromium to build-webkit. That causes build-webkit to make sure everything is updated properly. You might want to add a --update-gtk flag that's similar. Aha, thanks Adam, that's a great idea! I'll get an updated patch up later today =) 536706 7 122673 gustavo 2012-01-16 12:22:08 -0800 Created attachment 122673 Patch 536952 8 122673 abarth 2012-01-17 01:14:47 -0800 Comment on attachment 122673 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=122673&action=review > Tools/Scripts/webkitdirs.pm:1843 > + system "rm", "-rf", "$dir"; That's scary! 537019 9 gustavo 2012-01-17 04:29:54 -0800 Committed r105142: <http://trac.webkit.org/changeset/105142> 537068 10 ossy 2012-01-17 06:41:52 -0800 It broke a python unittest: FAIL: test_gtk_port (webkitpy.common.config.ports_unittest.WebKitPortTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/ramdisk/qt-linux-release/build/Tools/Scripts/webkitpy/common/config/ports_unittest.py", line 54, in test_gtk_port self.assertEquals(GtkPort.build_webkit_command(), WebKitPort.script_shell_command("build-webkit") + ["--gtk", WebKitPort.makeArgs()]) AssertionError: ['Tools/Scripts/build-webkit', '--gtk', '--update-gtk', '--makeargs="-j16"'] != ['Tools/Scripts/build-webkit', '--gtk', '--makeargs="-j16"'] 537220 11 gustavo 2012-01-17 11:19:58 -0800 Oops, I pushed a fix for this already, sorry for the noise, I forgot to check for unit tests =( 121672 2012-01-09 07:41:01 -0800 2012-01-16 12:22:01 -0800 Patch bug-75857-20120109134038.patch text/plain 3503 gustavo U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0NDU4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWVjYjZkZmViOTAxZjI1NTE4YWQ0Y2ZkMzVlZTRhODFi MDdkOWE0ZS4uZjgxYTc4ZjYxZTQwMTU1ZWRlMmQ5NzIxZjNjZDAxMzA4NTY3NTJlYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDEyLTAxLTA5ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxnbnNAZ25vbWUub3JnPgor CisgICAgICAgIEdUSysgRVdTIG5lZWRzIHRvIHJ1biB1cGRhdGUtd2Via2l0Z3RrLWxpYnMgYWZ0 ZXIgYXBwbHlpbmcgYSBwYXRjaAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NzU4NTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvZWFybHl3YXJuaW5nc3lzdGVt dGFzay5weToKKyAgICAgICAgKEVhcmx5V2FybmluZ1N5c3RlbVRhc2sucnVuKToKKyAgICAgICAg KEd0a0Vhcmx5V2FybmluZ1N5c3RlbVRhc2spOgorICAgICAgICAoR3RrRWFybHlXYXJuaW5nU3lz dGVtVGFzay5fYnVpZCk6CisKIDIwMTItMDEtMDkgIEFsZXhhbmRlciBGw6Zyw7h5ICA8YWhmQDB4 OTAuZGs+CiAKICAgICAgICAgW1F0XSBBZGQgc3VwcG9ydCBmb3IgZHluYW1pY2FsbHkgZW5hYmxp bmcgYW5kIGRpc2FibGluZyB0b3VjaCBtb2NraW5nIGluIHRoZSBRdCBNaW5pQnJvd3NlcgpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9lYXJseXdhcm5pbmdzeXN0 ZW10YXNrLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9lYXJseXdhcm5pbmdz eXN0ZW10YXNrLnB5CmluZGV4IDY1YTcxYTcwMTY0NDhhOTgwMmZlN2IyNzJhMjY0MDVmNjdjNGFk OTAuLjQ1NmE4ZWU1YTBlM2FhNTk5MmU1NjIwMGZkMmVmZGUxMGY4NDVkMDUgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvZWFybHl3YXJuaW5nc3lzdGVtdGFzay5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L2Vhcmx5d2FybmluZ3N5c3Rl bXRhc2sucHkKQEAgLTcwLDMgKzcwLDEwIEBAIGNsYXNzIEVhcmx5V2FybmluZ1N5c3RlbVRhc2so UGF0Y2hBbmFseXNpc1Rhc2spOgogICAgICAgICBpZiBub3Qgc2VsZi5fc2hvdWxkX3J1bl90ZXN0 czoKICAgICAgICAgICAgIHJldHVybiBUcnVlCiAgICAgICAgIHJldHVybiBzZWxmLl90ZXN0X3Bh dGNoKCkKKworCitjbGFzcyBHdGtFYXJseVdhcm5pbmdTeXN0ZW1UYXNrKEVhcmx5V2FybmluZ1N5 c3RlbVRhc2spOgorICAgIGRlZiBfYnVpZChzZWxmKToKKyAgICAgICAgcGF0aCA9IG9zLnBhdGgu am9pbihvcy5kaXJuYW1lKHNlbGYuX3Rvb2wucGF0aCksICd1cGRhdGUtd2Via2l0Z3RrLWxpYnMn KQorICAgICAgICBzZWxmLl90b29sLmV4ZWN1dGl2ZS5ydW5fY29tbWFuZChbcGF0aF0pCisgICAg ICAgIEVhcmx5V2FybmluZ1N5c3RlbVRhc2suX2J1aWxkKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0ZW0ucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZWFybHl3YXJuaW5nc3lzdGVtLnB5Cmlu ZGV4IDMzODE0OWI2ZDMxNjAxMDk4NDU1YjMzOWJhZmNkZWI0ZjY3NzljMDIuLjBkYTQzODFjOGNk MDY3OWE5ZDE4OTA3NDUxMGYyMGI2OWRmOTVkYjggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0ZW0ucHkKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Vhcmx5d2FybmluZ3N5c3RlbS5weQpAQCAt MzMsNyArMzMsNyBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9y dCBTY3JpcHRFcnJvcgogZnJvbSB3ZWJraXRweS50b29sLmJvdC5leHBlY3RlZGZhaWx1cmVzIGlt cG9ydCBFeHBlY3RlZEZhaWx1cmVzCiBmcm9tIHdlYmtpdHB5LnRvb2wuYm90LmxheW91dHRlc3Ry ZXN1bHRzcmVhZGVyIGltcG9ydCBMYXlvdXRUZXN0UmVzdWx0c1JlYWRlcgogZnJvbSB3ZWJraXRw eS50b29sLmJvdC5xdWV1ZWVuZ2luZSBpbXBvcnQgUXVldWVFbmdpbmUKLWZyb20gd2Via2l0cHku dG9vbC5ib3QuZWFybHl3YXJuaW5nc3lzdGVtdGFzayBpbXBvcnQgRWFybHlXYXJuaW5nU3lzdGVt VGFzaywgRWFybHlXYXJuaW5nU3lzdGVtVGFza0RlbGVnYXRlLCBVbmFibGVUb0FwcGx5UGF0Y2gK K2Zyb20gd2Via2l0cHkudG9vbC5ib3QuZWFybHl3YXJuaW5nc3lzdGVtdGFzayBpbXBvcnQgRWFy bHlXYXJuaW5nU3lzdGVtVGFzaywgRWFybHlXYXJuaW5nU3lzdGVtVGFza0RlbGVnYXRlLCBHdGtF YXJseVdhcm5pbmdTeXN0ZW1UYXNrLCBVbmFibGVUb0FwcGx5UGF0Y2gKIGZyb20gd2Via2l0cHku dG9vbC5jb21tYW5kcy5xdWV1ZXMgaW1wb3J0IEFic3RyYWN0UmV2aWV3UXVldWUKIAogCkBAIC03 Miw4ICs3MiwxMSBAQCBjbGFzcyBBYnN0cmFjdEVhcmx5V2FybmluZ1N5c3RlbShBYnN0cmFjdFJl dmlld1F1ZXVlLCBFYXJseVdhcm5pbmdTeXN0ZW1UYXNrRGVsZQogICAgICAgICAgICAgdG9vbC5i dWdzLmFkZF9jY190b19idWcocGF0Y2guYnVnX2lkKCksIHNlbGYud2F0Y2hlcnMpCiAgICAgICAg IHRvb2wuYnVncy5zZXRfZmxhZ19vbl9hdHRhY2htZW50KHBhdGNoLmlkKCksICJjb21taXQtcXVl dWUiLCAiLSIsIG1lc3NhZ2UsIGV4dHJhX21lc3NhZ2VfdGV4dCkKIAorICAgIGRlZiBfY3JlYXRl X3Rhc2soc2VsZiwgcGF0Y2gpOgorICAgICAgICByZXR1cm4gRWFybHlXYXJuaW5nU3lzdGVtVGFz ayhzZWxmLCBwYXRjaCwgc2VsZi5fcnVuX3Rlc3RzKQorCiAgICAgZGVmIHJldmlld19wYXRjaChz ZWxmLCBwYXRjaCk6Ci0gICAgICAgIHRhc2sgPSBFYXJseVdhcm5pbmdTeXN0ZW1UYXNrKHNlbGYs IHBhdGNoLCBzZWxmLl9ydW5fdGVzdHMpCisgICAgICAgIHRhc2sgPSBzZWxmLl9jcmVhdGVfdGFz ayhwYXRjaCkKICAgICAgICAgaWYgbm90IHRhc2sudmFsaWRhdGUoKToKICAgICAgICAgICAgIHNl bGYuX2RpZF9lcnJvcihwYXRjaCwgIiVzIGRpZCBub3QgcHJvY2VzcyBwYXRjaC4iICUgc2VsZi5u YW1lKQogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCkBAIC0xNDIsNiArMTQ1LDkgQEAgY2xhc3Mg R3RrRVdTKEFic3RyYWN0RWFybHlXYXJuaW5nU3lzdGVtKToKICAgICAgICAgInhhbi5sb3BlekBn bWFpbC5jb20iLAogICAgIF0KIAorICAgIGRlZiBfY3JlYXRlX3Rhc2soc2VsZiwgcGF0Y2gpOgor ICAgICAgICByZXR1cm4gR3RrRWFybHlXYXJuaW5nU3lzdGVtVGFzayhzZWxmLCBwYXRjaCwgc2Vs Zi5fcnVuX3Rlc3RzKQorCiAKIGNsYXNzIEVmbEVXUyhBYnN0cmFjdEVhcmx5V2FybmluZ1N5c3Rl bSk6CiAgICAgbmFtZSA9ICJlZmwtZXdzIgo= 122673 2012-01-16 12:22:08 -0800 2012-01-17 01:14:47 -0800 Patch bug-75857-20120116182128.patch text/plain 3397 gustavo U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1MDcxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjFiYjJjNGNlZGQ1ZWZhMjg1ZGQxYzY1MzEyYzg5ODIw YjlhMTZmYS4uOTRkNjJkNGMyMDcxMWYxMTY1M2YyZjNkYjdkMTRjYmU0ZjIzZmVjMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDEyLTAxLTE2ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxndXN0YXZvLm5vcm9uaGFA Y29sbGFib3JhLmNvbT4KKworICAgICAgICBHVEsrIEVXUyBuZWVkcyB0byBydW4gdXBkYXRlLXdl YmtpdGd0ay1saWJzIGFmdGVyIGFwcGx5aW5nIGEgcGF0Y2gKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1ODU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAg ICAgIChidWlsZEF1dG90b29sc1Byb2plY3QpOiBtb3ZlIGNsZWFuaW5nIHRoZSBidWlsZCB0byBo YXBwZW4gZWFybHksCisgICAgICAgIGFuZCBoYW5kbGUgLS11cGRhdGUtZ3RrIHJpZ2h0IGFmdGVy IHRoYXQKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHMucHk6 CisgICAgICAgIChHdGtQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKTogcGFzcyAtLXVwZGF0ZS1n dGsgYXMgYW4gb3B0aW9uIHRvCisgICAgICAgIGJ1aWxkLXdlYmtpdCwgc28gdGhhdCBpdCBpcyB1 c2VkIGluIHRoZSBFV1MKKwogMjAxMi0wMS0xNiAgUmFwaGFlbCBLdWJvIGRhIENvc3RhICA8a3Vi b0Bwcm9mdXNpb24ubW9iaT4KIAogICAgICAgICBVbnJldmlld2VkOyBmaXggdGhlIGJ1aWxkIHdo ZW4gLS1hcy1uZWVkZWQgYW5kIC0tbm8tY29weS1kdC1uZWVkZWQtZW50cmllcyBhcmUgcGFzc2Vk IHRvIHRoZSBsaW5rZXIuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0g Yi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggY2Y4MWMxYTk1NGNhMGNiYmM0MGIx NzdkYmI2OWQ3NGFlNTIyNjYzZS4uZWNmODVlZTZiZjVkNmU1MmNiYWI0Yjk3MmI1MGY5OGI3NzRm MDk5NyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMTgzOCw2ICsxODM4LDI1IEBAIHN1YiBidWlsZEF1 dG90b29sc1Byb2plY3QoJEApCiAgICAgbXkgJGNvbmZpZyA9IHBhc3NlZENvbmZpZ3VyYXRpb24o KSB8fCBjb25maWd1cmF0aW9uKCk7CiAgICAgbXkgJHByZWZpeDsKIAorICAgICMgVXNlIHJtIHRv IGNsZWFuIHRoZSBidWlsZCBkaXJlY3Rvcnkgc2luY2UgZGlzdGNsZWFuIG1heSBtaXNzIGZpbGVz CisgICAgaWYgKCRjbGVhbiAmJiAtZCAkZGlyKSB7CisgICAgICAgIHN5c3RlbSAicm0iLCAiLXJm IiwgIiRkaXIiOworICAgIH0KKworICAgIGlmICghIC1kICRkaXIpIHsKKyAgICAgICAgRmlsZTo6 UGF0aDo6bWtwYXRoKCRkaXIpIG9yIGRpZSAiRmFpbGVkIHRvIGNyZWF0ZSBidWlsZCBkaXJlY3Rv cnkgIiAuICRkaXIKKyAgICB9CisgICAgY2hkaXIgJGRpciBvciBkaWUgIkZhaWxlZCB0byBjZCBp bnRvICIgLiAkZGlyIC4gIlxuIjsKKworICAgIGlmICgkY2xlYW4pIHsKKyAgICAgICAgcmV0dXJu IDA7CisgICAgfQorCisgICAgIyBXZSBtaWdodCBuZWVkIHRvIHVwZGF0ZSBqaGJ1aWxkIGRlcGVu ZGVuY2llcy4KKyAgICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BcnJheVJlZigi LS11cGRhdGUtZ3RrIiwgXEBidWlsZFBhcmFtcykpIHsKKyAgICAgICAgc3lzdGVtKCJwZXJsIiwg IiRzb3VyY2VEaXIvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0Z3RrLWxpYnMiKSA9PSAwIG9y IGRpZSAkITsKKyAgICB9CisKICAgICBteSBAYnVpbGRBcmdzID0gKCk7CiAgICAgbXkgJG1ha2VB cmdzID0gJEVOVnsiV2ViS2l0TWFrZUFyZ3VtZW50cyJ9IHx8ICIiOwogICAgIGZvciBteSAkaSAo MCAuLiAkI2J1aWxkUGFyYW1zKSB7CkBAIC0xODczLDIwICsxODkyLDYgQEAgc3ViIGJ1aWxkQXV0 b3Rvb2xzUHJvamVjdCgkQCkKICAgICAgICAgcHVzaCBAYnVpbGRBcmdzLCAiLS1kaXNhYmxlLWRl YnVnIjsKICAgICB9CiAKLSAgICAjIFVzZSBybSB0byBjbGVhbiB0aGUgYnVpbGQgZGlyZWN0b3J5 IHNpbmNlIGRpc3RjbGVhbiBtYXkgbWlzcyBmaWxlcwotICAgIGlmICgkY2xlYW4gJiYgLWQgJGRp cikgewotICAgICAgICBzeXN0ZW0gInJtIiwgIi1yZiIsICIkZGlyIjsKLSAgICB9Ci0KLSAgICBp ZiAoISAtZCAkZGlyKSB7Ci0gICAgICAgIEZpbGU6OlBhdGg6Om1rcGF0aCgkZGlyKSBvciBkaWUg IkZhaWxlZCB0byBjcmVhdGUgYnVpbGQgZGlyZWN0b3J5ICIgLiAkZGlyCi0gICAgfQotICAgIGNo ZGlyICRkaXIgb3IgZGllICJGYWlsZWQgdG8gY2QgaW50byAiIC4gJGRpciAuICJcbiI7Ci0KLSAg ICBpZiAoJGNsZWFuKSB7Ci0gICAgICAgIHJldHVybiAwOwotICAgIH0KLQogICAgICMgSWYgR05V bWFrZWZpbGUgZXhpc3RzLCBkb24ndCBydW4gYXV0b2dlbi5zaCB1bmxlc3MgaXRzIGFyZ3VtZW50 cwogICAgICMgaGF2ZSBjaGFuZ2VkLiBUaGUgbWFrZWZpbGUgc2hvdWxkIGJlIHNtYXJ0IGVub3Vn aCB0byB0cmFjayBhdXRvdG9vbHMKICAgICAjIGRlcGVuZGVuY2llcyBhbmQgcmUtcnVuIGF1dG9n ZW4uc2ggd2hlbiBidWlsZCBmaWxlcyBjaGFuZ2UuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jb25maWcvcG9ydHMucHkKaW5kZXggM2UxMDBiMDU5MjJhN2ZiZTk1MjEwYWFlN2Fm YjI5Zjg5YWRkY2E2MC4uN2U5NjdmMTBlN2I2YTExMTI0YTNlYzNhYzViNzI2ZDQ0ZmViMmNiMyAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzLnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5weQpAQCAt MTcyLDYgKzE3Miw3IEBAIGNsYXNzIEd0a1BvcnQoV2ViS2l0UG9ydCk6CiAgICAgZGVmIGJ1aWxk X3dlYmtpdF9jb21tYW5kKGNscywgYnVpbGRfc3R5bGU9Tm9uZSk6CiAgICAgICAgIGNvbW1hbmQg PSBXZWJLaXRQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPWJ1aWxkX3N0eWxl KQogICAgICAgICBjb21tYW5kLmFwcGVuZCgiLS1ndGsiKQorICAgICAgICBjb21tYW5kLmFwcGVu ZCgiLS11cGRhdGUtZ3RrIikKICAgICAgICAgY29tbWFuZC5hcHBlbmQoV2ViS2l0UG9ydC5tYWtl QXJncygpKQogICAgICAgICByZXR1cm4gY29tbWFuZAogCg==