MIME-Version: 1.0
From: Aditya Toshniwal <aditya.toshniwal@enterprisedb.com>
Date: Mon, 11 Apr 2022 16:35:04 +0530
Message-ID: 
 <CAM9w-_koSfmwR5_RCkgPpzQX5vY2uKE3vBAKe3oW32iM9Cxynw@mail.gmail.com>
Subject: [pgAdmin][RM7252] 'columns to import' ... not auto selected second
 time for same table
To: pgadmin-hackers <pgadmin-hackers@postgresql.org>
Content-Type: multipart/mixed; boundary="000000000000c71dd105dc5eecbb"
Archived-At: 
 <https://www.postgresql.org/message-id/CAM9w-_koSfmwR5_RCkgPpzQX5vY2uKE3vBAKe3oW32iM9Cxynw%40mail.gmail.com>
Precedence: bulk

--000000000000c71dd105dc5eecbb
Content-Type: multipart/alternative; boundary="000000000000c71dcf05dc5eecb9"

--000000000000c71dcf05dc5eecb9
Content-Type: text/plain; charset="UTF-8"

Hi Hackers,

Please review the patch to fix the issue.

-- 
Thanks,
Aditya Toshniwal
pgAdmin Hacker | Software Architect | *edbpostgres.com*
<http://edbpostgres.com>
"Don't Complain about Heat, Plant a TREE"

--000000000000c71dcf05dc5eecb9
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div class=3D"gmail_default" style=3D"font-family:verdana,=
sans-serif">Hi Hackers,<br clear=3D"all"></div><div class=3D"gmail_default"=
 style=3D"font-family:verdana,sans-serif"><br></div><div class=3D"gmail_def=
ault" style=3D"font-family:verdana,sans-serif">Please review the patch to f=
ix the issue.</div><div class=3D"gmail_default" style=3D"font-family:verdan=
a,sans-serif"><br></div>-- <br><div dir=3D"ltr" data-smartmail=3D"gmail_sig=
nature"><div dir=3D"ltr"><div dir=3D"ltr"><div dir=3D"ltr"><div dir=3D"ltr"=
><div dir=3D"ltr"><div><font size=3D"2" color=3D"#000000" face=3D"arial, sa=
ns-serif">Thanks,</font><div><span style=3D"color:rgb(34,34,34)"><span styl=
e=3D"color:rgb(18,22,70)"><font face=3D"arial, sans-serif">Aditya Toshniwal=
</font></span></span><font size=3D"2" color=3D"#000000" face=3D"verdana, sa=
ns-serif"><br></font></div><div><span style=3D"color:rgb(18,22,70);font-fam=
ily:Arial,sans-serif">pgAdmin Hacker</span><font size=3D"2" color=3D"#00000=
0" style=3D"font-family:verdana,sans-serif">=C2=A0| </font><font size=3D"2"=
 color=3D"#000000" face=3D"arial, sans-serif">Software Architect</font><fon=
t size=3D"2" color=3D"#000000"><font face=3D"verdana, sans-serif">=C2=A0| <=
/font><a href=3D"http://edbpostgres.com" target=3D"_blank"><font face=3D"ar=
ial, sans-serif" color=3D"#000000"><b>edbpostgres.com</b></font></a></font>=
</div><div><font color=3D"#38761d" size=3D"1"><font face=3D"arial, sans-ser=
if">&quot;Don&#39;t Complain about Heat, Plant a TREE&quot;</font></font></=
div></div></div></div></div></div></div></div></div>

--000000000000c71dcf05dc5eecb9--

