<?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>217793</bug_id>
          
          <creation_ts>2020-10-15 16:04:33 -0700</creation_ts>
          <short_desc>[webkitpy] Use webkitcorepy&apos;s autoinstaller for plint</short_desc>
          <delta_ts>2020-10-16 10:50:05 -0700</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>
          
          <see_also>https://bugs.webkit.org/show_bug.cgi?id=214950</see_also>
          <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>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1698336</commentid>
    <comment_count>0</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-10-15 16:04:33 -0700</bug_when>
    <thetext>Part of removing webkitpy&apos;s autoinstaller in favor of webkitcorepy&apos;s.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1698339</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-10-15 16:05:00 -0700</bug_when>
    <thetext>&lt;rdar://problem/70356095&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1698340</commentid>
    <comment_count>2</comment_count>
      <attachid>411504</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-10-15 16:07:19 -0700</bug_when>
    <thetext>Created attachment 411504
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1698650</commentid>
    <comment_count>3</comment_count>
    <who name="Aakash Jain">aakash_jain</who>
    <bug_when>2020-10-16 09:49:21 -0700</bug_when>
    <thetext>rs=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1698660</commentid>
    <comment_count>4</comment_count>
      <attachid>411593</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-10-16 10:17:37 -0700</bug_when>
    <thetext>Created attachment 411593
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1698670</commentid>
    <comment_count>5</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-10-16 10:50:04 -0700</bug_when>
    <thetext>Committed r268597: &lt;https://trac.webkit.org/changeset/268597&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 411593.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>411504</attachid>
            <date>2020-10-15 16:07:19 -0700</date>
            <delta_ts>2020-10-16 10:17:35 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-217793-20201015160718.patch</filename>
            <type>text/plain</type>
            <size>10468</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI2ODU1OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDI2IEBACisyMDIwLTEwLTE1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBbd2Via2l0cHldIFVzZSB3ZWJraXRjb3JlcHkncyBhdXRvaW5zdGFsbGVy
IGZvciBwbGludCAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp
P2lkPTIxNzc5MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzAzNTYwOTU+CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmll
cy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5OiBCdW1wIHZlcnNpb24uCisg
ICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRv
aW5zdGFsbC5weToKKyAgICAgICAgKEF1dG9JbnN0YWxsKTogU3VwcG9ydCBtdWx0aXBsZSBhbGlh
c2VzIHRvIGEgc2luZ2xlIGxpYnJhcnkuCisgICAgICAgIChBdXRvSW5zdGFsbC5yZWdpc3Rlcik6
CisgICAgICAgIChBdXRvSW5zdGFsbC5pbnN0YWxsKToKKyAgICAgICAgKEF1dG9JbnN0YWxsLmlu
c3RhbGxfZXZlcnl0aGluZyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9fX2luaXRfXy5w
eTogQWRkIHB5bGludCwgbWFwIGluc3RhbGwgem9wZS5pbnRlcmZhY2Ugd2hlbiB6b3BlIGlzIGlt
cG9ydGVkLiAKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3B5dGhv
bi5weToKKyAgICAgICAgKFB5bGludGVyLnJ1bik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw
eS90aGlyZHBhcnR5L19faW5pdF9fLnB5OgorICAgICAgICAoQXV0b2luc3RhbGxJbXBvcnRIb29r
LmZpbmRfbW9kdWxlKTogUmVtb3ZlIF9pbnN0YWxsX3B5bGludCgpLgorICAgICAgICAoQXV0b2lu
c3RhbGxJbXBvcnRIb29rLl9pbnN0YWxsX3B5bGludCk6IERlbGV0ZWQuCisgICAgICAgICogU2Ny
aXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fX3VuaXR0ZXN0LnB5OgorICAgICAgICAo
VGhpcmRwYXJ0eVRlc3QudGVzdF9pbXBvcnRzKTogbWVjaGFuaXplIGFuZCBweWxpbnQgYXJlIG1h
bmFnZWQgYnkgdGhlIG5ldyBhdXRvaW5zdGFsbGVyLgorCiAyMDIwLTEwLTE1ICBKb25hdGhhbiBC
ZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBbd2Via2l0cHldIFVzZSB3ZWJr
aXRjb3JlcHkncyBhdXRvaW5zdGFsbGVyIGZvciBtZWNoYW5pemUKSW5kZXg6IFRvb2xzL1Njcmlw
dHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHkKPT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVw
eS9fX2luaXRfXy5weQkocmV2aXNpb24gMjY4NTUyKQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJp
ZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQkod29ya2luZyBjb3B5KQpA
QCAtMzUsNyArMzUsNyBAQCBmcm9tIHdlYmtpdGNvcmVweS50aW1lb3V0IGltcG9ydCBUaW1lb3V0
CiBmcm9tIHdlYmtpdGNvcmVweS5zdWJwcm9jZXNzX3V0aWxzIGltcG9ydCBUaW1lb3V0RXhwaXJl
ZCwgQ29tcGxldGVkUHJvY2VzcywgcnVuCiBmcm9tIHdlYmtpdGNvcmVweS5vdXRwdXRfY2FwdHVy
ZSBpbXBvcnQgTG9nZ2VyQ2FwdHVyZSwgT3V0cHV0Q2FwdHVyZSwgT3V0cHV0RHVwbGljYXRlCiAK
LXZlcnNpb24gPSBWZXJzaW9uKDAsIDQsIDE3KQordmVyc2lvbiA9IFZlcnNpb24oMCwgNCwgMTgp
CiAKIGZyb20gd2Via2l0Y29yZXB5LmF1dG9pbnN0YWxsIGltcG9ydCBQYWNrYWdlLCBBdXRvSW5z
dGFsbAogaWYgc3lzLnZlcnNpb25faW5mbyA+ICgzLCAwKToKSW5kZXg6IFRvb2xzL1NjcmlwdHMv
bGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHkKPT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVw
eS9hdXRvaW5zdGFsbC5weQkocmV2aXNpb24gMjY4NTUyKQorKysgVG9vbHMvU2NyaXB0cy9saWJy
YXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weQkod29ya2luZyBj
b3B5KQpAQCAtMzMsNiArMzMsNyBAQCBpbXBvcnQgdGFyZmlsZQogaW1wb3J0IHRlbXBmaWxlCiBp
bXBvcnQgemlwZmlsZQogCitmcm9tIGNvbGxlY3Rpb25zIGltcG9ydCBkZWZhdWx0ZGljdAogZnJv
bSBsb2dnaW5nIGltcG9ydCBOdWxsSGFuZGxlcgogZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IGxv
ZwogZnJvbSB3ZWJraXRjb3JlcHkudmVyc2lvbiBpbXBvcnQgVmVyc2lvbgpAQCAtMzA5LDcgKzMx
MCw3IEBAIGNsYXNzIEF1dG9JbnN0YWxsKG9iamVjdCk6CiAgICAgaW5kZXggPSAncHlwaS5vcmcn
CiAgICAgdGltZW91dCA9IDMwCiAgICAgdmVyc2lvbiA9IFZlcnNpb24oc3lzLnZlcnNpb25faW5m
b1swXSwgc3lzLnZlcnNpb25faW5mb1sxXSwgc3lzLnZlcnNpb25faW5mb1syXSkKLSAgICBwYWNr
YWdlcyA9IHt9CisgICAgcGFja2FnZXMgPSBkZWZhdWx0ZGljdChsaXN0KQogICAgIG1hbmlmZXN0
ID0ge30KIAogICAgICMgV2hlbiBzaGFyaW5nIGFuIGluc3RhbGwgbG9jYXRpb24sIHByb2plY3Rz
IG1heSB3aXNoIHRvIG92ZXJ3cml0ZSBwYWNrYWdlcyBvbiBkaXNrCkBAIC00MzUsOCArNDM2LDgg
QEAgY2xhc3MgQXV0b0luc3RhbGwob2JqZWN0KToKICAgICAgICAgICAgICAgICBwYWNrYWdlID0g
UGFja2FnZShwYWNrYWdlKQogICAgICAgICBlbGlmIGlzaW5zdGFuY2UocGFja2FnZSwgUGFja2Fn
ZSk6CiAgICAgICAgICAgICBpZiBjbHMucGFja2FnZXMuZ2V0KHBhY2thZ2UubmFtZSk6Ci0gICAg
ICAgICAgICAgICAgaWYgY2xzLnBhY2thZ2VzLmdldChwYWNrYWdlLm5hbWUpLnZlcnNpb24gIT0g
cGFja2FnZS52ZXJzaW9uOgotICAgICAgICAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdS
ZWdpc3RlcmVkIHZlcnNpb24gb2Yge30gdXNlcyB7fSwgYnV0IHJlcXVlc3RlZCB2ZXJzaW9uIHVz
ZXMge30nLmZvcm1hdChwYWNrYWdlLm5hbWUsIGNscy5wYWNrYWdlcy5nZXQocGFja2FnZS5uYW1l
KS52ZXJzaW9uLCBwYWNrYWdlLnZlcnNpb24pKQorICAgICAgICAgICAgICAgIGlmIGNscy5wYWNr
YWdlcy5nZXQocGFja2FnZS5uYW1lKVswXS52ZXJzaW9uICE9IHBhY2thZ2UudmVyc2lvbjoKKyAg
ICAgICAgICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcignUmVnaXN0ZXJlZCB2ZXJzaW9uIG9m
IHt9IHVzZXMge30sIGJ1dCByZXF1ZXN0ZWQgdmVyc2lvbiB1c2VzIHt9Jy5mb3JtYXQocGFja2Fn
ZS5uYW1lLCBjbHMucGFja2FnZXMuZ2V0KHBhY2thZ2UubmFtZSlbMF0udmVyc2lvbiwgcGFja2Fn
ZS52ZXJzaW9uKSkKICAgICAgICAgICAgICAgICByZXR1cm4gY2xzLnBhY2thZ2VzLmdldChwYWNr
YWdlLm5hbWUpCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdF
eHBlY3RlZCBwYWNrYWdlIHRvIGJlIHN0ciBvciBQYWNrYWdlLCBub3Qge30nLmZvcm1hdCh0eXBl
KHBhY2thZ2UpKSkKQEAgLTQ1NSwyMiArNDU2LDIyIEBAIGNsYXNzIEF1dG9JbnN0YWxsKG9iamVj
dCk6CiAgICAgICAgICAgICAgICAgaWYgbm90IG9zLnBhdGguaXNkaXIob3MucGF0aC5qb2luKGNh
bmRpZGF0ZSwgcGFja2FnZS5uYW1lKSk6CiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAg
ICAgICAgICAgICAgICAgc3lzLnBhdGguaW5zZXJ0KDAsIGNhbmRpZGF0ZSkKLSAgICAgICAgICAg
ICAgICByZXR1cm4gcGFja2FnZQorICAgICAgICAgICAgICAgIHJldHVybiBbcGFja2FnZV0KIAog
ICAgICAgICBmb3IgYWxpYXMgaW4gcGFja2FnZS5hbGlhc2VzOgotICAgICAgICAgICAgY2xzLnBh
Y2thZ2VzW2FsaWFzXSA9IHBhY2thZ2UKLSAgICAgICAgY2xzLnBhY2thZ2VzW3BhY2thZ2UubmFt
ZV0gPSBwYWNrYWdlCi0gICAgICAgIHJldHVybiBwYWNrYWdlCisgICAgICAgICAgICBjbHMucGFj
a2FnZXNbYWxpYXNdLmFwcGVuZChwYWNrYWdlKQorICAgICAgICBjbHMucGFja2FnZXNbcGFja2Fn
ZS5uYW1lXS5hcHBlbmQocGFja2FnZSkKKyAgICAgICAgcmV0dXJuIFtwYWNrYWdlXQogCiAgICAg
QGNsYXNzbWV0aG9kCiAgICAgZGVmIGluc3RhbGwoY2xzLCBwYWNrYWdlKToKLSAgICAgICAgdG9f
aW5zdGFsbCA9IGNscy5yZWdpc3RlcihwYWNrYWdlKQotICAgICAgICByZXR1cm4gdG9faW5zdGFs
bC5pbnN0YWxsKCkKKyAgICAgICAgcmV0dXJuIGFsbChbdG9faW5zdGFsbC5pbnN0YWxsKCkgZm9y
IHRvX2luc3RhbGwgaW4gY2xzLnJlZ2lzdGVyKHBhY2thZ2UpXSkKIAogICAgIEBjbGFzc21ldGhv
ZAogICAgIGRlZiBpbnN0YWxsX2V2ZXJ5dGhpbmcoY2xzKToKLSAgICAgICAgZm9yIHBhY2thZ2Ug
aW4gY2xzLnBhY2thZ2VzLnZhbHVlcygpOgotICAgICAgICAgICAgcGFja2FnZS5pbnN0YWxsKCkK
KyAgICAgICAgZm9yIHBhY2thZ2VzIGluIGNscy5wYWNrYWdlcy52YWx1ZXMoKToKKyAgICAgICAg
ICAgIGZvciBwYWNrYWdlIGluIHBhY2thZ2VzOgorICAgICAgICAgICAgICAgIHBhY2thZ2UuaW5z
dGFsbCgpCiAgICAgICAgIHJldHVybiBOb25lCiAKICAgICBAY2xhc3NtZXRob2QKSW5kZXg6IFRv
b2xzL1NjcmlwdHMvd2Via2l0cHkvX19pbml0X18ucHkKPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2Ny
aXB0cy93ZWJraXRweS9fX2luaXRfXy5weQkocmV2aXNpb24gMjY4NTUyKQorKysgVG9vbHMvU2Ny
aXB0cy93ZWJraXRweS9fX2luaXRfXy5weQkod29ya2luZyBjb3B5KQpAQCAtNDEsNiArNDEsOCBA
QCBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdtb3JlX2l0ZXJ0CiBBdXRvSW5zdGFsbC5y
ZWdpc3RlcihQYWNrYWdlKCdnZW5zaGknLCBWZXJzaW9uKDAsIDcsIDMpLCBweXBpX25hbWU9J0dl
bnNoaScpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnaHRtbDVsaWInLCBWZXJzaW9u
KDEsIDEpKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ21lY2hhbml6ZScsIFZlcnNp
b24oMCwgNCwgNSkpKQorQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnbG9naWxhYi5jb21t
b24nLCBWZXJzaW9uKDAsIDU4LCAxKSwgcHlwaV9uYW1lPSdsb2dpbGFiLWNvbW1vbicsIGFsaWFz
ZXM9Wydsb2dpbGFiJ10pKQorQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnbG9naWxhYi5h
c3RuZycsIFZlcnNpb24oMCwgMjQsIDEpLCBweXBpX25hbWU9J2xvZ2lsYWItYXN0bmcnLCBhbGlh
c2VzPVsnbG9naWxhYiddKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ21venByb2Nl
c3MnLCBWZXJzaW9uKDEsIDIsIDApKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ21v
emxvZycsIFZlcnNpb24oNiwgMSkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnbW96
dGVybScsIFZlcnNpb24oMSwgMCwgMCkpKQpAQCAtNTEsMTIgKzUzLDEzIEBAIEF1dG9JbnN0YWxs
LnJlZ2lzdGVyKFBhY2thZ2UoJ3B5dGVzdF90aW0KICMgUHl0ZXN0IGhlbGQgdG8gMy54IGR1ZSB0
byBXUFQgd2ViZHJpdmVyIGNvbXBhdGliaWxpdHkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2th
Z2UoJ3B5dGVzdCcsIFZlcnNpb24oMywgMTAsIDEpKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBh
Y2thZ2UoJ3B5Y29kZXN0eWxlJywgVmVyc2lvbigyLCA1LCAwKSkpCitBdXRvSW5zdGFsbC5yZWdp
c3RlcihQYWNrYWdlKCdweWxpbnQnLCBWZXJzaW9uKDAsIDI1LCAyKSkpCiBBdXRvSW5zdGFsbC5y
ZWdpc3RlcihQYWNrYWdlKCdzY2FuZGlyJywgVmVyc2lvbigxLCAxMCwgMCkpKQogQXV0b0luc3Rh
bGwucmVnaXN0ZXIoUGFja2FnZSgnc2VsZW5pdW0nLCBWZXJzaW9uKDMsIDE0MSwgMCkpKQogQXV0
b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgndG9tbCcsIFZlcnNpb24oMCwgMTAsIDEpKSkKIEF1
dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3djd2lkdGgnLCBWZXJzaW9uKDAsIDIsIDUpKSkK
IEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3dlYmVuY29kaW5ncycsIFZlcnNpb24oMCwg
NSwgMSkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnemlwcCcsIFZlcnNpb24oMSwg
MiwgMCkpKQotQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnem9wZS5pbnRlcmZhY2UnLCBW
ZXJzaW9uKDUsIDEsIDApLCBweXBpX25hbWU9J3pvcGUtaW50ZXJmYWNlJykpCitBdXRvSW5zdGFs
bC5yZWdpc3RlcihQYWNrYWdlKCd6b3BlLmludGVyZmFjZScsIFZlcnNpb24oNSwgMSwgMCksIGFs
aWFzZXM9Wyd6b3BlJ10sIHB5cGlfbmFtZT0nem9wZS1pbnRlcmZhY2UnKSkKIAogQXV0b0luc3Rh
bGwucmVnaXN0ZXIoUGFja2FnZSgnd2Via2l0c2NtcHknLCBWZXJzaW9uKDAsIDAsIDEpKSwgbG9j
YWw9VHJ1ZSkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvcHl0
aG9uLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tl
cnMvcHl0aG9uLnB5CShyZXZpc2lvbiAyNjg1NTIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5
L3N0eWxlL2NoZWNrZXJzL3B5dGhvbi5weQkod29ya2luZyBjb3B5KQpAQCAtMTExLDggKzExMSw5
IEBAIGNsYXNzIFB5bGludGVyKG9iamVjdCk6CiAgICAgZGVmIHJ1bihzZWxmLCBhcmd2KToKICAg
ICAgICAgb3V0cHV0ID0gX0ZpbHRlcmVkU3RyaW5nSU8oc2VsZi5GQUxTRV9QT1NJVElWRVMpCiAg
ICAgICAgIHdpdGggT3V0cHV0Q2FwdHVyZSgpOgotICAgICAgICAgICAgZnJvbSB3ZWJraXRweS50
aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQucHlsaW50IGltcG9ydCBsaW50Ci0gICAgICAgICAgICBm
cm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxlZC5weWxpbnQucmVwb3J0ZXJzLnRl
eHQgaW1wb3J0IFBhcnNlYWJsZVRleHRSZXBvcnRlcgorICAgICAgICAgICAgZnJvbSBweWxpbnQg
aW1wb3J0IGxpbnQKKyAgICAgICAgICAgIGZyb20gcHlsaW50LnJlcG9ydGVycy50ZXh0IGltcG9y
dCBQYXJzZWFibGVUZXh0UmVwb3J0ZXIKKwogICAgICAgICAgICAgbGludC5SdW4oWyctLXJjZmls
ZScsIHNlbGYuX3B5bGludHJjXSArIGFyZ3YsIHJlcG9ydGVyPVBhcnNlYWJsZVRleHRSZXBvcnRl
cihvdXRwdXQ9b3V0cHV0KSwgZXhpdD1GYWxzZSkKICAgICAgICAgcmV0dXJuIG91dHB1dAogCklu
ZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X18ucHkKPT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5CShy
ZXZpc2lvbiAyNjg1NTIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19p
bml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAgLTkzLDkgKzkzLDcgQEAgY2xhc3MgQXV0b2luc3Rh
bGxJbXBvcnRIb29rKG9iamVjdCk6CiAKICAgICAgICAgIyBOb3RlOiBhbGwgb2YgdGhlIG1ldGhv
ZHMgbXVzdCBmb2xsb3cgdGhlICJfaW5zdGFsbF9YWFgiIGNvbnZlbnRpb24gaW4KICAgICAgICAg
IyBvcmRlciBmb3IgYXV0b2luc3RhbGxfZXZlcnl0aGluZygpLCBiZWxvdywgdG8gd29yayBwcm9w
ZXJseS4KLSAgICAgICAgaWYgJy5weWxpbnQnIGluIGZ1bGxuYW1lOgotICAgICAgICAgICAgc2Vs
Zi5faW5zdGFsbF9weWxpbnQoKQotICAgICAgICBlbGlmICcuYnVpbGRib3QnIGluIGZ1bGxuYW1l
OgorICAgICAgICBpZiAnLmJ1aWxkYm90JyBpbiBmdWxsbmFtZToKICAgICAgICAgICAgIHNlbGYu
X2luc3RhbGxfYnVpbGRib3QoKQogICAgICAgICBlbGlmICcua2V5cmluZycgaW4gZnVsbG5hbWU6
CiAgICAgICAgICAgICBzZWxmLl9pbnN0YWxsX2tleXJpbmcoKQpAQCAtMTU3LDIwICsxNTUsNiBA
QCBjbGFzcyBBdXRvaW5zdGFsbEltcG9ydEhvb2sob2JqZWN0KToKICAgICAgICAgICAgIGZpbmFs
bHk6CiAgICAgICAgICAgICAgICAgc3lzLnN0ZG91dCA9IHN5cy5fX3N0ZG91dF9fCiAKLQotICAg
IGRlZiBfaW5zdGFsbF9weWxpbnQoc2VsZik6Ci0gICAgICAgIHNlbGYuX2Vuc3VyZV9hdXRvaW5z
dGFsbGVkX2Rpcl9pc19pbl9zeXNfcGF0aCgpCi0gICAgICAgIGlmIChub3Qgc2VsZi5fZnMuZXhp
c3RzKHNlbGYuX2ZzLmpvaW4oX0FVVE9JTlNUQUxMRURfRElSLCAicHlsaW50IikpIG9yCi0gICAg
ICAgICAgICBub3Qgc2VsZi5fZnMuZXhpc3RzKHNlbGYuX2ZzLmpvaW4oX0FVVE9JTlNUQUxMRURf
RElSLCAibG9naWxhYi9hc3RuZyIpKSBvcgotICAgICAgICAgICAgbm90IHNlbGYuX2ZzLmV4aXN0
cyhzZWxmLl9mcy5qb2luKF9BVVRPSU5TVEFMTEVEX0RJUiwgImxvZ2lsYWIvY29tbW9uIikpKToK
LSAgICAgICAgICAgIGluc3RhbGxlciA9IEF1dG9JbnN0YWxsZXIodGFyZ2V0X2Rpcj1fQVVUT0lO
U1RBTExFRF9ESVIpCi0gICAgICAgICAgICBmaWxlc190b19yZW1vdmUgPSBbXQotICAgICAgICAg
ICAgaWYgc3lzLnBsYXRmb3JtID09ICd3aW4zMic6Ci0gICAgICAgICAgICAgICAgZmlsZXNfdG9f
cmVtb3ZlID0gWyd0ZXN0L2RhdGEvd3JpdGVfcHJvdGVjdGVkX2ZpbGUudHh0J10KLSAgICAgICAg
ICAgIGluc3RhbGxlci5pbnN0YWxsKCJodHRwczovL2ZpbGVzLnB5dGhvbmhvc3RlZC5vcmcvcGFj
a2FnZXMvc291cmNlL2wvbG9naWxhYi1jb21tb24vbG9naWxhYi1jb21tb24tMC41OC4xLnRhci5n
eiIsIHVybF9zdWJwYXRoPSJsb2dpbGFiLWNvbW1vbi0wLjU4LjEiLCB0YXJnZXRfbmFtZT0ibG9n
aWxhYi9jb21tb24iLCBmaWxlc190b19yZW1vdmU9ZmlsZXNfdG9fcmVtb3ZlKQotICAgICAgICAg
ICAgaW5zdGFsbGVyLmluc3RhbGwoImh0dHBzOi8vZmlsZXMucHl0aG9uaG9zdGVkLm9yZy9wYWNr
YWdlcy9zb3VyY2UvbC9sb2dpbGFiLWFzdG5nL2xvZ2lsYWItYXN0bmctMC4yNC4xLnRhci5neiIs
IHVybF9zdWJwYXRoPSJsb2dpbGFiLWFzdG5nLTAuMjQuMSIsIHRhcmdldF9uYW1lPSJsb2dpbGFi
L2FzdG5nIikKLSAgICAgICAgICAgIGluc3RhbGxlci5pbnN0YWxsKCdodHRwczovL2ZpbGVzLnB5
dGhvbmhvc3RlZC5vcmcvcGFja2FnZXMvc291cmNlL3AvcHlsaW50L3B5bGludC0wLjI1LjIudGFy
Lmd6JywgdXJsX3N1YnBhdGg9InB5bGludC0wLjI1LjIiLCB0YXJnZXRfbmFtZT0icHlsaW50IikK
LQogICAgICMgYXV0b2luc3RhbGxlZC5idWlsZGJvdCBpcyB1c2VkIGJ5IEJ1aWxkU2xhdmVTdXBw
b3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3RlcmNmZ191bml0dGVzdC5weQogICAgICMg
YW5kIHNob3VsZCBpZGVhbGx5IG1hdGNoIHRoZSB2ZXJzaW9uIG9mIEJ1aWxkQm90IHVzZWQgYXQg
YnVpbGQud2Via2l0Lm9yZy4KICAgICBkZWYgX2luc3RhbGxfYnVpbGRib3Qoc2VsZik6CkluZGV4
OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X19fdW5pdHRlc3QucHkK
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9f
X3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNjg1NTIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5
L3RoaXJkcGFydHkvX19pbml0X19fdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTM3LDUg
KzM3LDMgQEAgY2xhc3MgVGhpcmRwYXJ0eVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAg
ICAjIFRoaXMgbWV0aG9kIHRlc3RzIHRoYXQgd2UgY2FuIGFjdHVhbGx5IGltcG9ydCBldmVyeXRo
aW5nLgogICAgICAgICAjIHVudXNlZC12YXJpYWJsZSwgaW1wb3J0IGZhaWx1cmVzIC0gcHlsaW50
OiBkaXNhYmxlLW1zZz1XMDYxMixFMDYxMSxGMDQwMQogICAgICAgICBpbXBvcnQgd2Via2l0cHku
dGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkLmJ1aWxkYm90Ci0gICAgICAgIGltcG9ydCB3ZWJraXRw
eS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQubWVjaGFuaXplCi0gICAgICAgIGltcG9ydCB3ZWJr
aXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQucHlsaW50Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>411593</attachid>
            <date>2020-10-16 10:17:37 -0700</date>
            <delta_ts>2020-10-16 10:50:05 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-217793-20201016101736.patch</filename>
            <type>text/plain</type>
            <size>10475</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI2ODU5NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDI2IEBACisyMDIwLTEwLTE2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBbd2Via2l0cHldIFVzZSB3ZWJraXRjb3JlcHkncyBhdXRvaW5zdGFsbGVy
IGZvciBwbGludCAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp
P2lkPTIxNzc5MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzAzNTYwOTU+CisKKyAgICAgICAg
UnViYmVyLXN0YW1wZWQgYnkgQWFrYXNoIEphaW4uCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJh
cmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5OiBCdW1wIHZlcnNpb24u
CisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9h
dXRvaW5zdGFsbC5weToKKyAgICAgICAgKEF1dG9JbnN0YWxsKTogU3VwcG9ydCBtdWx0aXBsZSBh
bGlhc2VzIHRvIGEgc2luZ2xlIGxpYnJhcnkuCisgICAgICAgIChBdXRvSW5zdGFsbC5yZWdpc3Rl
cik6CisgICAgICAgIChBdXRvSW5zdGFsbC5pbnN0YWxsKToKKyAgICAgICAgKEF1dG9JbnN0YWxs
Lmluc3RhbGxfZXZlcnl0aGluZyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9fX2luaXRf
Xy5weTogQWRkIHB5bGludCwgbWFwIGluc3RhbGwgem9wZS5pbnRlcmZhY2Ugd2hlbiB6b3BlIGlz
IGltcG9ydGVkLiAKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3B5
dGhvbi5weToKKyAgICAgICAgKFB5bGludGVyLnJ1bik6CisgICAgICAgICogU2NyaXB0cy93ZWJr
aXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5OgorICAgICAgICAoQXV0b2luc3RhbGxJbXBvcnRI
b29rLmZpbmRfbW9kdWxlKTogUmVtb3ZlIF9pbnN0YWxsX3B5bGludCgpLgorICAgICAgICAoQXV0
b2luc3RhbGxJbXBvcnRIb29rLl9pbnN0YWxsX3B5bGludCk6IERlbGV0ZWQuCisgICAgICAgICog
U2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fX3VuaXR0ZXN0LnB5OgorICAgICAg
ICAoVGhpcmRwYXJ0eVRlc3QudGVzdF9pbXBvcnRzKTogbWVjaGFuaXplIGFuZCBweWxpbnQgYXJl
IG1hbmFnZWQgYnkgdGhlIG5ldyBhdXRvaW5zdGFsbGVyLgorCiAyMDIwLTEwLTE2ICBBYWthc2gg
SmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBbYnVpbGQud2Via2l0Lm9y
Z10gQWRkIGNvcHlyaWdodCBtZXNzYWdlIHRvIHN0ZXBzX3VuaXR0ZXN0LnB5CkluZGV4OiBUb29s
cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJr
aXRjb3JlcHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI2ODU5NSkKKysrIFRvb2xzL1NjcmlwdHMv
bGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHkJKHdvcmtpbmcg
Y29weSkKQEAgLTM1LDcgKzM1LDcgQEAgZnJvbSB3ZWJraXRjb3JlcHkudGltZW91dCBpbXBvcnQg
VGltZW91dAogZnJvbSB3ZWJraXRjb3JlcHkuc3VicHJvY2Vzc191dGlscyBpbXBvcnQgVGltZW91
dEV4cGlyZWQsIENvbXBsZXRlZFByb2Nlc3MsIHJ1bgogZnJvbSB3ZWJraXRjb3JlcHkub3V0cHV0
X2NhcHR1cmUgaW1wb3J0IExvZ2dlckNhcHR1cmUsIE91dHB1dENhcHR1cmUsIE91dHB1dER1cGxp
Y2F0ZQogCi12ZXJzaW9uID0gVmVyc2lvbigwLCA0LCAxNykKK3ZlcnNpb24gPSBWZXJzaW9uKDAs
IDQsIDE4KQogCiBmcm9tIHdlYmtpdGNvcmVweS5hdXRvaW5zdGFsbCBpbXBvcnQgUGFja2FnZSwg
QXV0b0luc3RhbGwKIGlmIHN5cy52ZXJzaW9uX2luZm8gPiAoMywgMCk6CkluZGV4OiBUb29scy9T
Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJr
aXRjb3JlcHkvYXV0b2luc3RhbGwucHkJKHJldmlzaW9uIDI2ODU5NSkKKysrIFRvb2xzL1Njcmlw
dHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHkJKHdv
cmtpbmcgY29weSkKQEAgLTMzLDYgKzMzLDcgQEAgaW1wb3J0IHRhcmZpbGUKIGltcG9ydCB0ZW1w
ZmlsZQogaW1wb3J0IHppcGZpbGUKIAorZnJvbSBjb2xsZWN0aW9ucyBpbXBvcnQgZGVmYXVsdGRp
Y3QKIGZyb20gbG9nZ2luZyBpbXBvcnQgTnVsbEhhbmRsZXIKIGZyb20gd2Via2l0Y29yZXB5IGlt
cG9ydCBsb2cKIGZyb20gd2Via2l0Y29yZXB5LnZlcnNpb24gaW1wb3J0IFZlcnNpb24KQEAgLTMw
OSw3ICszMTAsNyBAQCBjbGFzcyBBdXRvSW5zdGFsbChvYmplY3QpOgogICAgIGluZGV4ID0gJ3B5
cGkub3JnJwogICAgIHRpbWVvdXQgPSAzMAogICAgIHZlcnNpb24gPSBWZXJzaW9uKHN5cy52ZXJz
aW9uX2luZm9bMF0sIHN5cy52ZXJzaW9uX2luZm9bMV0sIHN5cy52ZXJzaW9uX2luZm9bMl0pCi0g
ICAgcGFja2FnZXMgPSB7fQorICAgIHBhY2thZ2VzID0gZGVmYXVsdGRpY3QobGlzdCkKICAgICBt
YW5pZmVzdCA9IHt9CiAKICAgICAjIFdoZW4gc2hhcmluZyBhbiBpbnN0YWxsIGxvY2F0aW9uLCBw
cm9qZWN0cyBtYXkgd2lzaCB0byBvdmVyd3JpdGUgcGFja2FnZXMgb24gZGlzawpAQCAtNDM1LDgg
KzQzNiw4IEBAIGNsYXNzIEF1dG9JbnN0YWxsKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgcGFj
a2FnZSA9IFBhY2thZ2UocGFja2FnZSkKICAgICAgICAgZWxpZiBpc2luc3RhbmNlKHBhY2thZ2Us
IFBhY2thZ2UpOgogICAgICAgICAgICAgaWYgY2xzLnBhY2thZ2VzLmdldChwYWNrYWdlLm5hbWUp
OgotICAgICAgICAgICAgICAgIGlmIGNscy5wYWNrYWdlcy5nZXQocGFja2FnZS5uYW1lKS52ZXJz
aW9uICE9IHBhY2thZ2UudmVyc2lvbjoKLSAgICAgICAgICAgICAgICAgICAgcmFpc2UgVmFsdWVF
cnJvcignUmVnaXN0ZXJlZCB2ZXJzaW9uIG9mIHt9IHVzZXMge30sIGJ1dCByZXF1ZXN0ZWQgdmVy
c2lvbiB1c2VzIHt9Jy5mb3JtYXQocGFja2FnZS5uYW1lLCBjbHMucGFja2FnZXMuZ2V0KHBhY2th
Z2UubmFtZSkudmVyc2lvbiwgcGFja2FnZS52ZXJzaW9uKSkKKyAgICAgICAgICAgICAgICBpZiBj
bHMucGFja2FnZXMuZ2V0KHBhY2thZ2UubmFtZSlbMF0udmVyc2lvbiAhPSBwYWNrYWdlLnZlcnNp
b246CisgICAgICAgICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoJ1JlZ2lzdGVyZWQgdmVy
c2lvbiBvZiB7fSB1c2VzIHt9LCBidXQgcmVxdWVzdGVkIHZlcnNpb24gdXNlcyB7fScuZm9ybWF0
KHBhY2thZ2UubmFtZSwgY2xzLnBhY2thZ2VzLmdldChwYWNrYWdlLm5hbWUpWzBdLnZlcnNpb24s
IHBhY2thZ2UudmVyc2lvbikpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGNscy5wYWNrYWdlcy5n
ZXQocGFja2FnZS5uYW1lKQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgcmFpc2UgVmFsdWVF
cnJvcignRXhwZWN0ZWQgcGFja2FnZSB0byBiZSBzdHIgb3IgUGFja2FnZSwgbm90IHt9Jy5mb3Jt
YXQodHlwZShwYWNrYWdlKSkpCkBAIC00NTUsMjIgKzQ1NiwyMiBAQCBjbGFzcyBBdXRvSW5zdGFs
bChvYmplY3QpOgogICAgICAgICAgICAgICAgIGlmIG5vdCBvcy5wYXRoLmlzZGlyKG9zLnBhdGgu
am9pbihjYW5kaWRhdGUsIHBhY2thZ2UubmFtZSkpOgogICAgICAgICAgICAgICAgICAgICBjb250
aW51ZQogICAgICAgICAgICAgICAgIHN5cy5wYXRoLmluc2VydCgwLCBjYW5kaWRhdGUpCi0gICAg
ICAgICAgICAgICAgcmV0dXJuIHBhY2thZ2UKKyAgICAgICAgICAgICAgICByZXR1cm4gW3BhY2th
Z2VdCiAKICAgICAgICAgZm9yIGFsaWFzIGluIHBhY2thZ2UuYWxpYXNlczoKLSAgICAgICAgICAg
IGNscy5wYWNrYWdlc1thbGlhc10gPSBwYWNrYWdlCi0gICAgICAgIGNscy5wYWNrYWdlc1twYWNr
YWdlLm5hbWVdID0gcGFja2FnZQotICAgICAgICByZXR1cm4gcGFja2FnZQorICAgICAgICAgICAg
Y2xzLnBhY2thZ2VzW2FsaWFzXS5hcHBlbmQocGFja2FnZSkKKyAgICAgICAgY2xzLnBhY2thZ2Vz
W3BhY2thZ2UubmFtZV0uYXBwZW5kKHBhY2thZ2UpCisgICAgICAgIHJldHVybiBbcGFja2FnZV0K
IAogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBpbnN0YWxsKGNscywgcGFja2FnZSk6Ci0gICAg
ICAgIHRvX2luc3RhbGwgPSBjbHMucmVnaXN0ZXIocGFja2FnZSkKLSAgICAgICAgcmV0dXJuIHRv
X2luc3RhbGwuaW5zdGFsbCgpCisgICAgICAgIHJldHVybiBhbGwoW3RvX2luc3RhbGwuaW5zdGFs
bCgpIGZvciB0b19pbnN0YWxsIGluIGNscy5yZWdpc3RlcihwYWNrYWdlKV0pCiAKICAgICBAY2xh
c3NtZXRob2QKICAgICBkZWYgaW5zdGFsbF9ldmVyeXRoaW5nKGNscyk6Ci0gICAgICAgIGZvciBw
YWNrYWdlIGluIGNscy5wYWNrYWdlcy52YWx1ZXMoKToKLSAgICAgICAgICAgIHBhY2thZ2UuaW5z
dGFsbCgpCisgICAgICAgIGZvciBwYWNrYWdlcyBpbiBjbHMucGFja2FnZXMudmFsdWVzKCk6Cisg
ICAgICAgICAgICBmb3IgcGFja2FnZSBpbiBwYWNrYWdlczoKKyAgICAgICAgICAgICAgICBwYWNr
YWdlLmluc3RhbGwoKQogICAgICAgICByZXR1cm4gTm9uZQogCiAgICAgQGNsYXNzbWV0aG9kCklu
ZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L19faW5pdF9fLnB5Cj09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv
b2xzL1NjcmlwdHMvd2Via2l0cHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI2ODU5NSkKKysrIFRv
b2xzL1NjcmlwdHMvd2Via2l0cHkvX19pbml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAgLTQxLDYg
KzQxLDggQEAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnbW9yZV9pdGVydAogQXV0b0lu
c3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZ2Vuc2hpJywgVmVyc2lvbigwLCA3LCAzKSwgcHlwaV9u
YW1lPSdHZW5zaGknKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2h0bWw1bGliJywg
VmVyc2lvbigxLCAxKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdtZWNoYW5pemUn
LCBWZXJzaW9uKDAsIDQsIDUpKSkKK0F1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2xvZ2ls
YWIuY29tbW9uJywgVmVyc2lvbigwLCA1OCwgMSksIHB5cGlfbmFtZT0nbG9naWxhYi1jb21tb24n
LCBhbGlhc2VzPVsnbG9naWxhYiddKSkKK0F1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2xv
Z2lsYWIuYXN0bmcnLCBWZXJzaW9uKDAsIDI0LCAxKSwgcHlwaV9uYW1lPSdsb2dpbGFiLWFzdG5n
JywgYWxpYXNlcz1bJ2xvZ2lsYWInXSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdt
b3pwcm9jZXNzJywgVmVyc2lvbigxLCAyLCAwKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNr
YWdlKCdtb3psb2cnLCBWZXJzaW9uKDYsIDEpKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2th
Z2UoJ21venRlcm0nLCBWZXJzaW9uKDEsIDAsIDApKSkKQEAgLTUxLDEyICs1MywxMyBAQCBBdXRv
SW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdweXRlc3RfdGltCiAjIFB5dGVzdCBoZWxkIHRvIDMu
eCBkdWUgdG8gV1BUIHdlYmRyaXZlciBjb21wYXRpYmlsaXR5CiBBdXRvSW5zdGFsbC5yZWdpc3Rl
cihQYWNrYWdlKCdweXRlc3QnLCBWZXJzaW9uKDMsIDEwLCAxKSkpCiBBdXRvSW5zdGFsbC5yZWdp
c3RlcihQYWNrYWdlKCdweWNvZGVzdHlsZScsIFZlcnNpb24oMiwgNSwgMCkpKQorQXV0b0luc3Rh
bGwucmVnaXN0ZXIoUGFja2FnZSgncHlsaW50JywgVmVyc2lvbigwLCAyNSwgMikpKQogQXV0b0lu
c3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnc2NhbmRpcicsIFZlcnNpb24oMSwgMTAsIDApKSkKIEF1
dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3NlbGVuaXVtJywgVmVyc2lvbigzLCAxNDEsIDAp
KSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3RvbWwnLCBWZXJzaW9uKDAsIDEwLCAx
KSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCd3Y3dpZHRoJywgVmVyc2lvbigwLCAy
LCA1KSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCd3ZWJlbmNvZGluZ3MnLCBWZXJz
aW9uKDAsIDUsIDEpKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3ppcHAnLCBWZXJz
aW9uKDEsIDIsIDApKSkKLUF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3pvcGUuaW50ZXJm
YWNlJywgVmVyc2lvbig1LCAxLCAwKSwgcHlwaV9uYW1lPSd6b3BlLWludGVyZmFjZScpKQorQXV0
b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnem9wZS5pbnRlcmZhY2UnLCBWZXJzaW9uKDUsIDEs
IDApLCBhbGlhc2VzPVsnem9wZSddLCBweXBpX25hbWU9J3pvcGUtaW50ZXJmYWNlJykpCiAKIEF1
dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3dlYmtpdHNjbXB5JywgVmVyc2lvbigwLCAwLCAx
KSksIGxvY2FsPVRydWUpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNr
ZXJzL3B5dGhvbi5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxl
L2NoZWNrZXJzL3B5dGhvbi5weQkocmV2aXNpb24gMjY4NTk1KQorKysgVG9vbHMvU2NyaXB0cy93
ZWJraXRweS9zdHlsZS9jaGVja2Vycy9weXRob24ucHkJKHdvcmtpbmcgY29weSkKQEAgLTExMSw4
ICsxMTEsOSBAQCBjbGFzcyBQeWxpbnRlcihvYmplY3QpOgogICAgIGRlZiBydW4oc2VsZiwgYXJn
dik6CiAgICAgICAgIG91dHB1dCA9IF9GaWx0ZXJlZFN0cmluZ0lPKHNlbGYuRkFMU0VfUE9TSVRJ
VkVTKQogICAgICAgICB3aXRoIE91dHB1dENhcHR1cmUoKToKLSAgICAgICAgICAgIGZyb20gd2Vi
a2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkLnB5bGludCBpbXBvcnQgbGludAotICAgICAg
ICAgICAgZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQucHlsaW50LnJlcG9y
dGVycy50ZXh0IGltcG9ydCBQYXJzZWFibGVUZXh0UmVwb3J0ZXIKKyAgICAgICAgICAgIGZyb20g
cHlsaW50IGltcG9ydCBsaW50CisgICAgICAgICAgICBmcm9tIHB5bGludC5yZXBvcnRlcnMudGV4
dCBpbXBvcnQgUGFyc2VhYmxlVGV4dFJlcG9ydGVyCisKICAgICAgICAgICAgIGxpbnQuUnVuKFsn
LS1yY2ZpbGUnLCBzZWxmLl9weWxpbnRyY10gKyBhcmd2LCByZXBvcnRlcj1QYXJzZWFibGVUZXh0
UmVwb3J0ZXIob3V0cHV0PW91dHB1dCksIGV4aXQ9RmFsc2UpCiAgICAgICAgIHJldHVybiBvdXRw
dXQKIApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRf
Xy5weQkocmV2aXNpb24gMjY4NTk1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGlyZHBh
cnR5L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkpCkBAIC05Myw5ICs5Myw3IEBAIGNsYXNzIEF1
dG9pbnN0YWxsSW1wb3J0SG9vayhvYmplY3QpOgogCiAgICAgICAgICMgTm90ZTogYWxsIG9mIHRo
ZSBtZXRob2RzIG11c3QgZm9sbG93IHRoZSAiX2luc3RhbGxfWFhYIiBjb252ZW50aW9uIGluCiAg
ICAgICAgICMgb3JkZXIgZm9yIGF1dG9pbnN0YWxsX2V2ZXJ5dGhpbmcoKSwgYmVsb3csIHRvIHdv
cmsgcHJvcGVybHkuCi0gICAgICAgIGlmICcucHlsaW50JyBpbiBmdWxsbmFtZToKLSAgICAgICAg
ICAgIHNlbGYuX2luc3RhbGxfcHlsaW50KCkKLSAgICAgICAgZWxpZiAnLmJ1aWxkYm90JyBpbiBm
dWxsbmFtZToKKyAgICAgICAgaWYgJy5idWlsZGJvdCcgaW4gZnVsbG5hbWU6CiAgICAgICAgICAg
ICBzZWxmLl9pbnN0YWxsX2J1aWxkYm90KCkKICAgICAgICAgZWxpZiAnLmtleXJpbmcnIGluIGZ1
bGxuYW1lOgogICAgICAgICAgICAgc2VsZi5faW5zdGFsbF9rZXlyaW5nKCkKQEAgLTE1NywyMCAr
MTU1LDYgQEAgY2xhc3MgQXV0b2luc3RhbGxJbXBvcnRIb29rKG9iamVjdCk6CiAgICAgICAgICAg
ICBmaW5hbGx5OgogICAgICAgICAgICAgICAgIHN5cy5zdGRvdXQgPSBzeXMuX19zdGRvdXRfXwog
Ci0KLSAgICBkZWYgX2luc3RhbGxfcHlsaW50KHNlbGYpOgotICAgICAgICBzZWxmLl9lbnN1cmVf
YXV0b2luc3RhbGxlZF9kaXJfaXNfaW5fc3lzX3BhdGgoKQotICAgICAgICBpZiAobm90IHNlbGYu
X2ZzLmV4aXN0cyhzZWxmLl9mcy5qb2luKF9BVVRPSU5TVEFMTEVEX0RJUiwgInB5bGludCIpKSBv
cgotICAgICAgICAgICAgbm90IHNlbGYuX2ZzLmV4aXN0cyhzZWxmLl9mcy5qb2luKF9BVVRPSU5T
VEFMTEVEX0RJUiwgImxvZ2lsYWIvYXN0bmciKSkgb3IKLSAgICAgICAgICAgIG5vdCBzZWxmLl9m
cy5leGlzdHMoc2VsZi5fZnMuam9pbihfQVVUT0lOU1RBTExFRF9ESVIsICJsb2dpbGFiL2NvbW1v
biIpKSk6Ci0gICAgICAgICAgICBpbnN0YWxsZXIgPSBBdXRvSW5zdGFsbGVyKHRhcmdldF9kaXI9
X0FVVE9JTlNUQUxMRURfRElSKQotICAgICAgICAgICAgZmlsZXNfdG9fcmVtb3ZlID0gW10KLSAg
ICAgICAgICAgIGlmIHN5cy5wbGF0Zm9ybSA9PSAnd2luMzInOgotICAgICAgICAgICAgICAgIGZp
bGVzX3RvX3JlbW92ZSA9IFsndGVzdC9kYXRhL3dyaXRlX3Byb3RlY3RlZF9maWxlLnR4dCddCi0g
ICAgICAgICAgICBpbnN0YWxsZXIuaW5zdGFsbCgiaHR0cHM6Ly9maWxlcy5weXRob25ob3N0ZWQu
b3JnL3BhY2thZ2VzL3NvdXJjZS9sL2xvZ2lsYWItY29tbW9uL2xvZ2lsYWItY29tbW9uLTAuNTgu
MS50YXIuZ3oiLCB1cmxfc3VicGF0aD0ibG9naWxhYi1jb21tb24tMC41OC4xIiwgdGFyZ2V0X25h
bWU9ImxvZ2lsYWIvY29tbW9uIiwgZmlsZXNfdG9fcmVtb3ZlPWZpbGVzX3RvX3JlbW92ZSkKLSAg
ICAgICAgICAgIGluc3RhbGxlci5pbnN0YWxsKCJodHRwczovL2ZpbGVzLnB5dGhvbmhvc3RlZC5v
cmcvcGFja2FnZXMvc291cmNlL2wvbG9naWxhYi1hc3RuZy9sb2dpbGFiLWFzdG5nLTAuMjQuMS50
YXIuZ3oiLCB1cmxfc3VicGF0aD0ibG9naWxhYi1hc3RuZy0wLjI0LjEiLCB0YXJnZXRfbmFtZT0i
bG9naWxhYi9hc3RuZyIpCi0gICAgICAgICAgICBpbnN0YWxsZXIuaW5zdGFsbCgnaHR0cHM6Ly9m
aWxlcy5weXRob25ob3N0ZWQub3JnL3BhY2thZ2VzL3NvdXJjZS9wL3B5bGludC9weWxpbnQtMC4y
NS4yLnRhci5neicsIHVybF9zdWJwYXRoPSJweWxpbnQtMC4yNS4yIiwgdGFyZ2V0X25hbWU9InB5
bGludCIpCi0KICAgICAjIGF1dG9pbnN0YWxsZWQuYnVpbGRib3QgaXMgdXNlZCBieSBCdWlsZFNs
YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXJjZmdfdW5pdHRlc3QucHkK
ICAgICAjIGFuZCBzaG91bGQgaWRlYWxseSBtYXRjaCB0aGUgdmVyc2lvbiBvZiBCdWlsZEJvdCB1
c2VkIGF0IGJ1aWxkLndlYmtpdC5vcmcuCiAgICAgZGVmIF9pbnN0YWxsX2J1aWxkYm90KHNlbGYp
OgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fX3VuaXR0
ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9f
X2luaXRfX191bml0dGVzdC5weQkocmV2aXNpb24gMjY4NTk1KQorKysgVG9vbHMvU2NyaXB0cy93
ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBA
IC0zNyw1ICszNywzIEBAIGNsYXNzIFRoaXJkcGFydHlUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToK
ICAgICAgICAgIyBUaGlzIG1ldGhvZCB0ZXN0cyB0aGF0IHdlIGNhbiBhY3R1YWxseSBpbXBvcnQg
ZXZlcnl0aGluZy4KICAgICAgICAgIyB1bnVzZWQtdmFyaWFibGUsIGltcG9ydCBmYWlsdXJlcyAt
IHB5bGludDogZGlzYWJsZS1tc2c9VzA2MTIsRTA2MTEsRjA0MDEKICAgICAgICAgaW1wb3J0IHdl
YmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxlZC5idWlsZGJvdAotICAgICAgICBpbXBvcnQg
d2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkLm1lY2hhbml6ZQotICAgICAgICBpbXBv
cnQgd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkLnB5bGludAo=
</data>

          </attachment>
      

    </bug>

</bugzilla>