<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>222827</bug_id>
          
          <creation_ts>2021-03-05 14:05:31 -0800</creation_ts>
          <short_desc>[webkitscmpy] Add repository_id</short_desc>
          <delta_ts>2021-03-08 10:09:36 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Tools / Tests</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Jonathan Bedard">jbedard</reporter>
          <assigned_to name="Jonathan Bedard">jbedard</assigned_to>
          <cc>aakash_jain</cc>
    
    <cc>dewei_zhu</cc>
    
    <cc>slewis</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1736539</commentid>
    <comment_count>0</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-03-05 14:05:31 -0800</bug_when>
    <thetext>Make webkitscmpy&apos;s representation of a commit compatible with what the results database uses.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1736540</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-03-05 14:05:56 -0800</bug_when>
    <thetext>&lt;rdar://problem/75111000&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1736544</commentid>
    <comment_count>2</comment_count>
      <attachid>422418</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-03-05 14:11:28 -0800</bug_when>
    <thetext>Created attachment 422418
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1736678</commentid>
    <comment_count>3</comment_count>
      <attachid>422418</attachid>
    <who name="">dewei_zhu</who>
    <bug_when>2021-03-05 17:20:57 -0800</bug_when>
    <thetext>Comment on attachment 422418
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=422418&amp;action=review

&gt; Tools/Scripts/libraries/webkitscmpy/webkitscmpy/scm_base.py:43
&gt; +    def __init__(self, dev_branches=None, prod_branches=None, contributors=None, id=None):