--000000000000c71dd105dc5eecbb
Content-Type: application/octet-stream; name="RM7252.patch"
Content-Disposition: attachment; filename="RM7252.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_l1ulynri0>
X-Attachment-Id: f_l1ulynri0

ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9TY2hlbWFWaWV3L2luZGV4LmpzeCBi
L3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9TY2hlbWFWaWV3L2luZGV4LmpzeAppbmRleCAzYjg1YzY3
YTAuLmM1MGQ1NmUyNSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL1NjaGVtYVZp
ZXcvaW5kZXguanN4CisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9TY2hlbWFWaWV3L2luZGV4
LmpzeApAQCAtNDQ0LDExICs0NDQsMjUgQEAgZnVuY3Rpb24gU2NoZW1hRGlhbG9nVmlldyh7CiAg
IGNvbnN0IGZpcnN0RWxlUmVmID0gdXNlUmVmKCk7CiAgIGNvbnN0IGlzTmV3ID0gc2NoZW1hLmlz
TmV3KHNjaGVtYS5vcmlnRGF0YSk7CiAgIGNvbnN0IGNoZWNrSXNNb3VudGVkID0gdXNlSXNNb3Vu
dGVkKCk7CisgIGNvbnN0IHByZUZvcm1SZWFkeVF1ZXVlID0gdXNlUmVmKFtdKTsKIAogICBjb25z
dCBkZXBMaXN0ZW5lck9iaiA9IHVzZVJlZihuZXcgRGVwTGlzdGVuZXIoKSk7CiAgIC8qIFRoZSBz
ZXNzaW9uIGRhdGEgKi8KICAgY29uc3QgW3Nlc3NEYXRhLCBzZXNzRGlzcGF0Y2hdID0gdXNlUmVk
dWNlcihzZXNzRGF0YVJlZHVjZXIsIHt9KTsKIAorICB1c2VFZmZlY3QoKCk9PnsKKyAgICAvKiBE
aXNwYXRjaCBhbGwgdGhlIGFjdGlvbnMgcmVjb3JkZWQgYmVmb3JlIGZvcm0gcmVhZHkgKi8KKyAg
ICBpZihmb3JtUmVhZHkpIHsKKyAgICAgIGlmKHByZUZvcm1SZWFkeVF1ZXVlLmN1cnJlbnQubGVu
Z3RoID4gMCkgeworICAgICAgICBmb3IgKGNvbnN0IGRpc3BhdGNoUGF5bG9hZCAgb2YgcHJlRm9y
bVJlYWR5UXVldWUuY3VycmVudCkgeworICAgICAgICAgIHNlc3NEaXNwYXRjaChkaXNwYXRjaFBh
eWxvYWQpOworICAgICAgICB9CisgICAgICB9CisgICAgICAvKiBkZXN0cm95IHRoZSBxdWV1ZSBz
byB0aGF0IG5vIG9uZSB1c2VzIGl0ICovCisgICAgICBwcmVGb3JtUmVhZHlRdWV1ZS5jdXJyZW50
ID0gdW5kZWZpbmVkOworICAgIH0KKyAgfSwgW2Zvcm1SZWFkeV0pOworCiAgIHVzZUVmZmVjdCgo
KT0+ewogICAgIC8qIGlmIHNlc3NEYXRhIGNoYW5nZXMsIHZhbGlkYXRlIHRoZSBzY2hlbWEgKi8K
ICAgICBpZighZm9ybVJlYWR5KSByZXR1cm47CkBAIC02NjMsMTEgKzY3NywxOSBAQCBmdW5jdGlv
biBTY2hlbWFEaWFsb2dWaWV3KHsKICAgfTsKIAogICBjb25zdCBzZXNzRGlzcGF0Y2hXaXRoTGlz
dGVuZXIgPSAoYWN0aW9uKT0+ewotICAgIHNlc3NEaXNwYXRjaCh7CisgICAgbGV0IGRpc3BhdGNo
UGF5bG9hZCA9IHsKICAgICAgIC4uLmFjdGlvbiwKICAgICAgIGRlcENoYW5nZTogKC4uLmFyZ3Mp
PT5kZXBMaXN0ZW5lck9iai5jdXJyZW50LmdldERlcENoYW5nZSguLi5hcmdzKSwKICAgICAgIGRl
ZmVycmVkRGVwQ2hhbmdlOiAoLi4uYXJncyk9PmRlcExpc3RlbmVyT2JqLmN1cnJlbnQuZ2V0RGVm
ZXJyZWREZXBDaGFuZ2UoLi4uYXJncyksCi0gICAgfSk7CisgICAgfTsKKyAgICAvKiBBbGwgdGhl
IHNlc3Npb24gY2hhbmdlcyBjb21pbmcgYmVmb3JlIGluaXQgc2hvdWxkIGJlIHF1ZXVlZCB1cAor
ICAgIFRoZXkgd2lsbCBiZSBwcm9jZXNzZWQgbGF0ZXIgd2hlbiBmb3JtIGlzIHJlYWR5LgorICAg
ICovCisgICAgaWYocHJlRm9ybVJlYWR5UXVldWUuY3VycmVudCkgeworICAgICAgcHJlRm9ybVJl
YWR5UXVldWUuY3VycmVudC5wdXNoKGRpc3BhdGNoUGF5bG9hZCk7CisgICAgICByZXR1cm47Cisg
ICAgfQorICAgIHNlc3NEaXNwYXRjaChkaXNwYXRjaFBheWxvYWQpOwogICB9OwogCiAgIGNvbnN0
IHN0YXRlVXRpbHMgPSB1c2VNZW1vKCgpPT4oewpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9v
bHMvZXJkL3N0YXRpYy9zY3NzL19lcmQuc2NzcyBiL3dlYi9wZ2FkbWluL3Rvb2xzL2VyZC9zdGF0
aWMvc2Nzcy9fZXJkLnNjc3MKaW5kZXggNmI2Y2NkZjlkLi4yNDZjZWFiNGIgMTAwNjQ0Ci0tLSBh
L3dlYi9wZ2FkbWluL3Rvb2xzL2VyZC9zdGF0aWMvc2Nzcy9fZXJkLnNjc3MKKysrIGIvd2ViL3Bn
YWRtaW4vdG9vbHMvZXJkL3N0YXRpYy9zY3NzL19lcmQuc2NzcwpAQCAtNSw2ICs1LDQ5IEBACiAg
IGJvcmRlci1yYWRpdXM6ICRidG4tYm9yZGVyLXJhZGl1czsKIH0KIAorLmNvbm5lY3Rpb25fc3Rh
dHVzX3dyYXBwZXIgeworICB3aWR0aDogMTAwJTsKKyAgYm9yZGVyLXRvcDogJHBhbmVsLWJvcmRl
cjsKKyAgYm9yZGVyLWJvdHRvbTogJHBhbmVsLWJvcmRlcjsKK30KKworLmNvbm5lY3Rpb25fc3Rh
dHVzIC5vYnRhaW5pbmctY29ubiB7CisgIGJhY2tncm91bmQtaW1hZ2U6ICRsb2FkZXItaWNvbi1z
bWFsbCAhaW1wb3J0YW50OworICBiYWNrZ3JvdW5kLXBvc2l0aW9uOiBjZW50ZXIgY2VudGVyOwor
ICBiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0OworICAmOmJlZm9yZSB7CisgICAgY29udGVu
dDonJzsKKyAgfQorICBtaW4td2lkdGg6IDUwJTsKKyAgbWluLWhlaWdodDogMTAwJTsKK30KKwor
LmNvbm5lY3Rpb25fc3RhdHVzIHsKKyAgYmFja2dyb3VuZC1jb2xvcjogJHNxbC10aXRsZS1iZzsK
KyAgY29sb3I6ICRzcWwtdGl0bGUtZmc7CisgIGJvcmRlci1yaWdodDogJGJvcmRlci13aWR0aCBz
b2xpZCAkYm9yZGVyLWNvbG9yOworICBwYWRkaW5nOiAwcHggOHB4OworfQorCisuZWRpdG9yLXRp
dGxlIHsKKyAgcGFkZGluZzogJHNxbC10aXRsZS1wYWRkaW5nOworICBiYWNrZ3JvdW5kOiAkc3Fs
LXRpdGxlLWJnOworICBjb2xvcjogJHNxbC10aXRsZS1mZzsKK30KKworLmNvbm5lY3Rpb24taW5m
byB7CisgIGJhY2tncm91bmQ6ICRzcWwtdGl0bGUtYmc7CisgIGNvbG9yOiAkc3FsLXRpdGxlLWZn
OworICB3aWR0aDoxMDAlOworICBkaXNwbGF5OiBpbmhlcml0OworfQorCisuY29ubmVjdGlvbi1k
YXRhIHsKKyAgZGlzcGxheTogaW5oZXJpdDsKKyAgY3Vyc29yOiBwb2ludGVyOworICB3aWR0aDog
YXV0bzsKK30KKwogI2VyZC10b29sLWNvbnRhaW5lciB7CiAJd2lkdGg6IDEwMCU7CiAJaGVpZ2h0
OiAxMDAlOwpkaWZmIC0tZ2l0IGEvd2ViL3JlZ3Jlc3Npb24vamF2YXNjcmlwdC9TY2hlbWFWaWV3
L1NjaGVtYVZpZXcuc3BlYy5qcyBiL3dlYi9yZWdyZXNzaW9uL2phdmFzY3JpcHQvU2NoZW1hVmll
dy9TY2hlbWFWaWV3LnNwZWMuanMKaW5kZXggZDRiNzQzMDI2Li43NzdiMzQ0YmEgMTAwNjQ0Ci0t
LSBhL3dlYi9yZWdyZXNzaW9uL2phdmFzY3JpcHQvU2NoZW1hVmlldy9TY2hlbWFWaWV3LnNwZWMu
anMKKysrIGIvd2ViL3JlZ3Jlc3Npb24vamF2YXNjcmlwdC9TY2hlbWFWaWV3L1NjaGVtYVZpZXcu
c3BlYy5qcwpAQCAtMzQwLDE4ICszNDAsMjAgQEAgZGVzY3JpYmUoJ1NjaGVtYVZpZXcnLCAoKT0+
ewogICAgICAgICBjdHJsTW91bnQoewogICAgICAgICAgIGNvbmZpcm1PbkNsb3NlUmVzZXQ6IGZh
bHNlLAogICAgICAgICB9KTsKLSAgICAgICAgY3RybC51cGRhdGUoKTsKLSAgICAgICAgc2ltdWxh
dGVWYWxpZERhdGEoKTsKLSAgICAgICAgb25EYXRhQ2hhbmdlLmNhbGxzLnJlc2V0KCk7Ci0gICAg
ICAgIGxldCBjb25maXJtU3B5ID0gc3B5T24oTm90aWZ5LCAnY29uZmlybScpLmFuZC5jYWxsVGhy
b3VnaCgpOwotICAgICAgICBjdHJsLmZpbmQoJ0RlZmF1bHRCdXR0b25bZGF0YS10ZXN0PSJSZXNl
dCJdJykuc2ltdWxhdGUoJ2NsaWNrJyk7CiAgICAgICAgIHNldFRpbWVvdXQoKCk9PnsKICAgICAg
ICAgICBjdHJsLnVwZGF0ZSgpOwotICAgICAgICAgIGV4cGVjdChjb25maXJtU3B5KS5ub3QudG9I
YXZlQmVlbkNhbGxlZCgpOwotICAgICAgICAgIGV4cGVjdChjdHJsLmZpbmQoJ0RlZmF1bHRCdXR0
b25bZGF0YS10ZXN0PSJSZXNldCJdJykucHJvcCgnZGlzYWJsZWQnKSkudG9CZVRydWUoKTsKLSAg
ICAgICAgICBleHBlY3QoY3RybC5maW5kKCdQcmltYXJ5QnV0dG9uW2RhdGEtdGVzdD0iU2F2ZSJd
JykucHJvcCgnZGlzYWJsZWQnKSkudG9CZVRydWUoKTsKLSAgICAgICAgICBleHBlY3Qob25EYXRh
Q2hhbmdlKS50b0hhdmVCZWVuQ2FsbGVkV2l0aChmYWxzZSwge30pOwotICAgICAgICAgIGRvbmUo
KTsKKyAgICAgICAgICBzaW11bGF0ZVZhbGlkRGF0YSgpOworICAgICAgICAgIG9uRGF0YUNoYW5n
ZS5jYWxscy5yZXNldCgpOworICAgICAgICAgIGxldCBjb25maXJtU3B5ID0gc3B5T24oTm90aWZ5
LCAnY29uZmlybScpLmFuZC5jYWxsVGhyb3VnaCgpOworICAgICAgICAgIGN0cmwuZmluZCgnRGVm
YXVsdEJ1dHRvbltkYXRhLXRlc3Q9IlJlc2V0Il0nKS5zaW11bGF0ZSgnY2xpY2snKTsKKyAgICAg
ICAgICBzZXRUaW1lb3V0KCgpPT57CisgICAgICAgICAgICBjdHJsLnVwZGF0ZSgpOworICAgICAg
ICAgICAgZXhwZWN0KGNvbmZpcm1TcHkpLm5vdC50b0hhdmVCZWVuQ2FsbGVkKCk7CisgICAgICAg
ICAgICBleHBlY3QoY3RybC5maW5kKCdEZWZhdWx0QnV0dG9uW2RhdGEtdGVzdD0iUmVzZXQiXScp
LnByb3AoJ2Rpc2FibGVkJykpLnRvQmVUcnVlKCk7CisgICAgICAgICAgICBleHBlY3QoY3RybC5m
aW5kKCdQcmltYXJ5QnV0dG9uW2RhdGEtdGVzdD0iU2F2ZSJdJykucHJvcCgnZGlzYWJsZWQnKSku
dG9CZVRydWUoKTsKKyAgICAgICAgICAgIGV4cGVjdChvbkRhdGFDaGFuZ2UpLnRvSGF2ZUJlZW5D
YWxsZWRXaXRoKGZhbHNlLCB7fSk7CisgICAgICAgICAgICBkb25lKCk7CisgICAgICAgICAgfSwg
MCk7CiAgICAgICAgIH0sIDApOwogICAgICAgfSk7CiAgICAgfSk7CmRpZmYgLS1naXQgYS93ZWIv
cmVncmVzc2lvbi9qYXZhc2NyaXB0L2Jyb3dzZXIvYWN0aXZpdHlfc3BlYy5qcyBiL3dlYi9yZWdy
ZXNzaW9uL2phdmFzY3JpcHQvYnJvd3Nlci9hY3Rpdml0eV9zcGVjLmpzCmluZGV4IDg2NWY0ZDU5
Yy4uMTM4OGU1MmQ1IDEwMDY0NAotLS0gYS93ZWIvcmVncmVzc2lvbi9qYXZhc2NyaXB0L2Jyb3dz
ZXIvYWN0aXZpdHlfc3BlYy5qcworKysgYi93ZWIvcmVncmVzc2lvbi9qYXZhc2NyaXB0L2Jyb3dz
ZXIvYWN0aXZpdHlfc3BlYy5qcwpAQCAtMTAsNiArMTAsNyBAQAogaW1wb3J0IHBnQWRtaW4gZnJv
bSAnc291cmNlcy9wZ2FkbWluJzsKIGltcG9ydCB7cGdCcm93c2VyfSBmcm9tICdwZ2FkbWluLmJy
b3dzZXIuYWN0aXZpdHknOwogaW1wb3J0IHsgZ2V0RXBvY2ggfSBmcm9tICdzb3VyY2VzL3V0aWxz
JzsKK2ltcG9ydCBwZ1dpbmRvdyBmcm9tICdzb3VyY2VzL3dpbmRvdyc7CiAKIGRlc2NyaWJlKCdG
b3IgQWN0aXZpdHknLCBmdW5jdGlvbigpewogICBiZWZvcmVFYWNoKGZ1bmN0aW9uKCl7CkBAIC0x
Nyw3ICsxOCw3IEBAIGRlc2NyaWJlKCdGb3IgQWN0aXZpdHknLCBmdW5jdGlvbigpewogICAgIHBn
QWRtaW4ub3ZlcnJpZGVfdXNlcl9pbmFjdGl2aXR5X3RpbWVvdXQgPSB0cnVlOwogCiAgICAgLyog
cGdCcm93c2VyIGhlcmUgaXMgc2FtZSBhcyBtYWluIHdpbmRvdyBCcm93c2VyICovCi0gICAgd2lu
ZG93LnBnQWRtaW4gPSB7CisgICAgcGdXaW5kb3cucGdBZG1pbiA9IHsKICAgICAgIEJyb3dzZXI6
IHBnQnJvd3NlciwKICAgICB9OwogICB9KTsKQEAgLTI4LDE5ICsyOSwxOSBAQCBkZXNjcmliZSgn
Rm9yIEFjdGl2aXR5JywgZnVuY3Rpb24oKXsKICAgICB9KTsKIAogICAgIGl0KCd3aGVuIHRpbWVk
b3V0JywgZnVuY3Rpb24oKXsKLSAgICAgIHdpbmRvdy5wZ0FkbWluID0gdW5kZWZpbmVkOworICAg
ICAgcGdXaW5kb3cucGdBZG1pbiA9IHVuZGVmaW5lZDsKICAgICAgIGV4cGVjdChwZ0Jyb3dzZXIu
aXNfcGdhZG1pbl90aW1lZG91dCgpKS50b0VxdWFsKHRydWUpOwogICAgIH0pOwogICB9KTsKIAog
ICBkZXNjcmliZSgnaXNfaW5hY3Rpdml0eV90aW1lb3V0JywgZnVuY3Rpb24oKXsKICAgICBpdCgn
d2hlbiB0aGVyZSBpcyBhY3Rpdml0eScsIGZ1bmN0aW9uKCl7Ci0gICAgICB3aW5kb3cucGdBZG1p
bi5Ccm93c2VyLmluYWN0aXZpdHlfdGltZW91dF9hdCA9IGdldEVwb2NoKCkgKyAzMDsKKyAgICAg
IHBnV2luZG93LnBnQWRtaW4uQnJvd3Nlci5pbmFjdGl2aXR5X3RpbWVvdXRfYXQgPSBnZXRFcG9j
aCgpICsgMzA7CiAgICAgICBleHBlY3QocGdCcm93c2VyLmlzX2luYWN0aXZpdHlfdGltZW91dCgp
KS50b0VxdWFsKGZhbHNlKTsKICAgICB9KTsKIAogICAgIGl0KCd3aGVuIHRoZXJlIGlzIG5vIGFj
dGl2aXR5JywgZnVuY3Rpb24oKXsKLSAgICAgIHdpbmRvdy5wZ0FkbWluLkJyb3dzZXIuaW5hY3Rp
dml0eV90aW1lb3V0X2F0ID0gZ2V0RXBvY2goKSAtIDMwOworICAgICAgcGdXaW5kb3cucGdBZG1p
bi5Ccm93c2VyLmluYWN0aXZpdHlfdGltZW91dF9hdCA9IGdldEVwb2NoKCkgLSAzMDsKICAgICAg
IGV4cGVjdChwZ0Jyb3dzZXIuaXNfaW5hY3Rpdml0eV90aW1lb3V0KCkpLnRvRXF1YWwodHJ1ZSk7
CiAgICAgfSk7CiAgIH0pOwpAQCAtNTQsNyArNTUsNyBAQCBkZXNjcmliZSgnRm9yIEFjdGl2aXR5
JywgZnVuY3Rpb24oKXsKIAogICAgIGl0KCdpbml0aWFsIGxvZyBhY3Rpdml0eScsIGZ1bmN0aW9u
KCl7CiAgICAgICBwZ0Jyb3dzZXIubG9nX2FjdGl2aXR5KCk7Ci0gICAgICBleHBlY3Qod2luZG93
LnBnQWRtaW4uQnJvd3Nlci5pbmFjdGl2aXR5X3RpbWVvdXRfYXQpLm5vdC50b0JlKG51bGwpOwor
ICAgICAgZXhwZWN0KHBnV2luZG93LnBnQWRtaW4uQnJvd3Nlci5pbmFjdGl2aXR5X3RpbWVvdXRf
YXQpLm5vdC50b0JlKG51bGwpOwogICAgICAgZXhwZWN0KHBnQnJvd3Nlci5nZXRfZXBvY2hfbm93
KS50b0hhdmVCZWVuQ2FsbGVkKCk7CiAgICAgfSk7CiAKZGlmZiAtLWdpdCBhL3dlYi9yZWdyZXNz
aW9uL2phdmFzY3JpcHQvY29tcG9uZW50cy9Db2RlTWlycm9yLnNwZWMuanMgYi93ZWIvcmVncmVz
c2lvbi9qYXZhc2NyaXB0L2NvbXBvbmVudHMvQ29kZU1pcnJvci5zcGVjLmpzCmluZGV4IDZjZWM3
MTVkNC4uOTIxNTFhZDAwIDEwMDY0NAotLS0gYS93ZWIvcmVncmVzc2lvbi9qYXZhc2NyaXB0L2Nv
bXBvbmVudHMvQ29kZU1pcnJvci5zcGVjLmpzCisrKyBiL3dlYi9yZWdyZXNzaW9uL2phdmFzY3Jp
cHQvY29tcG9uZW50cy9Db2RlTWlycm9yLnNwZWMuanMKQEAgLTEzLDkgKzEzLDExIEBAIGltcG9y
dCAnLi4vaGVscGVyL2VuenltZS5oZWxwZXInOwogaW1wb3J0IHtkZWZhdWx0IGFzIE9yaWdDb2Rl
TWlycm9yfSBmcm9tICdidW5kbGVkX2NvZGVtaXJyb3InOwogaW1wb3J0IHsgd2l0aFRoZW1lIH0g
ZnJvbSAnLi4vZmFrZV90aGVtZSc7CiAKK2ltcG9ydCBwZ1dpbmRvdyBmcm9tICdzb3VyY2VzL3dp
bmRvdyc7CiBpbXBvcnQgQ29kZU1pcnJvciBmcm9tICdzb3VyY2VzL2NvbXBvbmVudHMvQ29kZU1p
cnJvcic7CiBpbXBvcnQgeyBtb3VudCB9IGZyb20gJ2VuenltZSc7CiBpbXBvcnQgeyBGaW5kRGlh
bG9nIH0gZnJvbSAnLi4vLi4vLi4vcGdhZG1pbi9zdGF0aWMvanMvY29tcG9uZW50cy9Db2RlTWly
cm9yJzsKK2ltcG9ydCBmYWtlUGdBZG1pbiBmcm9tICcuLi9mYWtlX3BnYWRtaW4nOwogCiBkZXNj
cmliZSgnQ29kZU1pcnJvcicsICgpPT57CiAgIGxldCBjbUluc3RhbmNlLCBvcHRpb25zPXsKQEAg
LTU2LDI5ICs1OCw3IEBAIGRlc2NyaWJlKCdDb2RlTWlycm9yJywgKCk9PnsKICAgICB9KTsKICAg
YmVmb3JlRWFjaCgoKT0+ewogICAgIGphc21pbmVFbnp5bWUoKTsKLSAgICB3aW5kb3cucGdBZG1p
biA9IHsKLSAgICAgIEJyb3dzZXI6IHsKLSAgICAgICAgRXZlbnRzOiB7Ci0gICAgICAgICAgb246
IGphc21pbmUuY3JlYXRlU3B5KCdvbicpLAotICAgICAgICB9LAotICAgICAgICBnZXRfcHJlZmVy
ZW5jZXNfZm9yX21vZHVsZTogKCk9Pih7fSksCi0gICAgICAgIGRvY2tlcjogewotICAgICAgICAg
IGZpbmRQYW5lbHM6IGZ1bmN0aW9uKCkgewotICAgICAgICAgICAgcmV0dXJuIFsKLSAgICAgICAg
ICAgICAgewotICAgICAgICAgICAgICAgIGlzVmlzaWJsZTogZnVuY3Rpb24oKSB7Ci0gICAgICAg
ICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgICAgICAgICB9LAotICAgICAgICAgICAg
ICB9LAotICAgICAgICAgICAgXTsKLSAgICAgICAgICB9LAotICAgICAgICB9LAotICAgICAgICBv
blByZWZlcmVuY2VzQ2hhbmdlOiAoKT0+ey8qVGhpcyBpcyBpbnRlbnRpb25hbCAoU29uYXJRdWJl
KSovfSwKLSAgICAgICAgdXRpbHM6IHsKLSAgICAgICAgICBhcHBfdmVyc2lvbl9pbnQ6IDEyMzQs
Ci0gICAgICAgIH0sCi0gICAgICB9LAotICAgIH07CisgICAgcGdXaW5kb3cucGdBZG1pbiA9IGZh
a2VQZ0FkbWluOwogICAgIHNweU9uKE9yaWdDb2RlTWlycm9yLCAnZnJvbVRleHRBcmVhJykuYW5k
LnJldHVyblZhbHVlKGNtT2JqKTsKICAgICBjb25zdCBUaGVtZWRDTSA9IHdpdGhUaGVtZShDb2Rl
TWlycm9yKTsKICAgICBjbUluc3RhbmNlID0gbW91bnQoCkBAIC05MCw3ICs3MCw3IEBAIGRlc2Ny
aWJlKCdDb2RlTWlycm9yJywgKCk9PnsKICAgfSk7CiAKICAgYWZ0ZXJFYWNoKCgpPT57Ci0gICAg
d2luZG93LnBnQWRtaW4gPSB1bmRlZmluZWQ7CisgICAgcGdXaW5kb3cucGdBZG1pbiA9IHVuZGVm
aW5lZDsKICAgfSk7CiAKICAgaXQoJ2luaXQnLCAoKT0+ewpkaWZmIC0tZ2l0IGEvd2ViL3JlZ3Jl
c3Npb24vamF2YXNjcmlwdC9mYWtlX3BnYWRtaW4uanMgYi93ZWIvcmVncmVzc2lvbi9qYXZhc2Ny
aXB0L2Zha2VfcGdhZG1pbi5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAu
Ljc5MWNmMzM3ZQotLS0gL2Rldi9udWxsCisrKyBiL3dlYi9yZWdyZXNzaW9uL2phdmFzY3JpcHQv
ZmFrZV9wZ2FkbWluLmpzCkBAIC0wLDAgKzEsMzYgQEAKKy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v
Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8KKy8vCisvLyBwZ0FkbWluIDQg
LSBQb3N0Z3JlU1FMIFRvb2xzCisvLworLy8gQ29weXJpZ2h0IChDKSAyMDEzIC0gMjAyMiwgVGhl
IHBnQWRtaW4gRGV2ZWxvcG1lbnQgVGVhbQorLy8gVGhpcyBzb2Z0d2FyZSBpcyByZWxlYXNlZCB1
bmRlciB0aGUgUG9zdGdyZVNRTCBMaWNlbmNlCisvLworLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v
Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8KK2ltcG9ydCB7bWVzc2FnZXN9
IGZyb20gJy4vZmFrZV9tZXNzYWdlcyc7CisKK2NvbnN0IGZha2VQZ0FkbWluID0geworICBCcm93
c2VyOiB7CisgICAgbWVzc2FnZXM6IG1lc3NhZ2VzLAorICAgIEV2ZW50czogeworICAgICAgb246
IGphc21pbmUuY3JlYXRlU3B5KCdvbicpLAorICAgIH0sCisgICAgZ2V0X3ByZWZlcmVuY2VzX2Zv
cl9tb2R1bGU6ICgpPT4oe30pLAorICAgIGRvY2tlcjogeworICAgICAgZmluZFBhbmVsczogZnVu
Y3Rpb24oKSB7CisgICAgICAgIHJldHVybiBbCisgICAgICAgICAgeworICAgICAgICAgICAgaXNW
aXNpYmxlOiBmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAg
ICAgICB9LAorICAgICAgICAgIH0sCisgICAgICAgIF07CisgICAgICB9LAorICAgIH0sCisgICAg
b25QcmVmZXJlbmNlc0NoYW5nZTogKCk9PnsvKlRoaXMgaXMgaW50ZW50aW9uYWwgKFNvbmFyUXVi
ZSkqL30sCisgICAgdXRpbHM6IHsKKyAgICAgIGFwcF92ZXJzaW9uX2ludDogMTIzNCwKKyAgICB9
LAorICB9LAorfTsKKworZXhwb3J0IGRlZmF1bHQgZmFrZVBnQWRtaW47CmRpZmYgLS1naXQgYS93
ZWIvcmVncmVzc2lvbi9qYXZhc2NyaXB0L2dlbmVyaWNGdW5jdGlvbnMuanN4IGIvd2ViL3JlZ3Jl
c3Npb24vamF2YXNjcmlwdC9nZW5lcmljRnVuY3Rpb25zLmpzeAppbmRleCA4MGU0OTQ3NzkuLjJk
OTM4MDdkOSAxMDA2NDQKLS0tIGEvd2ViL3JlZ3Jlc3Npb24vamF2YXNjcmlwdC9nZW5lcmljRnVu
Y3Rpb25zLmpzeAorKysgYi93ZWIvcmVncmVzc2lvbi9qYXZhc2NyaXB0L2dlbmVyaWNGdW5jdGlv
bnMuanN4CkBAIC0xMCw4ICsxMCw5IEBACiBpbXBvcnQgamFzbWluZUVuenltZSBmcm9tICdqYXNt
aW5lLWVuenltZSc7CiBpbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnOwogaW1wb3J0IHBnQWRtaW4g
ZnJvbSAnc291cmNlcy9wZ2FkbWluJzsKLWltcG9ydCB7bWVzc2FnZXN9IGZyb20gJy4vZmFrZV9t
ZXNzYWdlcyc7CiBpbXBvcnQgU2NoZW1hVmlldyBmcm9tICcuLi8uLi9wZ2FkbWluL3N0YXRpYy9q
cy9TY2hlbWFWaWV3JzsKK2ltcG9ydCBwZ1dpbmRvdyBmcm9tICdzb3VyY2VzL3dpbmRvdyc7Citp
bXBvcnQgZmFrZVBnQWRtaW4gZnJvbSAnLi9mYWtlX3BnYWRtaW4nOwogCiBleHBvcnQgbGV0IGdl
dEVkaXRWaWV3ID0gKHNjaGVtYU9iaiwgZ2V0SW5pdERhdGEpPT4gewogICByZXR1cm4gPFNjaGVt
YVZpZXcKQEAgLTY4LDcgKzY5LDkgQEAgZXhwb3J0IGxldCBnZXRQcm9wZXJ0aWVzVmlldyA9IChz
Y2hlbWFPYmosIGdldEluaXREYXRhKT0+IHsKIGV4cG9ydCBsZXQgZ2VuZXJpY0JlZm9yZUVhY2gg
PSAoKT0+IHsKICAgamFzbWluZUVuenltZSgpOwogICAvKiBtZXNzYWdlcyB1c2VkIGJ5IHZhbGlk
YXRvcnMgKi8KLSAgcGdBZG1pbi5Ccm93c2VyID0gcGdBZG1pbi5Ccm93c2VyIHx8IHt9OwotICBw
Z0FkbWluLkJyb3dzZXIubWVzc2FnZXMgPSBwZ0FkbWluLkJyb3dzZXIubWVzc2FnZXMgfHwgbWVz
c2FnZXM7Ci0gIHBnQWRtaW4uQnJvd3Nlci51dGlscyA9IHBnQWRtaW4uQnJvd3Nlci51dGlscyB8
fCB7fTsKKyAgcGdBZG1pbi5Ccm93c2VyID0geworICAgIC4uLnBnQWRtaW4uQnJvd3NlciwKKyAg
ICAuLi5mYWtlUGdBZG1pbi5Ccm93c2VyCisgIH07CisgIHBnV2luZG93LnBnQWRtaW4gPSBwZ0Fk
bWluOwogfTsK
--000000000000c71dd105dc5eecbb--