61248 2011-05-22 08:42:06 -0700 Replace script_path with script_shell_command 2011-05-23 08:28:24 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified NEW P2 Normal --- 61251 55811 1 paroga paroga abarth aroben eric oldest_to_newest 407639 0 paroga 2011-05-22 08:42:06 -0700 Replace script_path with script_shell_command 407641 1 94344 paroga 2011-05-22 08:55:11 -0700 Created attachment 94344 Patch 407648 2 94344 abarth 2011-05-22 09:20:51 -0700 Comment on attachment 94344 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=94344&action=review > Tools/Scripts/webkitpy/common/checkout/scm/scm.py:94 > + if sys.platform == 'win32': This file shouldn't depend on sys.platform. We're missing some sort of proper abstraction. 407649 3 abarth 2011-05-22 09:21:09 -0700 Also, we're missing tests. 407650 4 paroga 2011-05-22 09:23:00 -0700 (In reply to comment #2) > (From update of attachment 94344 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=94344&action=review > > > Tools/Scripts/webkitpy/common/checkout/scm/scm.py:94 > > + if sys.platform == 'win32': > > This file shouldn't depend on sys.platform. We're missing some sort of proper abstraction. Any good ideas? Where is the correct/best place? 407652 5 94344 abarth 2011-05-22 09:27:59 -0700 Comment on attachment 94344 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=94344&action=review >>> Tools/Scripts/webkitpy/common/checkout/scm/scm.py:94 >>> + if sys.platform == 'win32': >> >> This file shouldn't depend on sys.platform. We're missing some sort of proper abstraction. > > Any good ideas? Where is the correct/best place? It seems like Executive.interpreter_for_script should do that work, possibly with a different name. Instead of having to branch on sys.platform everywhere we use a script, we should have a common abstraction do that for us. 407653 6 abarth 2011-05-22 09:29:17 -0700 http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/ports.py#L45 There's another place we have this branch. It should be moved to the common location also. 407654 7 paroga 2011-05-22 09:29:54 -0700 (In reply to comment #5) > (From update of attachment 94344 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=94344&action=review > > >>> Tools/Scripts/webkitpy/common/checkout/scm/scm.py:94 > >>> + if sys.platform == 'win32': > >> > >> This file shouldn't depend on sys.platform. We're missing some sort of proper abstraction. > > > > Any good ideas? Where is the correct/best place? > > It seems like Executive.interpreter_for_script should do that work, possibly with a different name. Instead of having to branch on sys.platform everywhere we use a script, we should have a common abstraction do that for us. Where? Is Executive the right place? 407658 8 abarth 2011-05-22 09:34:23 -0700 > Where? Is Executive the right place? Dunno. You should apply your design aesthetic and make a decision. 407667 9 94348 paroga 2011-05-22 09:59:10 -0700 Created attachment 94348 Patch 407671 10 94348 abarth 2011-05-22 10:24:59 -0700 Comment on attachment 94348 Patch Looks good, but we need a test. 407675 11 paroga 2011-05-22 10:32:50 -0700 (In reply to comment #10) > (From update of attachment 94348 [details]) > Looks good, but we need a test. Isn't that tested with the apply_patch tests already? 407684 12 abarth 2011-05-22 10:55:30 -0700 > Isn't that tested with the apply_patch tests already? Seemingly not if this is broken on Windows. 407685 13 paroga 2011-05-22 10:57:22 -0700 (In reply to comment #12) > > Isn't that tested with the apply_patch tests already? > > Seemingly not if this is broken on Windows. We do not run the test on native windows at the moment, because the don't work. ;-) 407687 14 abarth 2011-05-22 11:04:49 -0700 > We do not run the test on native windows at the moment, because the don't work. ;-) My point is that unless this change is tested somewhere, I'm likely to break it next time I work on this code. Are we planning to run these tests on native windows? Can we write a test that checks that we're doing the right thing that works on every platform? Presumably we're passing something different to execute, so this should just be a matter of calling the appropriate function with a logging executive. 407690 15 paroga 2011-05-22 11:13:00 -0700 (In reply to comment #14) > > We do not run the test on native windows at the moment, because the don't work. ;-) > > My point is that unless this change is tested somewhere, I'm likely to break it next time I work on this code. Are we planning to run these tests on native windows? Can we write a test that checks that we're doing the right thing that works on every platform? > > Presumably we're passing something different to execute, so this should just be a matter of calling the appropriate function with a logging executive. IMHO that's a chicken-and-egg problem. We can't run the native win32 test, when the don't work and we can't change the code if we don't test it. :-( The master bug for getting rid of cygwin is 48166. We call the script with interpreter only on windows (sys.platform == 'win32'), so we can't test it on other platform if we don't mock sys. I i don't like the idea of mocking sys. We have the same problem at bug 55925 too. 407733 16 abarth 2011-05-22 20:29:35 -0700 Hum... Maybe Eric has an opinion. I definitely think this is valuable work, and I don't want to discourage you. 407931 17 aroben 2011-05-23 06:38:39 -0700 (In reply to comment #15) > We call the script with interpreter only on windows (sys.platform == 'win32'), so we can't test it on other platform if we don't mock sys. I i don't like the idea of mocking sys. Presumably we have code elsewhere that makes platform-dependent decisions. How do we test that code? 407986 18 abarth 2011-05-23 08:28:24 -0700 > Presumably we have code elsewhere that makes platform-dependent decisions. How do we test that code? We have very, very little platform-dependent code. The layout_package has a bunch, which it tests by using a mock platform object. Maybe the best thing to do here is to run test-webkitpy in a non-cygwin configuration with a skipped list and then gradually remove tests from the skipped list as we fix them. That will ensure that we have test coverage. 94344 2011-05-22 08:55:11 -0700 2011-05-22 09:59:02 -0700 Patch bug-61248.patch text/plain 3355 paroga ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiZWMz ZTNiLi42YzBkODE5IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDUtMjIgIFBhdHJpY2sgR2Fuc3RlcmVyICA8 cGFyb2dhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgUmVwbGFjZSBzY3JpcHRfcGF0aCB3aXRoIHNjcmlwdF9zaGVsbF9jb21tYW5k CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTI0OAor CisgICAgICAgIHNjcmlwdF9zaGVsbF9jb21tYW5kIGVtdWxhdGVzIHNoZWJhbmcgb24gV2luMzIu CisgICAgICAgIFNjcmlwdHMgb24gV2luZG93cyB3b3JrIG9ubHkgaWYgdGhleSBhcmUgY2FsbGVk IHdpdGggdGhlIGV4cGxpY2l0IGludGVycHJldGVyLgorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9jb21tb24vY2hlY2tvdXQvY2hlY2tvdXQucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5OgorCiAyMDExLTA1LTIwICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBX ZWluaWcuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291 dC9jaGVja291dC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2No ZWNrb3V0LnB5CmluZGV4IDhmMTdiMDMuLmZiMWIxYjggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoZWNrb3V0LnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoZWNrb3V0LnB5CkBAIC0xNTQsOCArMTU0LDgg QEAgY2xhc3MgQ2hlY2tvdXQob2JqZWN0KToKICAgICBkZWYgYXBwbHlfcGF0Y2goc2VsZiwgcGF0 Y2gsIGZvcmNlPUZhbHNlKToKICAgICAgICAgIyBJdCdzIHBvc3NpYmxlIHRoYXQgdGhlIHBhdGNo IHdhcyBub3QgbWFkZSBmcm9tIHRoZSByb290IGRpcmVjdG9yeS4KICAgICAgICAgIyBXZSBzaG91 bGQgZGV0ZWN0IGFuZCBoYW5kbGUgdGhhdCBjYXNlLgotICAgICAgICAjIEZJWE1FOiBNb3ZlIF9z Y20uc2NyaXB0X3BhdGggaGVyZSBvbmNlIHdlIGdldCByaWQgb2YgYWxsIHRoZSBkZXBlbmRlbmNp ZXMuCi0gICAgICAgIGFyZ3MgPSBbc2VsZi5fc2NtLnNjcmlwdF9wYXRoKCdzdm4tYXBwbHknKV0K KyAgICAgICAgIyBGSVhNRTogTW92ZSBfc2NtLnNjcmlwdF9zaGVsbF9jb21tYW5kIGhlcmUgb25j ZSB3ZSBnZXQgcmlkIG9mIGFsbCB0aGUgZGVwZW5kZW5jaWVzLgorICAgICAgICBhcmdzID0gc2Vs Zi5fc2NtLnNjcmlwdF9zaGVsbF9jb21tYW5kKCdzdm4tYXBwbHknKQogICAgICAgICBpZiBwYXRj aC5yZXZpZXdlcigpOgogICAgICAgICAgICAgYXJncyArPSBbJy0tcmV2aWV3ZXInLCBwYXRjaC5y ZXZpZXdlcigpLmZ1bGxfbmFtZV0KICAgICAgICAgaWYgZm9yY2U6CmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weQppbmRleCBjNGE4YTRkLi42 OTA0N2U2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291 dC9zY20vc2NtLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0 L3NjbS9zY20ucHkKQEAgLTg4LDggKzg4LDE0IEBAIGNsYXNzIFNDTToKICAgICAgICAgcmV0dXJu IG9zLnBhdGguam9pbihzZWxmLmNoZWNrb3V0X3Jvb3QsICJUb29scyIsICJTY3JpcHRzIikKIAog ICAgICMgRklYTUU6IFRoaXMgYmVsb25ncyBpbiBDaGVja291dCwgbm90IFNDTS4KLSAgICBkZWYg c2NyaXB0X3BhdGgoc2VsZiwgc2NyaXB0X25hbWUpOgotICAgICAgICByZXR1cm4gb3MucGF0aC5q b2luKHNlbGYuc2NyaXB0c19kaXJlY3RvcnkoKSwgc2NyaXB0X25hbWUpCisgICAgZGVmIHNjcmlw dF9zaGVsbF9jb21tYW5kKHNlbGYsIHNjcmlwdF9uYW1lKToKKyAgICAgICAgc2NyaXB0X3BhdGgg PSBvcy5wYXRoLmpvaW4oc2VsZi5zY3JpcHRzX2RpcmVjdG9yeSgpLCBzY3JpcHRfbmFtZSkKKyAg ICAgICAgIyBXaW4zMiBkb2VzIG5vdCBzdXBwb3J0IHNoZWJhbmcuIFdlIG5lZWQgdG8gZGV0ZWN0 IHRoZSBpbnRlcnByZXRlciBvdXJzZWxmLgorICAgICAgICBpZiBzeXMucGxhdGZvcm0gPT0gJ3dp bjMyJzoKKyAgICAgICAgICAgIGludGVycHJldGVyID0gRXhlY3V0aXZlLmludGVycHJldGVyX2Zv cl9zY3JpcHQoc2NyaXB0X3BhdGgpCisgICAgICAgICAgICBpZiBpbnRlcnByZXRlcjoKKyAgICAg ICAgICAgICAgICByZXR1cm4gW2ludGVycHJldGVyLCBzY3JpcHRfcGF0aF0KKyAgICAgICAgcmV0 dXJuIFtzY3JpcHRfcGF0aF0KIAogICAgIGRlZiBlbnN1cmVfY2xlYW5fd29ya2luZ19kaXJlY3Rv cnkoc2VsZiwgZm9yY2VfY2xlYW4pOgogICAgICAgICBpZiBzZWxmLndvcmtpbmdfZGlyZWN0b3J5 X2lzX2NsZWFuKCk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vc3ZuLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv dXQvc2NtL3N2bi5weQppbmRleCAwNjc0YTdkLi40MTQ3MTE3IDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkKQEAgLTIyNCw3ICsyMjQs NyBAQCBjbGFzcyBTVk4oU0NNLCBTVk5SZXBvc2l0b3J5KToKICAgICAgICAgICAgIHJldHVybiAi IgogICAgICAgICBlbGlmIGNoYW5nZWRfZmlsZXMgPT0gTm9uZToKICAgICAgICAgICAgIGNoYW5n ZWRfZmlsZXMgPSBbXQotICAgICAgICByZXR1cm4gc2VsZi5ydW4oW3NlbGYuc2NyaXB0X3BhdGgo InN2bi1jcmVhdGUtcGF0Y2giKV0gKyBjaGFuZ2VkX2ZpbGVzLAorICAgICAgICByZXR1cm4gc2Vs Zi5ydW4oc2VsZi5zY3JpcHRfc2hlbGxfY29tbWFuZCgic3ZuLWNyZWF0ZS1wYXRjaCIpICsgY2hh bmdlZF9maWxlcywKICAgICAgICAgICAgIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QsIHJldHVybl9z dGRlcnI9RmFsc2UsCiAgICAgICAgICAgICBkZWNvZGVfb3V0cHV0PUZhbHNlKQogCg== 94348 2011-05-22 09:59:10 -0700 2011-05-22 10:25:12 -0700 Patch bug-61248-20110522185907.patch text/plain 3424 paroga U3VidmVyc2lvbiBSZXZpc2lvbjogODY1NTIKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxN2UxODU1MzZhZWU0MTkyNWMwYzZiN2NlZmUxMzJhZThk YTRlZWNkLi4zYmVmYmY3NTI5Njk3NGMyZDU1YWZlZmY3NDhhOTY2NDE0YzAzN2E1IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTEtMDUtMjIgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBz Y3JpcHRfcGF0aCB3aXRoIHNjcmlwdF9zaGVsbF9jb21tYW5kCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTI0OAorCisgICAgICAgIHNjcmlwdF9zaGVs bF9jb21tYW5kIGVtdWxhdGVzIHNoZWJhbmcgb24gV2luMzIuCisgICAgICAgIFNjcmlwdHMgb24g V2luZG93cyB3b3JrIG9ubHkgaWYgdGhleSBhcmUgY2FsbGVkIHdpdGggdGhlIGV4cGxpY2l0IGlu dGVycHJldGVyLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQv Y2hlY2tvdXQucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQv c2NtL3NjbS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9z Y20vc3ZuLnB5OgorCiAyMDExLTA1LTE1ICBEb21pbmljIENvb25leSAgPGRvbWluaWNjQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkOiBhZGRpbmcgbXlzZWxmIHRvIGNvbW1pdHRl cnMucHkuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291 dC9jaGVja291dC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2No ZWNrb3V0LnB5CmluZGV4IDhmMTdiMDM2YjUyZGIyMmEzMjk5YTE3ZmQ4YjY5OTRmZTQwNmZjZjMu LmZiMWIxYjg3ZjJmYTljYjRmNGYzMmViYjAwMTg4YWJjMGNmOThiYjEgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoZWNrb3V0LnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2NoZWNrb3V0LnB5CkBAIC0xNTQs OCArMTU0LDggQEAgY2xhc3MgQ2hlY2tvdXQob2JqZWN0KToKICAgICBkZWYgYXBwbHlfcGF0Y2go c2VsZiwgcGF0Y2gsIGZvcmNlPUZhbHNlKToKICAgICAgICAgIyBJdCdzIHBvc3NpYmxlIHRoYXQg dGhlIHBhdGNoIHdhcyBub3QgbWFkZSBmcm9tIHRoZSByb290IGRpcmVjdG9yeS4KICAgICAgICAg IyBXZSBzaG91bGQgZGV0ZWN0IGFuZCBoYW5kbGUgdGhhdCBjYXNlLgotICAgICAgICAjIEZJWE1F OiBNb3ZlIF9zY20uc2NyaXB0X3BhdGggaGVyZSBvbmNlIHdlIGdldCByaWQgb2YgYWxsIHRoZSBk ZXBlbmRlbmNpZXMuCi0gICAgICAgIGFyZ3MgPSBbc2VsZi5fc2NtLnNjcmlwdF9wYXRoKCdzdm4t YXBwbHknKV0KKyAgICAgICAgIyBGSVhNRTogTW92ZSBfc2NtLnNjcmlwdF9zaGVsbF9jb21tYW5k IGhlcmUgb25jZSB3ZSBnZXQgcmlkIG9mIGFsbCB0aGUgZGVwZW5kZW5jaWVzLgorICAgICAgICBh cmdzID0gc2VsZi5fc2NtLnNjcmlwdF9zaGVsbF9jb21tYW5kKCdzdm4tYXBwbHknKQogICAgICAg ICBpZiBwYXRjaC5yZXZpZXdlcigpOgogICAgICAgICAgICAgYXJncyArPSBbJy0tcmV2aWV3ZXIn LCBwYXRjaC5yZXZpZXdlcigpLmZ1bGxfbmFtZV0KICAgICAgICAgaWYgZm9yY2U6CmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weQppbmRleCBj NGE4YTRkNWRjYWVmYWJkMWMxMDVlZmQxMmJhNzcwMWExYjg0Njk0Li5jMmMxNjg0ZmY3ZDM4MDVj NTM4OWRkMGUxM2Q4ZTQwNWYxZmI1Njk3IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkKQEAgLTg4LDggKzg4LDkgQEAgY2xhc3MgU0NN OgogICAgICAgICByZXR1cm4gb3MucGF0aC5qb2luKHNlbGYuY2hlY2tvdXRfcm9vdCwgIlRvb2xz IiwgIlNjcmlwdHMiKQogCiAgICAgIyBGSVhNRTogVGhpcyBiZWxvbmdzIGluIENoZWNrb3V0LCBu b3QgU0NNLgotICAgIGRlZiBzY3JpcHRfcGF0aChzZWxmLCBzY3JpcHRfbmFtZSk6Ci0gICAgICAg IHJldHVybiBvcy5wYXRoLmpvaW4oc2VsZi5zY3JpcHRzX2RpcmVjdG9yeSgpLCBzY3JpcHRfbmFt ZSkKKyAgICBkZWYgc2NyaXB0X3NoZWxsX2NvbW1hbmQoc2VsZiwgc2NyaXB0X25hbWUpOgorICAg ICAgICBzY3JpcHRfcGF0aCA9IG9zLnBhdGguam9pbihzZWxmLnNjcmlwdHNfZGlyZWN0b3J5KCks IHNjcmlwdF9uYW1lKQorICAgICAgICByZXR1cm4gRXhlY3V0aXZlLnNoZWxsX2NvbW1hbmRfZm9y X3NjcmlwdChzY3JpcHRfcGF0aCkKIAogICAgIGRlZiBlbnN1cmVfY2xlYW5fd29ya2luZ19kaXJl Y3Rvcnkoc2VsZiwgZm9yY2VfY2xlYW4pOgogICAgICAgICBpZiBzZWxmLndvcmtpbmdfZGlyZWN0 b3J5X2lzX2NsZWFuKCk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jaGVja291dC9zY20vc3ZuLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hl Y2tvdXQvc2NtL3N2bi5weQppbmRleCAwNjc0YTdkY2Y3MDQxYjdiMDBiZmU0NDU5YWZmOTgyYmVk NzkyOTgwLi40MTQ3MTE3MTgzODkxOWI4ZmJiYWQ2MzYyZTM1NmI1ZGM3ZmU2NmQ5IDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkKQEAg LTIyNCw3ICsyMjQsNyBAQCBjbGFzcyBTVk4oU0NNLCBTVk5SZXBvc2l0b3J5KToKICAgICAgICAg ICAgIHJldHVybiAiIgogICAgICAgICBlbGlmIGNoYW5nZWRfZmlsZXMgPT0gTm9uZToKICAgICAg ICAgICAgIGNoYW5nZWRfZmlsZXMgPSBbXQotICAgICAgICByZXR1cm4gc2VsZi5ydW4oW3NlbGYu c2NyaXB0X3BhdGgoInN2bi1jcmVhdGUtcGF0Y2giKV0gKyBjaGFuZ2VkX2ZpbGVzLAorICAgICAg ICByZXR1cm4gc2VsZi5ydW4oc2VsZi5zY3JpcHRfc2hlbGxfY29tbWFuZCgic3ZuLWNyZWF0ZS1w YXRjaCIpICsgY2hhbmdlZF9maWxlcywKICAgICAgICAgICAgIGN3ZD1zZWxmLmNoZWNrb3V0X3Jv b3QsIHJldHVybl9zdGRlcnI9RmFsc2UsCiAgICAgICAgICAgICBkZWNvZGVfb3V0cHV0PUZhbHNl KQogCg==