Worth mention that id is a built-in, but seems a reasonable variable name here.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1737114</commentid>
    <comment_count>4</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-03-08 09:15:00 -0800</bug_when>
    <thetext>(In reply to dewei_zhu from comment #3)
&gt; Comment on attachment 422418 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=422418&amp;action=review
&gt; 
&gt; &gt; Tools/Scripts/libraries/webkitscmpy/webkitscmpy/scm_base.py:43
&gt; &gt; +    def __init__(self, dev_branches=None, prod_branches=None, contributors=None, id=None):
&gt; 
&gt; Worth mention that id is a built-in, but seems a reasonable variable name
&gt; here.

Yes, I usually try to avoid using built-ins, but this seems like the right variable name.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1737119</commentid>
    <comment_count>5</comment_count>
      <attachid>422576</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-03-08 09:29:23 -0800</bug_when>
    <thetext>Created attachment 422576
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1737147</commentid>
    <comment_count>6</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-03-08 10:09:36 -0800</bug_when>
    <thetext>Committed r274080: &lt;https://commits.webkit.org/r274080&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 422576.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422418</attachid>
            <date>2021-03-05 14:11:28 -0800</date>
            <delta_ts>2021-03-08 09:29:20 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-222827-20210305141127.patch</filename>
            <type>text/plain</type>
            <size>17466</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI3NDAwNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDQzIEBACisyMDIxLTAzLTA1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIEFkZCByZXBvc2l0b3J5X2lkCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjI4MjcKKyAgICAgICAgPHJk
YXI6Ly9wcm9ibGVtLzc1MTExMDAwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHk6
IEJ1bXAgdmVyc2lvbi4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93
ZWJraXRzY21weS9fX2luaXRfXy5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJp
ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvY29tbWl0LnB5OgorICAgICAgICAoQ29tbWl0LkVu
Y29kZXIuZGVmYXVsdCk6IEFkZCByZXBvc2l0b3J5X2lkLgorICAgICAgICAoQ29tbWl0Ll9faW5p
dF9fKTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi
a2l0c2NtcHkvbG9jYWwvZ2l0LnB5OgorICAgICAgICAoR2l0Ll9faW5pdF9fKTogQWxsb3cgY2Fs
bGVyIHRvIHNwZWNpZnkgcmVwb3NpdG9yeSBpZC4KKyAgICAgICAgKEdpdC5jb21taXQpOiBQYXNz
IHJlcG9zaXRvcnkgaWQgdG8gY29tbWl0LgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dl
YmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3NjbS5weToKKyAgICAgICAgKFNjbS5fX2luaXRf
Xyk6IEFsbG93IGNhbGxlciB0byBzcGVjaWZ5IHJlcG9zaXRvcnkgaWQuCisgICAgICAgICogU2Ny
aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvc3ZuLnB5OgorICAg
ICAgICAoU3ZuLl9faW5pdF9fKTogQWxsb3cgY2FsbGVyIHRvIHNwZWNpZnkgcmVwb3NpdG9yeSBp
ZC4KKyAgICAgICAgKFN2bi5jb21taXQpOiBQYXNzIHJlcG9zaXRvcnkgaWQgdG8gY29tbWl0Lgor
ICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90
ZS9iaXRidWNrZXQucHk6CisgICAgICAgIChCaXRCdWNrZXQuX19pbml0X18pOiBBbGxvdyBjYWxs
ZXIgdG8gc3BlY2lmeSByZXBvc2l0b3J5IGlkLCBpbmZlciBmcm9tIHVybC4KKyAgICAgICAgKEJp
dEJ1Y2tldC5jb21taXQpOiBQYXNzIHJlcG9zaXRvcnkgaWQgdG8gY29tbWl0LgorICAgICAgICAq
IFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9naXRfaHVi
LnB5OgorICAgICAgICAoR2l0SHViLl9faW5pdF9fKTogQWxsb3cgY2FsbGVyIHRvIHNwZWNpZnkg
cmVwb3NpdG9yeSBpZCwgaW5mZXIgZnJvbSB1cmwuCisgICAgICAgIChHaXRIdWIuY29tbWl0KTog
UGFzcyByZXBvc2l0b3J5IGlkIHRvIGNvbW1pdC4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmll
cy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvc2NtLnB5OgorICAgICAgICAoU2NtLl9f
aW5pdF9fKTogQWxsb3cgY2FsbGVyIHRvIHNwZWNpZnkgcmVwb3NpdG9yeSBpZC4KKyAgICAgICAg
KiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvc3ZuLnB5
OgorICAgICAgICAoU3ZuLl9faW5pdF9fKTogQWxsb3cgY2FsbGVyIHRvIHNwZWNpZnkgcmVwb3Np
dG9yeSBpZCwgaW5mZXIgZnJvbSB1cmwuCisgICAgICAgIChTdm4uY29tbWl0KTogUGFzcyByZXBv
c2l0b3J5IGlkIHRvIGNvbW1pdC4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz
Y21weS93ZWJraXRzY21weS9zY21fYmFzZS5weToKKyAgICAgICAgKFNjbUJhc2UuX19pbml0X18p
OiBBbGxvdyBjYWxsZXIgdG8gc3BlY2lmeSByZXBvc2l0b3J5IGlkLgorICAgICAgICAqIFNjcmlw
dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5
OgorICAgICAgICAoVGVzdEdpdEh1Yi50ZXN0X2lkKToKKyAgICAgICAgKFRlc3RCaXRCdWNrZXQu
dGVzdF9pZCk6CisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0
c2NtcHkvdGVzdC9zdm5fdW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0UmVtb3RlU3ZuLnRlc3Rf
aWQpOgorCiAyMDIxLTAzLTA1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4K
IAogICAgICAgICBbcnVuLXdlYmtpdC10ZXN0c10gRGVsZXRlIG9sZCByZXN1bHRzIHNlcnZlciBj
b2RlCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5w
eQkocmV2aXNpb24gMjczOTk0KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt
cHkvc2V0dXAucHkJKHdvcmtpbmcgY29weSkKQEAgLTI5LDcgKzI5LDcgQEAgZGVmIHJlYWRtZSgp
OgogCiBzZXR1cCgKICAgICBuYW1lPSd3ZWJraXRzY21weScsCi0gICAgdmVyc2lvbj0nMC4xMi4z
JywKKyAgICB2ZXJzaW9uPScwLjEyLjQnLAogICAgIGRlc2NyaXB0aW9uPSdMaWJyYXJ5IGRlc2ln
bmVkIHRvIGludGVyYWN0IHdpdGggZ2l0IGFuZCBzdm4gcmVwb3NpdG9yaWVzLicsCiAgICAgbG9u
Z19kZXNjcmlwdGlvbj1yZWFkbWUoKSwKICAgICBjbGFzc2lmaWVycz1bCkluZGV4OiBUb29scy9T
Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQo9PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w
eS9fX2luaXRfXy5weQkocmV2aXNpb24gMjczOTk0KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJp
ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAg
LTQ2LDcgKzQ2LDcgQEAgZXhjZXB0IEltcG9ydEVycm9yOgogICAgICAgICAiUGxlYXNlIGluc3Rh
bGwgd2Via2l0Y29yZXB5IHdpdGggYHBpcCBpbnN0YWxsIHdlYmtpdGNvcmVweSAtLWV4dHJhLWlu
ZGV4LXVybCA8cGFja2FnZSBpbmRleCBVUkw+YCIKICAgICApCiAKLXZlcnNpb24gPSBWZXJzaW9u
KDAsIDEyLCAzKQordmVyc2lvbiA9IFZlcnNpb24oMCwgMTIsIDQpCiAKIEF1dG9JbnN0YWxsLnJl
Z2lzdGVyKFBhY2thZ2UoJ2Zhc3RlbmVycycsIFZlcnNpb24oMCwgMTUsIDApKSkKIEF1dG9JbnN0
YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ21vbm90b25pYycsIFZlcnNpb24oMSwgNSkpKQpJbmRleDog
VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvY29tbWl0LnB5
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp
dHNjbXB5L2NvbW1pdC5weQkocmV2aXNpb24gMjczOTk0KQorKysgVG9vbHMvU2NyaXB0cy9saWJy
YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvY29tbWl0LnB5CSh3b3JraW5nIGNvcHkpCkBA
IC00Myw3ICs0Myw3IEBAIGNsYXNzIENvbW1pdChvYmplY3QpOgogICAgICAgICAgICAgICAgIHJl
dHVybiBzdXBlcihDb21taXQuRW5jb2Rlciwgc2VsZikuZGVmYXVsdChvYmopCiAKICAgICAgICAg
ICAgIHJlc3VsdCA9IGRpY3QoKQotICAgICAgICAgICAgZm9yIGF0dHJpYnV0ZSBpbiBbJ2hhc2gn
LCAncmV2aXNpb24nLCAnYnJhbmNoJywgJ3RpbWVzdGFtcCcsICdvcmRlcicsICdtZXNzYWdlJ106
CisgICAgICAgICAgICBmb3IgYXR0cmlidXRlIGluIFsnaGFzaCcsICdyZXZpc2lvbicsICdicmFu
Y2gnLCAndGltZXN0YW1wJywgJ29yZGVyJywgJ21lc3NhZ2UnLCAncmVwb3NpdG9yeV9pZCddOgog
ICAgICAgICAgICAgICAgIHZhbHVlID0gZ2V0YXR0cihvYmosIGF0dHJpYnV0ZSwgTm9uZSkKICAg
ICAgICAgICAgICAgICBpZiB2YWx1ZSBpcyBub3QgTm9uZToKICAgICAgICAgICAgICAgICAgICAg
cmVzdWx0W2F0dHJpYnV0ZV0gPSB2YWx1ZQpAQCAtMTUxLDcgKzE1MSw3IEBAIGNsYXNzIENvbW1p
dChvYmplY3QpOgogICAgICAgICBoYXNoPU5vbmUsCiAgICAgICAgIHJldmlzaW9uPU5vbmUsCiAg
ICAgICAgIGlkZW50aWZpZXI9Tm9uZSwgYnJhbmNoPU5vbmUsIGJyYW5jaF9wb2ludD1Ob25lLAot
ICAgICAgICB0aW1lc3RhbXA9Tm9uZSwgYXV0aG9yPU5vbmUsIG1lc3NhZ2U9Tm9uZSwgb3JkZXI9
Tm9uZSwKKyAgICAgICAgdGltZXN0YW1wPU5vbmUsIGF1dGhvcj1Ob25lLCBtZXNzYWdlPU5vbmUs
IG9yZGVyPU5vbmUsIHJlcG9zaXRvcnlfaWQ9Tm9uZQogICAgICk6CiAgICAgICAgIHNlbGYuaGFz
aCA9IHNlbGYuX3BhcnNlX2hhc2goaGFzaCwgZG9fYXNzZXJ0PVRydWUpCiAgICAgICAgIHNlbGYu
cmV2aXNpb24gPSBzZWxmLl9wYXJzZV9yZXZpc2lvbihyZXZpc2lvbiwgZG9fYXNzZXJ0PVRydWUp
CkBAIC0yMDMsNiArMjAzLDEwIEBAIGNsYXNzIENvbW1pdChvYmplY3QpOgogICAgICAgICAgICAg
cmFpc2UgVmFsdWVFcnJvcigiRXhwZWN0ZWQgJ21lc3NhZ2UnIHRvIGJlIGEgc3RyaW5nLCBnb3Qg
J3t9JyIuZm9ybWF0KG1lc3NhZ2UpKQogICAgICAgICBzZWxmLm1lc3NhZ2UgPSBtZXNzYWdlCiAK
KyAgICAgICAgaWYgcmVwb3NpdG9yeV9pZCBhbmQgbm90IGlzaW5zdGFuY2UocmVwb3NpdG9yeV9p
ZCwgc2l4LnN0cmluZ190eXBlcyk6CisgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCJFeHBl
Y3RlZCAncmVwb3NpdG9yeV9pZCcgdG8gYmUgYSBzdHJpbmcsIGdvdCAne30nIi5mb3JtYXQocmVw
b3NpdG9yeV9pZCkpCisgICAgICAgIHNlbGYucmVwb3NpdG9yeV9pZCA9IHJlcG9zaXRvcnlfaWQK
KwogICAgICAgICAjIEZvcmNlIGEgY29tbWl0IGZvcm1hdCBjaGVjawogICAgICAgICBzZWxmLl9f
cmVwcl9fKCkKIApJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi
a2l0c2NtcHkvc2NtX2Jhc2UucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJp
ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvc2NtX2Jhc2UucHkJKHJldmlzaW9uIDI3Mzk5NCkK
KysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3NjbV9i
YXNlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00MCwxMiArNDAsMTYgQEAgY2xhc3MgU2NtQmFzZShv
YmplY3QpOgogICAgIEdJVF9TVk5fUkVWSVNJT04gPSByZS5jb21waWxlKHInZ2l0LXN2bi1pZDog
XFMrOlwvXC8uK0AoP1A8cmV2aXNpb24+XGQrKSAuKy0uKy0uKy0uKycpCiAgICAgREVGQVVMVF9C
UkFOQ0hFUyA9IFsnbWFpbicsICdtYXN0ZXInLCAndHJ1bmsnXQogCi0gICAgZGVmIF9faW5pdF9f
KHNlbGYsIGRldl9icmFuY2hlcz1Ob25lLCBwcm9kX2JyYW5jaGVzPU5vbmUsIGNvbnRyaWJ1dG9y
cz1Ob25lKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgZGV2X2JyYW5jaGVzPU5vbmUsIHByb2Rf
YnJhbmNoZXM9Tm9uZSwgY29udHJpYnV0b3JzPU5vbmUsIGlkPU5vbmUpOgogICAgICAgICBzZWxm
LmRldl9icmFuY2hlcyA9IGRldl9icmFuY2hlcyBvciBzZWxmLkRFVl9CUkFOQ0hFUwogICAgICAg
ICBzZWxmLnByb2RfYnJhbmNoZXMgPSBwcm9kX2JyYW5jaGVzIG9yIHNlbGYuUFJPRF9CUkFOQ0hF
UwogICAgICAgICBzZWxmLnBhdGggPSBOb25lCiAgICAgICAgIHNlbGYuY29udHJpYnV0b3JzID0g
Q29udHJpYnV0b3IuTWFwcGluZygpIGlmIGNvbnRyaWJ1dG9ycyBpcyBOb25lIGVsc2UgY29udHJp
YnV0b3JzCiAKKyAgICAgICAgaWYgaWQgYW5kIG5vdCBpc2luc3RhbmNlKGlkLCBzaXguc3RyaW5n
X3R5cGVzKToKKyAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoIkV4cGVjdGVkICdpZCcgdG8g
YmUgYSBzdHJpbmcgdHlwZSwgbm90ICd7fSciLmZvcm1hdCh0eXBlKGlkKSkpCisgICAgICAgIHNl
bGYuaWQgPSBpZAorCiAgICAgQHByb3BlcnR5CiAgICAgZGVmIGlzX3N2bihzZWxmKToKICAgICAg
ICAgcmV0dXJuIEZhbHNlCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w
eS93ZWJraXRzY21weS9sb2NhbC9naXQucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9s
aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5CShyZXZpc2lvbiAy
NzM5OTQpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w
eS9sb2NhbC9naXQucHkJKHdvcmtpbmcgY29weSkKQEAgLTQyLDggKzQyLDggQEAgY2xhc3MgR2l0
KFNjbSk6CiAgICAgZGVmIGlzX2NoZWNrb3V0KGNscywgcGF0aCk6CiAgICAgICAgIHJldHVybiBy
dW4oW2Nscy5leGVjdXRhYmxlKCksICdyZXYtcGFyc2UnLCAnLS1zaG93LXRvcGxldmVsJ10sIGN3
ZD1wYXRoLCBjYXB0dXJlX291dHB1dD1UcnVlKS5yZXR1cm5jb2RlID09IDAKIAotICAgIGRlZiBf
X2luaXRfXyhzZWxmLCBwYXRoLCBkZXZfYnJhbmNoZXM9Tm9uZSwgcHJvZF9icmFuY2hlcz1Ob25l
LCBjb250cmlidXRvcnM9Tm9uZSk6Ci0gICAgICAgIHN1cGVyKEdpdCwgc2VsZikuX19pbml0X18o
cGF0aCwgZGV2X2JyYW5jaGVzPWRldl9icmFuY2hlcywgcHJvZF9icmFuY2hlcz1wcm9kX2JyYW5j
aGVzLCBjb250cmlidXRvcnM9Y29udHJpYnV0b3JzKQorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBw
YXRoLCBkZXZfYnJhbmNoZXM9Tm9uZSwgcHJvZF9icmFuY2hlcz1Ob25lLCBjb250cmlidXRvcnM9
Tm9uZSwgaWQ9Tm9uZSk6CisgICAgICAgIHN1cGVyKEdpdCwgc2VsZikuX19pbml0X18ocGF0aCwg
ZGV2X2JyYW5jaGVzPWRldl9icmFuY2hlcywgcHJvZF9icmFuY2hlcz1wcm9kX2JyYW5jaGVzLCBj
b250cmlidXRvcnM9Y29udHJpYnV0b3JzLCBpZD1pZCkKICAgICAgICAgaWYgbm90IHNlbGYucm9v
dF9wYXRoOgogICAgICAgICAgICAgcmFpc2UgT1NFcnJvcignUHJvdmlkZWQgcGF0aCB7fSBpcyBu
b3QgYSBnaXQgcmVwb3NpdG9yeScuZm9ybWF0KHBhdGgpKQogCkBAIC0yNzEsNiArMjcxLDcgQEAg
Y2xhc3MgR2l0KFNjbSk6CiAgICAgICAgICAgICBvcmRlciArPSAxCiAKICAgICAgICAgcmV0dXJu
IENvbW1pdCgKKyAgICAgICAgICAgIHJlcG9zaXRvcnlfaWQ9c2VsZi5pZCwKICAgICAgICAgICAg
IGhhc2g9aGFzaCwKICAgICAgICAgICAgIHJldmlzaW9uPXJldmlzaW9uLAogICAgICAgICAgICAg
aWRlbnRpZmllcj1pZGVudGlmaWVyIGlmIGluY2x1ZGVfaWRlbnRpZmllciBlbHNlIE5vbmUsCklu
ZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2Nh
bC9zY20ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt
cHkvd2Via2l0c2NtcHkvbG9jYWwvc2NtLnB5CShyZXZpc2lvbiAyNzM5OTQpCisrKyBUb29scy9T
Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zY20ucHkJKHdv
cmtpbmcgY29weSkKQEAgLTU0LDggKzU0LDggQEAgY2xhc3MgU2NtKFNjbUJhc2UpOgogICAgICAg
ICAgICAgcmV0dXJuIGxvY2FsLlN2bihwYXRoLCBjb250cmlidXRvcnM9Y29udHJpYnV0b3JzKQog
ICAgICAgICByYWlzZSBPU0Vycm9yKCIne30nIGlzIG5vdCBhIGtub3duIFNDTSB0eXBlIi5mb3Jt
YXQocGF0aCkpCiAKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcGF0aCwgZGV2X2JyYW5jaGVzPU5v
bmUsIHByb2RfYnJhbmNoZXM9Tm9uZSwgY29udHJpYnV0b3JzPU5vbmUpOgotICAgICAgICBzdXBl
cihTY20sIHNlbGYpLl9faW5pdF9fKGRldl9icmFuY2hlcz1kZXZfYnJhbmNoZXMsIHByb2RfYnJh
bmNoZXM9cHJvZF9icmFuY2hlcywgY29udHJpYnV0b3JzPWNvbnRyaWJ1dG9ycykKKyAgICBkZWYg
X19pbml0X18oc2VsZiwgcGF0aCwgZGV2X2JyYW5jaGVzPU5vbmUsIHByb2RfYnJhbmNoZXM9Tm9u
ZSwgY29udHJpYnV0b3JzPU5vbmUsIGlkPU5vbmUpOgorICAgICAgICBzdXBlcihTY20sIHNlbGYp
Ll9faW5pdF9fKGRldl9icmFuY2hlcz1kZXZfYnJhbmNoZXMsIHByb2RfYnJhbmNoZXM9cHJvZF9i
cmFuY2hlcywgY29udHJpYnV0b3JzPWNvbnRyaWJ1dG9ycywgaWQ9aWQpCiAKICAgICAgICAgaWYg
bm90IGlzaW5zdGFuY2UocGF0aCwgc2l4LnN0cmluZ190eXBlcyk6CiAgICAgICAgICAgICByYWlz
ZSBWYWx1ZUVycm9yKCJFeHBlY3RlZCAncGF0aCcgdG8gYmUgYSBzdHJpbmcgdHlwZSwgbm90ICd7
fSciLmZvcm1hdCh0eXBlKHBhdGgpKSkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl
YmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weQo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T
Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zdm4ucHkJKHJl
dmlzaW9uIDI3Mzk5NCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl
YmtpdHNjbXB5L2xvY2FsL3N2bi5weQkod29ya2luZyBjb3B5KQpAQCAtNTAsOCArNTAsOCBAQCBj
bGFzcyBTdm4oU2NtKToKICAgICBkZWYgaXNfY2hlY2tvdXQoY2xzLCBwYXRoKToKICAgICAgICAg
cmV0dXJuIHJ1bihbY2xzLmV4ZWN1dGFibGUoKSwgJ2luZm8nXSwgY3dkPXBhdGgsIGNhcHR1cmVf
b3V0cHV0PVRydWUpLnJldHVybmNvZGUgPT0gMAogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBh
dGgsIGRldl9icmFuY2hlcz1Ob25lLCBwcm9kX2JyYW5jaGVzPU5vbmUsIGNvbnRyaWJ1dG9ycz1O
b25lKToKLSAgICAgICAgc3VwZXIoU3ZuLCBzZWxmKS5fX2luaXRfXyhwYXRoLCBkZXZfYnJhbmNo
ZXM9ZGV2X2JyYW5jaGVzLCBwcm9kX2JyYW5jaGVzPXByb2RfYnJhbmNoZXMsIGNvbnRyaWJ1dG9y
cz1jb250cmlidXRvcnMpCisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBhdGgsIGRldl9icmFuY2hl
cz1Ob25lLCBwcm9kX2JyYW5jaGVzPU5vbmUsIGNvbnRyaWJ1dG9ycz1Ob25lLCBpZD1Ob25lKToK
KyAgICAgICAgc3VwZXIoU3ZuLCBzZWxmKS5fX2luaXRfXyhwYXRoLCBkZXZfYnJhbmNoZXM9ZGV2
X2JyYW5jaGVzLCBwcm9kX2JyYW5jaGVzPXByb2RfYnJhbmNoZXMsIGNvbnRyaWJ1dG9ycz1jb250
cmlidXRvcnMsIGlkPWlkKQogCiAgICAgICAgIHNlbGYuX3Jvb3RfcGF0aCA9IHNlbGYucGF0aAog
ICAgICAgICBzZWxmLl9yb290X3BhdGggPSBzZWxmLmluZm8oY2FjaGVkPUZhbHNlKS5nZXQoJ1dv
cmtpbmcgQ29weSBSb290IFBhdGgnKQpAQCAtMzgwLDYgKzM4MCw3IEBAIGNsYXNzIFN2bihTY20p
OgogICAgICAgICAgICAgbWVzc2FnZSA9IE5vbmUKIAogICAgICAgICByZXR1cm4gQ29tbWl0KAor
ICAgICAgICAgICAgcmVwb3NpdG9yeV9pZD1zZWxmLmlkLAogICAgICAgICAgICAgcmV2aXNpb249
aW50KHJldmlzaW9uKSwKICAgICAgICAgICAgIGJyYW5jaD1icmFuY2gsCiAgICAgICAgICAgICBp
ZGVudGlmaWVyPWlkZW50aWZpZXIgaWYgaW5jbHVkZV9pZGVudGlmaWVyIGVsc2UgTm9uZSwKSW5k
ZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90
ZS9iaXRidWNrZXQucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi
a2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL2JpdGJ1Y2tldC5weQkocmV2aXNpb24gMjczOTk0
KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVt
b3RlL2JpdGJ1Y2tldC5weQkod29ya2luZyBjb3B5KQpAQCAtMzcsNyArMzcsNyBAQCBjbGFzcyBC
aXRCdWNrZXQoU2NtKToKICAgICBkZWYgaXNfd2Vic2VydmVyKGNscywgdXJsKToKICAgICAgICAg
cmV0dXJuIFRydWUgaWYgY2xzLlVSTF9SRS5tYXRjaCh1cmwpIGVsc2UgRmFsc2UKIAotICAgIGRl
ZiBfX2luaXRfXyhzZWxmLCB1cmwsIGRldl9icmFuY2hlcz1Ob25lLCBwcm9kX2JyYW5jaGVzPU5v
bmUsIGNvbnRyaWJ1dG9ycz1Ob25lKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgdXJsLCBkZXZf
YnJhbmNoZXM9Tm9uZSwgcHJvZF9icmFuY2hlcz1Ob25lLCBjb250cmlidXRvcnM9Tm9uZSwgaWQ9
Tm9uZSk6CiAgICAgICAgIG1hdGNoID0gc2VsZi5VUkxfUkUubWF0Y2godXJsKQogICAgICAgICBp
ZiBub3QgbWF0Y2g6CiAgICAgICAgICAgICByYWlzZSBzZWxmLkV4Y2VwdGlvbigiJ3t9JyBpcyBu
b3QgYSB2YWxpZCBCaXRCdWNrZXQgcHJvamVjdCIuZm9ybWF0KHVybCkpCkBAIC00NSw3ICs0NSwx
MiBAQCBjbGFzcyBCaXRCdWNrZXQoU2NtKToKICAgICAgICAgc2VsZi5wcm9qZWN0ID0gbWF0Y2gu
Z3JvdXAoJ3Byb2plY3QnKQogICAgICAgICBzZWxmLm5hbWUgPSBtYXRjaC5ncm91cCgncmVwb3Np
dG9yeScpCiAKLSAgICAgICAgc3VwZXIoQml0QnVja2V0LCBzZWxmKS5fX2luaXRfXyh1cmwsIGRl
dl9icmFuY2hlcz1kZXZfYnJhbmNoZXMsIHByb2RfYnJhbmNoZXM9cHJvZF9icmFuY2hlcywgY29u
dHJpYnV0b3JzPWNvbnRyaWJ1dG9ycykKKyAgICAgICAgc3VwZXIoQml0QnVja2V0LCBzZWxmKS5f
X2luaXRfXygKKyAgICAgICAgICAgIHVybCwKKyAgICAgICAgICAgIGRldl9icmFuY2hlcz1kZXZf
YnJhbmNoZXMsIHByb2RfYnJhbmNoZXM9cHJvZF9icmFuY2hlcywKKyAgICAgICAgICAgIGNvbnRy
aWJ1dG9ycz1jb250cmlidXRvcnMsCisgICAgICAgICAgICBpZD1pZCBvciBzZWxmLm5hbWUubG93
ZXIoKSwKKyAgICAgICAgKQogCiAgICAgQHByb3BlcnR5CiAgICAgZGVmIGlzX2dpdChzZWxmKToK
QEAgLTIzOCw2ICsyNDMsNyBAQCBjbGFzcyBCaXRCdWNrZXQoU2NtKToKICAgICAgICAgICAgIG9y
ZGVyICs9IDEKIAogICAgICAgICByZXR1cm4gQ29tbWl0KAorICAgICAgICAgICAgcmVwb3NpdG9y
eV9pZD1zZWxmLmlkLAogICAgICAgICAgICAgaGFzaD1jb21taXRfZGF0YVsnaWQnXSwKICAgICAg
ICAgICAgIHJldmlzaW9uPXJldmlzaW9uLAogICAgICAgICAgICAgYnJhbmNoX3BvaW50PWJyYW5j
aF9wb2ludCwKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp
dHNjbXB5L3JlbW90ZS9naXRfaHViLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGli
cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9naXRfaHViLnB5CShyZXZpc2lv
biAyNzM5OTQpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz
Y21weS9yZW1vdGUvZ2l0X2h1Yi5weQkod29ya2luZyBjb3B5KQpAQCAtNDIsNyArNDIsNyBAQCBj
bGFzcyBHaXRIdWIoU2NtKToKICAgICBkZWYgaXNfd2Vic2VydmVyKGNscywgdXJsKToKICAgICAg
ICAgcmV0dXJuIFRydWUgaWYgY2xzLlVSTF9SRS5tYXRjaCh1cmwpIGVsc2UgRmFsc2UKIAotICAg
IGRlZiBfX2luaXRfXyhzZWxmLCB1cmwsIGRldl9icmFuY2hlcz1Ob25lLCBwcm9kX2JyYW5jaGVz
PU5vbmUsIGNvbnRyaWJ1dG9ycz1Ob25lKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgdXJsLCBk
ZXZfYnJhbmNoZXM9Tm9uZSwgcHJvZF9icmFuY2hlcz1Ob25lLCBjb250cmlidXRvcnM9Tm9uZSwg
aWQ9Tm9uZSk6CiAgICAgICAgIG1hdGNoID0gc2VsZi5VUkxfUkUubWF0Y2godXJsKQogICAgICAg
ICBpZiBub3QgbWF0Y2g6CiAgICAgICAgICAgICByYWlzZSBzZWxmLkV4Y2VwdGlvbigiJ3t9JyBp
cyBub3QgYSB2YWxpZCBHaXRIdWIgcHJvamVjdCIuZm9ybWF0KHVybCkpCkBAIC01NSw3ICs1NSwx
MiBAQCBjbGFzcyBHaXRIdWIoU2NtKToKICAgICAgICAgKSkKICAgICAgICAgc2VsZi5fY2FjaGVk
X2NyZWRlbnRpYWxzID0gTm9uZQogCi0gICAgICAgIHN1cGVyKEdpdEh1Yiwgc2VsZikuX19pbml0
X18odXJsLCBkZXZfYnJhbmNoZXM9ZGV2X2JyYW5jaGVzLCBwcm9kX2JyYW5jaGVzPXByb2RfYnJh
bmNoZXMsIGNvbnRyaWJ1dG9ycz1jb250cmlidXRvcnMpCisgICAgICAgIHN1cGVyKEdpdEh1Yiwg
c2VsZikuX19pbml0X18oCisgICAgICAgICAgICB1cmwsCisgICAgICAgICAgICBkZXZfYnJhbmNo
ZXM9ZGV2X2JyYW5jaGVzLCBwcm9kX2JyYW5jaGVzPXByb2RfYnJhbmNoZXMsCisgICAgICAgICAg
ICBjb250cmlidXRvcnM9Y29udHJpYnV0b3JzLAorICAgICAgICAgICAgaWQ9aWQgb3Igc2VsZi5u
YW1lLmxvd2VyKCksCisgICAgICAgICkKIAogICAgIGRlZiBjcmVkZW50aWFscyhzZWxmLCByZXF1
aXJlZD1UcnVlKToKICAgICAgICAgcmV0dXJuIGNyZWRlbnRpYWxzKApAQCAtMjg1LDYgKzI5MCw3
IEBAIGNsYXNzIEdpdEh1YihTY20pOgogICAgICAgICAgICAgb3JkZXIgKz0gMQogCiAgICAgICAg
IHJldHVybiBDb21taXQoCisgICAgICAgICAgICByZXBvc2l0b3J5X2lkPXNlbGYuaWQsCiAgICAg
ICAgICAgICBoYXNoPWNvbW1pdF9kYXRhWydzaGEnXSwKICAgICAgICAgICAgIHJldmlzaW9uPXJl
dmlzaW9uLAogICAgICAgICAgICAgYnJhbmNoX3BvaW50PWJyYW5jaF9wb2ludCwKSW5kZXg6IFRv
b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9zY20u
cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi
a2l0c2NtcHkvcmVtb3RlL3NjbS5weQkocmV2aXNpb24gMjczOTk0KQorKysgVG9vbHMvU2NyaXB0
cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3NjbS5weQkod29ya2lu
ZyBjb3B5KQpAQCAtMzYsOCArMzYsOCBAQCBjbGFzcyBTY20oU2NtQmFzZSk6CiAKICAgICAgICAg
cmFpc2UgT1NFcnJvcigiJ3t9JyBpcyBub3QgYSBrbm93biBTQ00gc2VydmVyIi5mb3JtYXQodXJs
KSkKIAotICAgIGRlZiBfX2luaXRfXyhzZWxmLCB1cmwsIGRldl9icmFuY2hlcz1Ob25lLCBwcm9k
X2JyYW5jaGVzPU5vbmUsIGNvbnRyaWJ1dG9ycz1Ob25lKToKLSAgICAgICAgc3VwZXIoU2NtLCBz
ZWxmKS5fX2luaXRfXyhkZXZfYnJhbmNoZXM9ZGV2X2JyYW5jaGVzLCBwcm9kX2JyYW5jaGVzPXBy
b2RfYnJhbmNoZXMsIGNvbnRyaWJ1dG9ycz1jb250cmlidXRvcnMpCisgICAgZGVmIF9faW5pdF9f
KHNlbGYsIHVybCwgZGV2X2JyYW5jaGVzPU5vbmUsIHByb2RfYnJhbmNoZXM9Tm9uZSwgY29udHJp
YnV0b3JzPU5vbmUsIGlkPU5vbmUpOgorICAgICAgICBzdXBlcihTY20sIHNlbGYpLl9faW5pdF9f
KGRldl9icmFuY2hlcz1kZXZfYnJhbmNoZXMsIHByb2RfYnJhbmNoZXM9cHJvZF9icmFuY2hlcywg
Y29udHJpYnV0b3JzPWNvbnRyaWJ1dG9ycywgaWQ9aWQpCiAKICAgICAgICAgaWYgbm90IGlzaW5z
dGFuY2UodXJsLCBzaXguc3RyaW5nX3R5cGVzKToKICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJy
b3IoIkV4cGVjdGVkICd1cmwnIHRvIGJlIGEgc3RyaW5nIHR5cGUsIG5vdCAne30nIi5mb3JtYXQo
dHlwZSh1cmwpKSkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl
YmtpdHNjbXB5L3JlbW90ZS9zdm4ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJy
YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3N2bi5weQkocmV2aXNpb24gMjcz
OTk0KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv
cmVtb3RlL3N2bi5weQkod29ya2luZyBjb3B5KQpAQCAtNDYsMTIgKzQ2LDE4IEBAIGNsYXNzIFN2
bihTY20pOgogICAgIGRlZiBpc193ZWJzZXJ2ZXIoY2xzLCB1cmwpOgogICAgICAgICByZXR1cm4g
VHJ1ZSBpZiBjbHMuVVJMX1JFLm1hdGNoKHVybCkgZWxzZSBGYWxzZQogCi0gICAgZGVmIF9faW5p
dF9fKHNlbGYsIHVybCwgZGV2X2JyYW5jaGVzPU5vbmUsIHByb2RfYnJhbmNoZXM9Tm9uZSwgY29u
dHJpYnV0b3JzPU5vbmUpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCB1cmwsIGRldl9icmFuY2hl
cz1Ob25lLCBwcm9kX2JyYW5jaGVzPU5vbmUsIGNvbnRyaWJ1dG9ycz1Ob25lLCBpZD1Ob25lKToK
ICAgICAgICAgaWYgdXJsWy0xXSAhPSAnLyc6CiAgICAgICAgICAgICB1cmwgKz0gJy8nCiAgICAg
ICAgIGlmIG5vdCBzZWxmLmlzX3dlYnNlcnZlcih1cmwpOgogICAgICAgICAgICAgcmFpc2Ugc2Vs
Zi5FeGNlcHRpb24oIid7fScgaXMgbm90IGEgdmFsaWQgU1ZOIHdlYnNlcnZlciIuZm9ybWF0KHVy
bCkpCi0gICAgICAgIHN1cGVyKFN2biwgc2VsZikuX19pbml0X18odXJsLCBkZXZfYnJhbmNoZXM9
ZGV2X2JyYW5jaGVzLCBwcm9kX2JyYW5jaGVzPXByb2RfYnJhbmNoZXMsIGNvbnRyaWJ1dG9ycz1j
b250cmlidXRvcnMpCisKKyAgICAgICAgc3VwZXIoU3ZuLCBzZWxmKS5fX2luaXRfXygKKyAgICAg
ICAgICAgIHVybCwKKyAgICAgICAgICAgIGRldl9icmFuY2hlcz1kZXZfYnJhbmNoZXMsIHByb2Rf
YnJhbmNoZXM9cHJvZF9icmFuY2hlcywKKyAgICAgICAgICAgIGNvbnRyaWJ1dG9ycz1jb250cmli
dXRvcnMsCisgICAgICAgICAgICBpZD1pZCBvciB1cmwuc3BsaXQoJy8nKVstMl0ubG93ZXIoKSwK
KyAgICAgICAgKQogCiAgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKHNlbGYuX2NhY2hlX3BhdGgp
OgogICAgICAgICAgICAgdHJ5OgpAQCAtNDM3LDYgKzQ0Myw3IEBAIGNsYXNzIFN2bihTY20pOgog
ICAgICAgICBhdXRob3IgPSBzZWxmLmNvbnRyaWJ1dG9ycy5jcmVhdGUobmFtZSwgbmFtZSkgaWYg
bmFtZSBhbmQgJ0AnIGluIG5hbWUgZWxzZSBzZWxmLmNvbnRyaWJ1dG9ycy5jcmVhdGUobmFtZSkK
IAogICAgICAgICByZXR1cm4gQ29tbWl0KAorICAgICAgICAgICAgcmVwb3NpdG9yeV9pZD1zZWxm
LmlkLAogICAgICAgICAgICAgcmV2aXNpb249aW50KHJldmlzaW9uKSwKICAgICAgICAgICAgIGJy
YW5jaD1icmFuY2gsCiAgICAgICAgICAgICBpZGVudGlmaWVyPWlkZW50aWZpZXIgaWYgaW5jbHVk
ZV9pZGVudGlmaWVyIGVsc2UgTm9uZSwKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl
YmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t
IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0
X3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNzM5OTQpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmll
cy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5weQkod29ya2luZyBj
b3B5KQpAQCAtNDAxLDYgKzQwMSw5IEBAIGNsYXNzIFRlc3RHaXRIdWIodW5pdHRlc3QuVGVzdENh
c2UpOgogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgwLCByZW1vdGUuR2l0SHViKHNlbGYu
cmVtb3RlKS5jb21taXQoaGFzaD0nYmFlNWQxZTkwOTk5Jykub3JkZXIpCiAgICAgICAgICAgICBz
ZWxmLmFzc2VydEVxdWFsKDEsIHJlbW90ZS5HaXRIdWIoc2VsZi5yZW1vdGUpLmNvbW1pdChoYXNo
PSdkOGJjZTI2ZmE2NWMnKS5vcmRlcikKIAorICAgIGRlZiB0ZXN0X2lkKHNlbGYpOgorICAgICAg
ICBzZWxmLmFzc2VydEVxdWFsKHJlbW90ZS5HaXRIdWIoc2VsZi5yZW1vdGUpLmlkLCAnd2Via2l0
JykKKwogCiBjbGFzcyBUZXN0Qml0QnVja2V0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICByZW1v
dGUgPSAnaHR0cHM6Ly9iaXRidWNrZXQuZXhhbXBsZS5jb20vcHJvamVjdHMvV0VCS0lUL3JlcG9z
L3dlYmtpdCcKQEAgLTUxOCwzICs1MjEsNiBAQCBjbGFzcyBUZXN0Qml0QnVja2V0KHVuaXR0ZXN0
LlRlc3RDYXNlKToKICAgICAgICAgd2l0aCBtb2Nrcy5yZW1vdGUuQml0QnVja2V0KCk6CiAgICAg
ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDAsIHJlbW90ZS5CaXRCdWNrZXQoc2VsZi5yZW1vdGUp
LmNvbW1pdChoYXNoPSdiYWU1ZDFlOTA5OTknKS5vcmRlcikKICAgICAgICAgICAgIHNlbGYuYXNz
ZXJ0RXF1YWwoMSwgcmVtb3RlLkJpdEJ1Y2tldChzZWxmLnJlbW90ZSkuY29tbWl0KGhhc2g9J2Q4
YmNlMjZmYTY1YycpLm9yZGVyKQorCisgICAgZGVmIHRlc3RfaWQoc2VsZik6CisgICAgICAgIHNl
bGYuYXNzZXJ0RXF1YWwocmVtb3RlLkJpdEJ1Y2tldChzZWxmLnJlbW90ZSkuaWQsICd3ZWJraXQn
KQpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv
dGVzdC9zdm5fdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJp
ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9zdm5fdW5pdHRlc3QucHkJKHJldmlzaW9u
IDI3Mzk5NCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNj
bXB5L3Rlc3Qvc3ZuX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zMjgsMyArMzI4LDYg
QEAgY2xhc3MgVGVzdFJlbW90ZVN2bih1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIHRlc3Rf
bm9faWRlbnRpZmllcihzZWxmKToKICAgICAgICAgd2l0aCBtb2Nrcy5yZW1vdGUuU3ZuKCk6CiAg
ICAgICAgICAgICBzZWxmLmFzc2VydElzTm9uZShyZW1vdGUuU3ZuKHNlbGYucmVtb3RlKS5maW5k
KCd0cnVuaycsIGluY2x1ZGVfaWRlbnRpZmllcj1GYWxzZSkuaWRlbnRpZmllcikKKworICAgIGRl
ZiB0ZXN0X2lkKHNlbGYpOgorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJlbW90ZS5Tdm4oc2Vs
Zi5yZW1vdGUpLmlkLCAnd2Via2l0JykK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>422576</attachid>
            <date>2021-03-08 09:29:23 -0800</date>
            <delta_ts>2021-03-08 10:09:36 -0800</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-222827-20210308092922.patch</filename>
            <type>text/plain</type>
            <size>17445</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI3NDA3NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDQzIEBACisyMDIxLTAzLTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIEFkZCByZXBvc2l0b3J5X2lkCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjI4MjcKKyAgICAgICAgPHJk
YXI6Ly9wcm9ibGVtLzc1MTExMDAwPgorCisgICAgICAgIFJldmlld2VkIGJ5IERld2VpIFpodS4K
KworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5OiBCdW1w
IHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0
c2NtcHkvX19pbml0X18ucHk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dl
YmtpdHNjbXB5L3dlYmtpdHNjbXB5L2NvbW1pdC5weToKKyAgICAgICAgKENvbW1pdC5FbmNvZGVy
LmRlZmF1bHQpOiBBZGQgcmVwb3NpdG9yeV9pZC4KKyAgICAgICAgKENvbW1pdC5fX2luaXRfXyk6
IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNj
bXB5L2xvY2FsL2dpdC5weToKKyAgICAgICAgKEdpdC5fX2luaXRfXyk6IEFsbG93IGNhbGxlciB0
byBzcGVjaWZ5IHJlcG9zaXRvcnkgaWQuCisgICAgICAgIChHaXQuY29tbWl0KTogUGFzcyByZXBv
c2l0b3J5IGlkIHRvIGNvbW1pdC4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz
Y21weS93ZWJraXRzY21weS9sb2NhbC9zY20ucHk6CisgICAgICAgIChTY20uX19pbml0X18pOiBB
bGxvdyBjYWxsZXIgdG8gc3BlY2lmeSByZXBvc2l0b3J5IGlkLgorICAgICAgICAqIFNjcmlwdHMv
bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weToKKyAgICAgICAg
KFN2bi5fX2luaXRfXyk6IEFsbG93IGNhbGxlciB0byBzcGVjaWZ5IHJlcG9zaXRvcnkgaWQuCisg
ICAgICAgIChTdm4uY29tbWl0KTogUGFzcyByZXBvc2l0b3J5IGlkIHRvIGNvbW1pdC4KKyAgICAg
ICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvYml0
YnVja2V0LnB5OgorICAgICAgICAoQml0QnVja2V0Ll9faW5pdF9fKTogQWxsb3cgY2FsbGVyIHRv
IHNwZWNpZnkgcmVwb3NpdG9yeSBpZCwgaW5mZXIgZnJvbSB1cmwuCisgICAgICAgIChCaXRCdWNr
ZXQuY29tbWl0KTogUGFzcyByZXBvc2l0b3J5IGlkIHRvIGNvbW1pdC4KKyAgICAgICAgKiBTY3Jp
cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvZ2l0X2h1Yi5weToK
KyAgICAgICAgKEdpdEh1Yi5fX2luaXRfXyk6IEFsbG93IGNhbGxlciB0byBzcGVjaWZ5IHJlcG9z
aXRvcnkgaWQsIGluZmVyIGZyb20gdXJsLgorICAgICAgICAoR2l0SHViLmNvbW1pdCk6IFBhc3Mg
cmVwb3NpdG9yeSBpZCB0byBjb21taXQuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Vi
a2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3NjbS5weToKKyAgICAgICAgKFNjbS5fX2luaXRf
Xyk6IEFsbG93IGNhbGxlciB0byBzcGVjaWZ5IHJlcG9zaXRvcnkgaWQuCisgICAgICAgICogU2Ny
aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3N2bi5weToKKyAg
ICAgICAgKFN2bi5fX2luaXRfXyk6IEFsbG93IGNhbGxlciB0byBzcGVjaWZ5IHJlcG9zaXRvcnkg
aWQsIGluZmVyIGZyb20gdXJsLgorICAgICAgICAoU3ZuLmNvbW1pdCk6IFBhc3MgcmVwb3NpdG9y
eSBpZCB0byBjb21taXQuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv
d2Via2l0c2NtcHkvc2NtX2Jhc2UucHk6CisgICAgICAgIChTY21CYXNlLl9faW5pdF9fKTogQWxs
b3cgY2FsbGVyIHRvIHNwZWNpZnkgcmVwb3NpdG9yeSBpZC4KKyAgICAgICAgKiBTY3JpcHRzL2xp
YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5weToKKyAg
ICAgICAgKFRlc3RHaXRIdWIudGVzdF9pZCk6CisgICAgICAgIChUZXN0Qml0QnVja2V0LnRlc3Rf
aWQpOgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5
L3Rlc3Qvc3ZuX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdFJlbW90ZVN2bi50ZXN0X2lkKToK
KwogMjAyMS0wMy0wOCAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAK
ICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNzMwODQuCkluZGV4OiBUb29scy9TY3Jp
cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T
Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQkocmV2aXNpb24gMjc0MDc0KQor
KysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkJKHdvcmtpbmcg
Y29weSkKQEAgLTI5LDcgKzI5LDcgQEAgZGVmIHJlYWRtZSgpOgogCiBzZXR1cCgKICAgICBuYW1l
PSd3ZWJraXRzY21weScsCi0gICAgdmVyc2lvbj0nMC4xMi4zJywKKyAgICB2ZXJzaW9uPScwLjEy
LjQnLAogICAgIGRlc2NyaXB0aW9uPSdMaWJyYXJ5IGRlc2lnbmVkIHRvIGludGVyYWN0IHdpdGgg
Z2l0IGFuZCBzdm4gcmVwb3NpdG9yaWVzLicsCiAgICAgbG9uZ19kZXNjcmlwdGlvbj1yZWFkbWUo
KSwKICAgICBjbGFzc2lmaWVycz1bCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr
aXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp
cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQkocmV2aXNp
b24gMjc0MDc0KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0
c2NtcHkvX19pbml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDcgKzQ2LDcgQEAgZXhjZXB0
IEltcG9ydEVycm9yOgogICAgICAgICAiUGxlYXNlIGluc3RhbGwgd2Via2l0Y29yZXB5IHdpdGgg
YHBpcCBpbnN0YWxsIHdlYmtpdGNvcmVweSAtLWV4dHJhLWluZGV4LXVybCA8cGFja2FnZSBpbmRl
eCBVUkw+YCIKICAgICApCiAKLXZlcnNpb24gPSBWZXJzaW9uKDAsIDEyLCAzKQordmVyc2lvbiA9
IFZlcnNpb24oMCwgMTIsIDQpCiAKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2Zhc3Rl
bmVycycsIFZlcnNpb24oMCwgMTUsIDApKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2Uo
J21vbm90b25pYycsIFZlcnNpb24oMSwgNSkpKQpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJp
ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvY29tbWl0LnB5Cj09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz
L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2NvbW1pdC5weQkocmV2
aXNpb24gMjc0MDc0KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi
a2l0c2NtcHkvY29tbWl0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC00Myw3ICs0Myw3IEBAIGNsYXNz
IENvbW1pdChvYmplY3QpOgogICAgICAgICAgICAgICAgIHJldHVybiBzdXBlcihDb21taXQuRW5j
b2Rlciwgc2VsZikuZGVmYXVsdChvYmopCiAKICAgICAgICAgICAgIHJlc3VsdCA9IGRpY3QoKQot
ICAgICAgICAgICAgZm9yIGF0dHJpYnV0ZSBpbiBbJ2hhc2gnLCAncmV2aXNpb24nLCAnYnJhbmNo
JywgJ3RpbWVzdGFtcCcsICdvcmRlcicsICdtZXNzYWdlJ106CisgICAgICAgICAgICBmb3IgYXR0
cmlidXRlIGluIFsnaGFzaCcsICdyZXZpc2lvbicsICdicmFuY2gnLCAndGltZXN0YW1wJywgJ29y
ZGVyJywgJ21lc3NhZ2UnLCAncmVwb3NpdG9yeV9pZCddOgogICAgICAgICAgICAgICAgIHZhbHVl
ID0gZ2V0YXR0cihvYmosIGF0dHJpYnV0ZSwgTm9uZSkKICAgICAgICAgICAgICAgICBpZiB2YWx1
ZSBpcyBub3QgTm9uZToKICAgICAgICAgICAgICAgICAgICAgcmVzdWx0W2F0dHJpYnV0ZV0gPSB2
YWx1ZQpAQCAtMTUxLDcgKzE1MSw3IEBAIGNsYXNzIENvbW1pdChvYmplY3QpOgogICAgICAgICBo
YXNoPU5vbmUsCiAgICAgICAgIHJldmlzaW9uPU5vbmUsCiAgICAgICAgIGlkZW50aWZpZXI9Tm9u
ZSwgYnJhbmNoPU5vbmUsIGJyYW5jaF9wb2ludD1Ob25lLAotICAgICAgICB0aW1lc3RhbXA9Tm9u
ZSwgYXV0aG9yPU5vbmUsIG1lc3NhZ2U9Tm9uZSwgb3JkZXI9Tm9uZSwKKyAgICAgICAgdGltZXN0
YW1wPU5vbmUsIGF1dGhvcj1Ob25lLCBtZXNzYWdlPU5vbmUsIG9yZGVyPU5vbmUsIHJlcG9zaXRv
cnlfaWQ9Tm9uZQogICAgICk6CiAgICAgICAgIHNlbGYuaGFzaCA9IHNlbGYuX3BhcnNlX2hhc2go
aGFzaCwgZG9fYXNzZXJ0PVRydWUpCiAgICAgICAgIHNlbGYucmV2aXNpb24gPSBzZWxmLl9wYXJz
ZV9yZXZpc2lvbihyZXZpc2lvbiwgZG9fYXNzZXJ0PVRydWUpCkBAIC0yMDMsNiArMjAzLDEwIEBA
IGNsYXNzIENvbW1pdChvYmplY3QpOgogICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcigiRXhw
ZWN0ZWQgJ21lc3NhZ2UnIHRvIGJlIGEgc3RyaW5nLCBnb3QgJ3t9JyIuZm9ybWF0KG1lc3NhZ2Up
KQogICAgICAgICBzZWxmLm1lc3NhZ2UgPSBtZXNzYWdlCiAKKyAgICAgICAgaWYgcmVwb3NpdG9y
eV9pZCBhbmQgbm90IGlzaW5zdGFuY2UocmVwb3NpdG9yeV9pZCwgc2l4LnN0cmluZ190eXBlcyk6
CisgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCJFeHBlY3RlZCAncmVwb3NpdG9yeV9pZCcg
dG8gYmUgYSBzdHJpbmcsIGdvdCAne30nIi5mb3JtYXQocmVwb3NpdG9yeV9pZCkpCisgICAgICAg
IHNlbGYucmVwb3NpdG9yeV9pZCA9IHJlcG9zaXRvcnlfaWQKKwogICAgICAgICAjIEZvcmNlIGEg
Y29tbWl0IGZvcm1hdCBjaGVjawogICAgICAgICBzZWxmLl9fcmVwcl9fKCkKIApJbmRleDogVG9v
bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvc2NtX2Jhc2UucHkK
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0
c2NtcHkvc2NtX2Jhc2UucHkJKHJldmlzaW9uIDI3NDA3NCkKKysrIFRvb2xzL1NjcmlwdHMvbGli
cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3NjbV9iYXNlLnB5CSh3b3JraW5nIGNvcHkp
CkBAIC00MCwxMiArNDAsMTYgQEAgY2xhc3MgU2NtQmFzZShvYmplY3QpOgogICAgIEdJVF9TVk5f
UkVWSVNJT04gPSByZS5jb21waWxlKHInZ2l0LXN2bi1pZDogXFMrOlwvXC8uK0AoP1A8cmV2aXNp
b24+XGQrKSAuKy0uKy0uKy0uKycpCiAgICAgREVGQVVMVF9CUkFOQ0hFUyA9IFsnbWFpbicsICdt
YXN0ZXInLCAndHJ1bmsnXQogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIGRldl9icmFuY2hlcz1O
b25lLCBwcm9kX2JyYW5jaGVzPU5vbmUsIGNvbnRyaWJ1dG9ycz1Ob25lKToKKyAgICBkZWYgX19p
bml0X18oc2VsZiwgZGV2X2JyYW5jaGVzPU5vbmUsIHByb2RfYnJhbmNoZXM9Tm9uZSwgY29udHJp
YnV0b3JzPU5vbmUsIGlkPU5vbmUpOgogICAgICAgICBzZWxmLmRldl9icmFuY2hlcyA9IGRldl9i
cmFuY2hlcyBvciBzZWxmLkRFVl9CUkFOQ0hFUwogICAgICAgICBzZWxmLnByb2RfYnJhbmNoZXMg
PSBwcm9kX2JyYW5jaGVzIG9yIHNlbGYuUFJPRF9CUkFOQ0hFUwogICAgICAgICBzZWxmLnBhdGgg
PSBOb25lCiAgICAgICAgIHNlbGYuY29udHJpYnV0b3JzID0gQ29udHJpYnV0b3IuTWFwcGluZygp
IGlmIGNvbnRyaWJ1dG9ycyBpcyBOb25lIGVsc2UgY29udHJpYnV0b3JzCiAKKyAgICAgICAgaWYg
aWQgYW5kIG5vdCBpc2luc3RhbmNlKGlkLCBzaXguc3RyaW5nX3R5cGVzKToKKyAgICAgICAgICAg
IHJhaXNlIFZhbHVlRXJyb3IoIkV4cGVjdGVkICdpZCcgdG8gYmUgYSBzdHJpbmcgdHlwZSwgbm90
ICd7fSciLmZvcm1hdCh0eXBlKGlkKSkpCisgICAgICAgIHNlbGYuaWQgPSBpZAorCiAgICAgQHBy
b3BlcnR5CiAgICAgZGVmIGlzX3N2bihzZWxmKToKICAgICAgICAgcmV0dXJuIEZhbHNlCkluZGV4
OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9n
aXQucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv
d2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5CShyZXZpc2lvbiAyNzQwNzQpCisrKyBUb29scy9TY3Jp
cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkJKHdvcmtp
bmcgY29weSkKQEAgLTQyLDggKzQyLDggQEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgZGVmIGlzX2No
ZWNrb3V0KGNscywgcGF0aCk6CiAgICAgICAgIHJldHVybiBydW4oW2Nscy5leGVjdXRhYmxlKCks
ICdyZXYtcGFyc2UnLCAnLS1zaG93LXRvcGxldmVsJ10sIGN3ZD1wYXRoLCBjYXB0dXJlX291dHB1
dD1UcnVlKS5yZXR1cm5jb2RlID09IDAKIAotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwYXRoLCBk
ZXZfYnJhbmNoZXM9Tm9uZSwgcHJvZF9icmFuY2hlcz1Ob25lLCBjb250cmlidXRvcnM9Tm9uZSk6
Ci0gICAgICAgIHN1cGVyKEdpdCwgc2VsZikuX19pbml0X18ocGF0aCwgZGV2X2JyYW5jaGVzPWRl
dl9icmFuY2hlcywgcHJvZF9icmFuY2hlcz1wcm9kX2JyYW5jaGVzLCBjb250cmlidXRvcnM9Y29u
dHJpYnV0b3JzKQorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwYXRoLCBkZXZfYnJhbmNoZXM9Tm9u
ZSwgcHJvZF9icmFuY2hlcz1Ob25lLCBjb250cmlidXRvcnM9Tm9uZSwgaWQ9Tm9uZSk6CisgICAg
ICAgIHN1cGVyKEdpdCwgc2VsZikuX19pbml0X18ocGF0aCwgZGV2X2JyYW5jaGVzPWRldl9icmFu
Y2hlcywgcHJvZF9icmFuY2hlcz1wcm9kX2JyYW5jaGVzLCBjb250cmlidXRvcnM9Y29udHJpYnV0
b3JzLCBpZD1pZCkKICAgICAgICAgaWYgbm90IHNlbGYucm9vdF9wYXRoOgogICAgICAgICAgICAg
cmFpc2UgT1NFcnJvcignUHJvdmlkZWQgcGF0aCB7fSBpcyBub3QgYSBnaXQgcmVwb3NpdG9yeScu
Zm9ybWF0KHBhdGgpKQogCkBAIC0yNzEsNiArMjcxLDcgQEAgY2xhc3MgR2l0KFNjbSk6CiAgICAg
ICAgICAgICBvcmRlciArPSAxCiAKICAgICAgICAgcmV0dXJuIENvbW1pdCgKKyAgICAgICAgICAg
IHJlcG9zaXRvcnlfaWQ9c2VsZi5pZCwKICAgICAgICAgICAgIGhhc2g9aGFzaCwKICAgICAgICAg
ICAgIHJldmlzaW9uPXJldmlzaW9uLAogICAgICAgICAgICAgaWRlbnRpZmllcj1pZGVudGlmaWVy
IGlmIGluY2x1ZGVfaWRlbnRpZmllciBlbHNlIE5vbmUsCkluZGV4OiBUb29scy9TY3JpcHRzL2xp
YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zY20ucHkKPT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot
LS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwv
c2NtLnB5CShyZXZpc2lvbiAyNzQwNzQpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr
aXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zY20ucHkJKHdvcmtpbmcgY29weSkKQEAgLTU0LDgg
KzU0LDggQEAgY2xhc3MgU2NtKFNjbUJhc2UpOgogICAgICAgICAgICAgcmV0dXJuIGxvY2FsLlN2
bihwYXRoLCBjb250cmlidXRvcnM9Y29udHJpYnV0b3JzKQogICAgICAgICByYWlzZSBPU0Vycm9y
KCIne30nIGlzIG5vdCBhIGtub3duIFNDTSB0eXBlIi5mb3JtYXQocGF0aCkpCiAKLSAgICBkZWYg
X19pbml0X18oc2VsZiwgcGF0aCwgZGV2X2JyYW5jaGVzPU5vbmUsIHByb2RfYnJhbmNoZXM9Tm9u
ZSwgY29udHJpYnV0b3JzPU5vbmUpOgotICAgICAgICBzdXBlcihTY20sIHNlbGYpLl9faW5pdF9f
KGRldl9icmFuY2hlcz1kZXZfYnJhbmNoZXMsIHByb2RfYnJhbmNoZXM9cHJvZF9icmFuY2hlcywg
Y29udHJpYnV0b3JzPWNvbnRyaWJ1dG9ycykKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcGF0aCwg
ZGV2X2JyYW5jaGVzPU5vbmUsIHByb2RfYnJhbmNoZXM9Tm9uZSwgY29udHJpYnV0b3JzPU5vbmUs
IGlkPU5vbmUpOgorICAgICAgICBzdXBlcihTY20sIHNlbGYpLl9faW5pdF9fKGRldl9icmFuY2hl
cz1kZXZfYnJhbmNoZXMsIHByb2RfYnJhbmNoZXM9cHJvZF9icmFuY2hlcywgY29udHJpYnV0b3Jz
PWNvbnRyaWJ1dG9ycywgaWQ9aWQpCiAKICAgICAgICAgaWYgbm90IGlzaW5zdGFuY2UocGF0aCwg
c2l4LnN0cmluZ190eXBlcyk6CiAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCJFeHBlY3Rl
ZCAncGF0aCcgdG8gYmUgYSBzdHJpbmcgdHlwZSwgbm90ICd7fSciLmZvcm1hdCh0eXBlKHBhdGgp
KSkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5
L2xvY2FsL3N2bi5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr
aXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zdm4ucHkJKHJldmlzaW9uIDI3NDA3NCkKKysrIFRv
b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5w
eQkod29ya2luZyBjb3B5KQpAQCAtNTAsOCArNTAsOCBAQCBjbGFzcyBTdm4oU2NtKToKICAgICBk
ZWYgaXNfY2hlY2tvdXQoY2xzLCBwYXRoKToKICAgICAgICAgcmV0dXJuIHJ1bihbY2xzLmV4ZWN1
dGFibGUoKSwgJ2luZm8nXSwgY3dkPXBhdGgsIGNhcHR1cmVfb3V0cHV0PVRydWUpLnJldHVybmNv
ZGUgPT0gMAogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBhdGgsIGRldl9icmFuY2hlcz1Ob25l
LCBwcm9kX2JyYW5jaGVzPU5vbmUsIGNvbnRyaWJ1dG9ycz1Ob25lKToKLSAgICAgICAgc3VwZXIo
U3ZuLCBzZWxmKS5fX2luaXRfXyhwYXRoLCBkZXZfYnJhbmNoZXM9ZGV2X2JyYW5jaGVzLCBwcm9k
X2JyYW5jaGVzPXByb2RfYnJhbmNoZXMsIGNvbnRyaWJ1dG9ycz1jb250cmlidXRvcnMpCisgICAg
ZGVmIF9faW5pdF9fKHNlbGYsIHBhdGgsIGRldl9icmFuY2hlcz1Ob25lLCBwcm9kX2JyYW5jaGVz
PU5vbmUsIGNvbnRyaWJ1dG9ycz1Ob25lLCBpZD1Ob25lKToKKyAgICAgICAgc3VwZXIoU3ZuLCBz
ZWxmKS5fX2luaXRfXyhwYXRoLCBkZXZfYnJhbmNoZXM9ZGV2X2JyYW5jaGVzLCBwcm9kX2JyYW5j
aGVzPXByb2RfYnJhbmNoZXMsIGNvbnRyaWJ1dG9ycz1jb250cmlidXRvcnMsIGlkPWlkKQogCiAg
ICAgICAgIHNlbGYuX3Jvb3RfcGF0aCA9IHNlbGYucGF0aAogICAgICAgICBzZWxmLl9yb290X3Bh
dGggPSBzZWxmLmluZm8oY2FjaGVkPUZhbHNlKS5nZXQoJ1dvcmtpbmcgQ29weSBSb290IFBhdGgn
KQpAQCAtMzgwLDYgKzM4MCw3IEBAIGNsYXNzIFN2bihTY20pOgogICAgICAgICAgICAgbWVzc2Fn
ZSA9IE5vbmUKIAogICAgICAgICByZXR1cm4gQ29tbWl0KAorICAgICAgICAgICAgcmVwb3NpdG9y
eV9pZD1zZWxmLmlkLAogICAgICAgICAgICAgcmV2aXNpb249aW50KHJldmlzaW9uKSwKICAgICAg
ICAgICAgIGJyYW5jaD1icmFuY2gsCiAgICAgICAgICAgICBpZGVudGlmaWVyPWlkZW50aWZpZXIg
aWYgaW5jbHVkZV9pZGVudGlmaWVyIGVsc2UgTm9uZSwKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGli
cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9iaXRidWNrZXQucHkKPT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv
cmVtb3RlL2JpdGJ1Y2tldC5weQkocmV2aXNpb24gMjc0MDc0KQorKysgVG9vbHMvU2NyaXB0cy9s
aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL2JpdGJ1Y2tldC5weQkod29y
a2luZyBjb3B5KQpAQCAtMzcsNyArMzcsNyBAQCBjbGFzcyBCaXRCdWNrZXQoU2NtKToKICAgICBk
ZWYgaXNfd2Vic2VydmVyKGNscywgdXJsKToKICAgICAgICAgcmV0dXJuIFRydWUgaWYgY2xzLlVS
TF9SRS5tYXRjaCh1cmwpIGVsc2UgRmFsc2UKIAotICAgIGRlZiBfX2luaXRfXyhzZWxmLCB1cmws
IGRldl9icmFuY2hlcz1Ob25lLCBwcm9kX2JyYW5jaGVzPU5vbmUsIGNvbnRyaWJ1dG9ycz1Ob25l
KToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgdXJsLCBkZXZfYnJhbmNoZXM9Tm9uZSwgcHJvZF9i
cmFuY2hlcz1Ob25lLCBjb250cmlidXRvcnM9Tm9uZSwgaWQ9Tm9uZSk6CiAgICAgICAgIG1hdGNo
ID0gc2VsZi5VUkxfUkUubWF0Y2godXJsKQogICAgICAgICBpZiBub3QgbWF0Y2g6CiAgICAgICAg
ICAgICByYWlzZSBzZWxmLkV4Y2VwdGlvbigiJ3t9JyBpcyBub3QgYSB2YWxpZCBCaXRCdWNrZXQg
cHJvamVjdCIuZm9ybWF0KHVybCkpCkBAIC00NSw3ICs0NSwxMiBAQCBjbGFzcyBCaXRCdWNrZXQo
U2NtKToKICAgICAgICAgc2VsZi5wcm9qZWN0ID0gbWF0Y2guZ3JvdXAoJ3Byb2plY3QnKQogICAg
ICAgICBzZWxmLm5hbWUgPSBtYXRjaC5ncm91cCgncmVwb3NpdG9yeScpCiAKLSAgICAgICAgc3Vw
ZXIoQml0QnVja2V0LCBzZWxmKS5fX2luaXRfXyh1cmwsIGRldl9icmFuY2hlcz1kZXZfYnJhbmNo
ZXMsIHByb2RfYnJhbmNoZXM9cHJvZF9icmFuY2hlcywgY29udHJpYnV0b3JzPWNvbnRyaWJ1dG9y
cykKKyAgICAgICAgc3VwZXIoQml0QnVja2V0LCBzZWxmKS5fX2luaXRfXygKKyAgICAgICAgICAg
IHVybCwKKyAgICAgICAgICAgIGRldl9icmFuY2hlcz1kZXZfYnJhbmNoZXMsIHByb2RfYnJhbmNo
ZXM9cHJvZF9icmFuY2hlcywKKyAgICAgICAgICAgIGNvbnRyaWJ1dG9ycz1jb250cmlidXRvcnMs
CisgICAgICAgICAgICBpZD1pZCBvciBzZWxmLm5hbWUubG93ZXIoKSwKKyAgICAgICAgKQogCiAg
ICAgQHByb3BlcnR5CiAgICAgZGVmIGlzX2dpdChzZWxmKToKQEAgLTIzOCw2ICsyNDMsNyBAQCBj
bGFzcyBCaXRCdWNrZXQoU2NtKToKICAgICAgICAgICAgIG9yZGVyICs9IDEKIAogICAgICAgICBy
ZXR1cm4gQ29tbWl0KAorICAgICAgICAgICAgcmVwb3NpdG9yeV9pZD1zZWxmLmlkLAogICAgICAg
ICAgICAgaGFzaD1jb21taXRfZGF0YVsnaWQnXSwKICAgICAgICAgICAgIHJldmlzaW9uPXJldmlz
aW9uLAogICAgICAgICAgICAgYnJhbmNoX3BvaW50PWJyYW5jaF9wb2ludCwKSW5kZXg6IFRvb2xz
L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9naXRfaHVi
LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl
YmtpdHNjbXB5L3JlbW90ZS9naXRfaHViLnB5CShyZXZpc2lvbiAyNzQwNzQpCisrKyBUb29scy9T
Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvZ2l0X2h1Yi5w
eQkod29ya2luZyBjb3B5KQpAQCAtNDIsNyArNDIsNyBAQCBjbGFzcyBHaXRIdWIoU2NtKToKICAg
ICBkZWYgaXNfd2Vic2VydmVyKGNscywgdXJsKToKICAgICAgICAgcmV0dXJuIFRydWUgaWYgY2xz
LlVSTF9SRS5tYXRjaCh1cmwpIGVsc2UgRmFsc2UKIAotICAgIGRlZiBfX2luaXRfXyhzZWxmLCB1
cmwsIGRldl9icmFuY2hlcz1Ob25lLCBwcm9kX2JyYW5jaGVzPU5vbmUsIGNvbnRyaWJ1dG9ycz1O
b25lKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgdXJsLCBkZXZfYnJhbmNoZXM9Tm9uZSwgcHJv
ZF9icmFuY2hlcz1Ob25lLCBjb250cmlidXRvcnM9Tm9uZSwgaWQ9Tm9uZSk6CiAgICAgICAgIG1h
dGNoID0gc2VsZi5VUkxfUkUubWF0Y2godXJsKQogICAgICAgICBpZiBub3QgbWF0Y2g6CiAgICAg
ICAgICAgICByYWlzZSBzZWxmLkV4Y2VwdGlvbigiJ3t9JyBpcyBub3QgYSB2YWxpZCBHaXRIdWIg
cHJvamVjdCIuZm9ybWF0KHVybCkpCkBAIC01NSw3ICs1NSwxMiBAQCBjbGFzcyBHaXRIdWIoU2Nt
KToKICAgICAgICAgKSkKICAgICAgICAgc2VsZi5fY2FjaGVkX2NyZWRlbnRpYWxzID0gTm9uZQog
Ci0gICAgICAgIHN1cGVyKEdpdEh1Yiwgc2VsZikuX19pbml0X18odXJsLCBkZXZfYnJhbmNoZXM9
ZGV2X2JyYW5jaGVzLCBwcm9kX2JyYW5jaGVzPXByb2RfYnJhbmNoZXMsIGNvbnRyaWJ1dG9ycz1j
b250cmlidXRvcnMpCisgICAgICAgIHN1cGVyKEdpdEh1Yiwgc2VsZikuX19pbml0X18oCisgICAg
ICAgICAgICB1cmwsCisgICAgICAgICAgICBkZXZfYnJhbmNoZXM9ZGV2X2JyYW5jaGVzLCBwcm9k
X2JyYW5jaGVzPXByb2RfYnJhbmNoZXMsCisgICAgICAgICAgICBjb250cmlidXRvcnM9Y29udHJp
YnV0b3JzLAorICAgICAgICAgICAgaWQ9aWQgb3Igc2VsZi5uYW1lLmxvd2VyKCksCisgICAgICAg
ICkKIAogICAgIGRlZiBjcmVkZW50aWFscyhzZWxmLCByZXF1aXJlZD1UcnVlKToKICAgICAgICAg
cmV0dXJuIGNyZWRlbnRpYWxzKApAQCAtMjg1LDYgKzI5MCw3IEBAIGNsYXNzIEdpdEh1YihTY20p
OgogICAgICAgICAgICAgb3JkZXIgKz0gMQogCiAgICAgICAgIHJldHVybiBDb21taXQoCisgICAg
ICAgICAgICByZXBvc2l0b3J5X2lkPXNlbGYuaWQsCiAgICAgICAgICAgICBoYXNoPWNvbW1pdF9k
YXRhWydzaGEnXSwKICAgICAgICAgICAgIHJldmlzaW9uPXJldmlzaW9uLAogICAgICAgICAgICAg
YnJhbmNoX3BvaW50PWJyYW5jaF9wb2ludCwKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVz
L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9zY20ucHkKPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v
bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3NjbS5w
eQkocmV2aXNpb24gMjc0MDc0KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt
cHkvd2Via2l0c2NtcHkvcmVtb3RlL3NjbS5weQkod29ya2luZyBjb3B5KQpAQCAtMzYsOCArMzYs
OCBAQCBjbGFzcyBTY20oU2NtQmFzZSk6CiAKICAgICAgICAgcmFpc2UgT1NFcnJvcigiJ3t9JyBp
cyBub3QgYSBrbm93biBTQ00gc2VydmVyIi5mb3JtYXQodXJsKSkKIAotICAgIGRlZiBfX2luaXRf
XyhzZWxmLCB1cmwsIGRldl9icmFuY2hlcz1Ob25lLCBwcm9kX2JyYW5jaGVzPU5vbmUsIGNvbnRy
aWJ1dG9ycz1Ob25lKToKLSAgICAgICAgc3VwZXIoU2NtLCBzZWxmKS5fX2luaXRfXyhkZXZfYnJh
bmNoZXM9ZGV2X2JyYW5jaGVzLCBwcm9kX2JyYW5jaGVzPXByb2RfYnJhbmNoZXMsIGNvbnRyaWJ1
dG9ycz1jb250cmlidXRvcnMpCisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHVybCwgZGV2X2JyYW5j
aGVzPU5vbmUsIHByb2RfYnJhbmNoZXM9Tm9uZSwgY29udHJpYnV0b3JzPU5vbmUsIGlkPU5vbmUp
OgorICAgICAgICBzdXBlcihTY20sIHNlbGYpLl9faW5pdF9fKGRldl9icmFuY2hlcz1kZXZfYnJh
bmNoZXMsIHByb2RfYnJhbmNoZXM9cHJvZF9icmFuY2hlcywgY29udHJpYnV0b3JzPWNvbnRyaWJ1
dG9ycywgaWQ9aWQpCiAKICAgICAgICAgaWYgbm90IGlzaW5zdGFuY2UodXJsLCBzaXguc3RyaW5n
X3R5cGVzKToKICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoIkV4cGVjdGVkICd1cmwnIHRv
IGJlIGEgc3RyaW5nIHR5cGUsIG5vdCAne30nIi5mb3JtYXQodHlwZSh1cmwpKSkKSW5kZXg6IFRv
b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9zdm4u
cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi
a2l0c2NtcHkvcmVtb3RlL3N2bi5weQkocmV2aXNpb24gMjc0MDc0KQorKysgVG9vbHMvU2NyaXB0
cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3N2bi5weQkod29ya2lu
ZyBjb3B5KQpAQCAtNDYsMTIgKzQ2LDE4IEBAIGNsYXNzIFN2bihTY20pOgogICAgIGRlZiBpc193
ZWJzZXJ2ZXIoY2xzLCB1cmwpOgogICAgICAgICByZXR1cm4gVHJ1ZSBpZiBjbHMuVVJMX1JFLm1h
dGNoKHVybCkgZWxzZSBGYWxzZQogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHVybCwgZGV2X2Jy
YW5jaGVzPU5vbmUsIHByb2RfYnJhbmNoZXM9Tm9uZSwgY29udHJpYnV0b3JzPU5vbmUpOgorICAg
IGRlZiBfX2luaXRfXyhzZWxmLCB1cmwsIGRldl9icmFuY2hlcz1Ob25lLCBwcm9kX2JyYW5jaGVz
PU5vbmUsIGNvbnRyaWJ1dG9ycz1Ob25lLCBpZD1Ob25lKToKICAgICAgICAgaWYgdXJsWy0xXSAh
PSAnLyc6CiAgICAgICAgICAgICB1cmwgKz0gJy8nCiAgICAgICAgIGlmIG5vdCBzZWxmLmlzX3dl
YnNlcnZlcih1cmwpOgogICAgICAgICAgICAgcmFpc2Ugc2VsZi5FeGNlcHRpb24oIid7fScgaXMg
bm90IGEgdmFsaWQgU1ZOIHdlYnNlcnZlciIuZm9ybWF0KHVybCkpCi0gICAgICAgIHN1cGVyKFN2
biwgc2VsZikuX19pbml0X18odXJsLCBkZXZfYnJhbmNoZXM9ZGV2X2JyYW5jaGVzLCBwcm9kX2Jy
YW5jaGVzPXByb2RfYnJhbmNoZXMsIGNvbnRyaWJ1dG9ycz1jb250cmlidXRvcnMpCisKKyAgICAg
ICAgc3VwZXIoU3ZuLCBzZWxmKS5fX2luaXRfXygKKyAgICAgICAgICAgIHVybCwKKyAgICAgICAg
ICAgIGRldl9icmFuY2hlcz1kZXZfYnJhbmNoZXMsIHByb2RfYnJhbmNoZXM9cHJvZF9icmFuY2hl
cywKKyAgICAgICAgICAgIGNvbnRyaWJ1dG9ycz1jb250cmlidXRvcnMsCisgICAgICAgICAgICBp
ZD1pZCBvciB1cmwuc3BsaXQoJy8nKVstMl0ubG93ZXIoKSwKKyAgICAgICAgKQogCiAgICAgICAg
IGlmIG9zLnBhdGguZXhpc3RzKHNlbGYuX2NhY2hlX3BhdGgpOgogICAgICAgICAgICAgdHJ5OgpA
QCAtNDM3LDYgKzQ0Myw3IEBAIGNsYXNzIFN2bihTY20pOgogICAgICAgICBhdXRob3IgPSBzZWxm
LmNvbnRyaWJ1dG9ycy5jcmVhdGUobmFtZSwgbmFtZSkgaWYgbmFtZSBhbmQgJ0AnIGluIG5hbWUg
ZWxzZSBzZWxmLmNvbnRyaWJ1dG9ycy5jcmVhdGUobmFtZSkKIAogICAgICAgICByZXR1cm4gQ29t
bWl0KAorICAgICAgICAgICAgcmVwb3NpdG9yeV9pZD1zZWxmLmlkLAogICAgICAgICAgICAgcmV2
aXNpb249aW50KHJldmlzaW9uKSwKICAgICAgICAgICAgIGJyYW5jaD1icmFuY2gsCiAgICAgICAg
ICAgICBpZGVudGlmaWVyPWlkZW50aWZpZXIgaWYgaW5jbHVkZV9pZGVudGlmaWVyIGVsc2UgTm9u
ZSwKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5
L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFy
aWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5CShyZXZpc2lv
biAyNzQwNzQpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz
Y21weS90ZXN0L2dpdF91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtNDAxLDYgKzQwMSw5
IEBAIGNsYXNzIFRlc3RHaXRIdWIodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgc2Vs
Zi5hc3NlcnRFcXVhbCgwLCByZW1vdGUuR2l0SHViKHNlbGYucmVtb3RlKS5jb21taXQoaGFzaD0n
YmFlNWQxZTkwOTk5Jykub3JkZXIpCiAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDEsIHJl
bW90ZS5HaXRIdWIoc2VsZi5yZW1vdGUpLmNvbW1pdChoYXNoPSdkOGJjZTI2ZmE2NWMnKS5vcmRl
cikKIAorICAgIGRlZiB0ZXN0X2lkKHNlbGYpOgorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJl
bW90ZS5HaXRIdWIoc2VsZi5yZW1vdGUpLmlkLCAnd2Via2l0JykKKwogCiBjbGFzcyBUZXN0Qml0
QnVja2V0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICByZW1vdGUgPSAnaHR0cHM6Ly9iaXRidWNr
ZXQuZXhhbXBsZS5jb20vcHJvamVjdHMvV0VCS0lUL3JlcG9zL3dlYmtpdCcKQEAgLTUxOCwzICs1
MjEsNiBAQCBjbGFzcyBUZXN0Qml0QnVja2V0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAg
d2l0aCBtb2Nrcy5yZW1vdGUuQml0QnVja2V0KCk6CiAgICAgICAgICAgICBzZWxmLmFzc2VydEVx
dWFsKDAsIHJlbW90ZS5CaXRCdWNrZXQoc2VsZi5yZW1vdGUpLmNvbW1pdChoYXNoPSdiYWU1ZDFl
OTA5OTknKS5vcmRlcikKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoMSwgcmVtb3RlLkJp
dEJ1Y2tldChzZWxmLnJlbW90ZSkuY29tbWl0KGhhc2g9J2Q4YmNlMjZmYTY1YycpLm9yZGVyKQor
CisgICAgZGVmIHRlc3RfaWQoc2VsZik6CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVtb3Rl
LkJpdEJ1Y2tldChzZWxmLnJlbW90ZSkuaWQsICd3ZWJraXQnKQpJbmRleDogVG9vbHMvU2NyaXB0
cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9zdm5fdW5pdHRlc3QucHkK
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0
c2NtcHkvdGVzdC9zdm5fdW5pdHRlc3QucHkJKHJldmlzaW9uIDI3NDA3NCkKKysrIFRvb2xzL1Nj
cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3Qvc3ZuX3VuaXR0ZXN0
LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zMjgsMyArMzI4LDYgQEAgY2xhc3MgVGVzdFJlbW90ZVN2
bih1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIHRlc3Rfbm9faWRlbnRpZmllcihzZWxmKToK
ICAgICAgICAgd2l0aCBtb2Nrcy5yZW1vdGUuU3ZuKCk6CiAgICAgICAgICAgICBzZWxmLmFzc2Vy
dElzTm9uZShyZW1vdGUuU3ZuKHNlbGYucmVtb3RlKS5maW5kKCd0cnVuaycsIGluY2x1ZGVfaWRl
bnRpZmllcj1GYWxzZSkuaWRlbnRpZmllcikKKworICAgIGRlZiB0ZXN0X2lkKHNlbGYpOgorICAg
ICAgICBzZWxmLmFzc2VydEVxdWFsKHJlbW90ZS5Tdm4oc2VsZi5yZW1vdGUpLmlkLCAnd2Via2l0
JykK
</data>

          </attachment>
      

    </bug>

</bugzilla>