<?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>215889</bug_id>
          
          <creation_ts>2020-08-27 09:03:18 -0700</creation_ts>
          <short_desc>[webkitpy] Use webkitcorepy&apos;s auto installer for moz* packages</short_desc>
          <delta_ts>2020-09-23 07:35:13 -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>
    
    <see_also>https://bugs.webkit.org/show_bug.cgi?id=216879</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>dewei_zhu</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>slewis</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1683387</commentid>
    <comment_count>0</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-08-27 09:03:18 -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>1683388</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-08-27 09:03:36 -0700</bug_when>
    <thetext>&lt;rdar://problem/67877935&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1683395</commentid>
    <comment_count>2</comment_count>
      <attachid>407407</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-08-27 09:17:26 -0700</bug_when>
    <thetext>Created attachment 407407
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1690468</commentid>
    <comment_count>3</comment_count>
      <attachid>409309</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-09-21 13:10:48 -0700</bug_when>
    <thetext>Created attachment 409309
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1690471</commentid>
    <comment_count>4</comment_count>
      <attachid>409311</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-09-21 13:16:38 -0700</bug_when>
    <thetext>Created attachment 409311
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1690473</commentid>
    <comment_count>5</comment_count>
      <attachid>409309</attachid>
    <who name="Aakash Jain">aakash_jain</who>
    <bug_when>2020-09-21 13:17:52 -0700</bug_when>
    <thetext>Comment on attachment 409309
Patch

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

rs=me

&gt; Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py:-31
&gt; -import webkitpy.thirdparty.autoinstalled.mozlog

These imports aren&apos;t required anymore?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1690475</commentid>
    <comment_count>6</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-09-21 13:20:35 -0700</bug_when>
    <thetext>(In reply to Aakash Jain from comment #5)
&gt; Comment on attachment 409309 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=409309&amp;action=review
&gt; 
&gt; rs=me
&gt; 
&gt; &gt; Tools/Scripts/webkitpy/webdriver_tests/webdriver_w3c_executor.py:-31
&gt; &gt; -import webkitpy.thirdparty.autoinstalled.mozlog
&gt; 
&gt; These imports aren&apos;t required anymore?

They aren&apos;t valid any more. The old autoinstaller required that you preface an autoinstalled library with &apos;webkitpy.thirdparty.autoinstalled&apos; to trigger the auto-instillation. The new one will pick up any import of the library. That means that in this case, &quot;from mozlog import structuredlog&quot; will install mozlog for us.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1690504</commentid>
    <comment_count>7</comment_count>
      <attachid>409317</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-09-21 13:58:25 -0700</bug_when>
    <thetext>Created attachment 409317
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1690513</commentid>
    <comment_count>8</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-09-21 14:20:22 -0700</bug_when>
    <thetext>Committed r267368: &lt;https://trac.webkit.org/changeset/267368&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 409317.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>407407</attachid>
            <date>2020-08-27 09:17:26 -0700</date>
            <delta_ts>2020-09-21 13:10:47 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-215889-20200827091726.patch</filename>
            <type>text/plain</type>
            <size>4547</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI2NjIzNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE4IEBACisyMDIwLTA4LTI3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBbd2Via2l0cHldIFVzZSB3ZWJraXRjb3JlcHkncyBhdXRvIGluc3RhbGxl
ciBmb3IgbW96KiBwYWNrYWdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjE1ODg5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82Nzg3NzkzNT4KKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMv
d2Via2l0cHkvX19pbml0X18ucHk6IEFkZCBtb3pwcm9jZXNzLCBtb3psb2cgYW5kIG1venRlcm0g
dG8gQXV0b0luc3RhbGxlZCBwYWNrYWdlcy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Ro
aXJkcGFydHkvX19pbml0X18ucHk6CisgICAgICAgIChBdXRvaW5zdGFsbEltcG9ydEhvb2suZmlu
ZF9tb2R1bGUpOiBSZW1vdmUgbW96bG9nIGFuZCBtb3pwcm9jZXNzLgorICAgICAgICAoQXV0b2lu
c3RhbGxJbXBvcnRIb29rLl9pbnN0YWxsX21vemxvZyk6IERlbGV0ZWQuCisgICAgICAgIChBdXRv
aW5zdGFsbEltcG9ydEhvb2suX2luc3RhbGxfbW96cHJvY2Vzcyk6IERlbGV0ZWQuCisgICAgICAg
ICogU2NyaXB0cy93ZWJraXRweS93ZWJkcml2ZXJfdGVzdHMvd2ViZHJpdmVyX3czY19leGVjdXRv
ci5weTogSW1wbGljaXRseSB1c2Ugd2Via2l0Y29yZXB5J3MgYXV0by1pbnN0YWxsZXIuCisKIDIw
MjAtMDgtMjcgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEFk
ZCBzdXBwb3J0IGZvciBUcmFuc2Zvcm1TdHJlYW0KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0
cHkvX19pbml0X18ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9fX2lu
aXRfXy5weQkocmV2aXNpb24gMjY2MjMzKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9fX2lu
aXRfXy5weQkod29ya2luZyBjb3B5KQpAQCAtMjgsNSArMjgsOCBAQCBmcm9tIHdlYmtpdGNvcmVw
eSBpbXBvcnQgQXV0b0luc3RhbGwsIFBhCiBBdXRvSW5zdGFsbC5zZXRfZGlyZWN0b3J5KG9zLnBh
dGguam9pbihsaWJyYXJpZXMsICdhdXRvaW5zdGFsbGVkJywgJ3B5dGhvbi17fScuZm9ybWF0KHN5
cy52ZXJzaW9uX2luZm9bMF0pKSkKIAogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnY292
ZXJhZ2UnLCBWZXJzaW9uKDUsIDIsIDEpKSkKK0F1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2Uo
J21venByb2Nlc3MnLCBWZXJzaW9uKDEsIDIsIDApKSkKK0F1dG9JbnN0YWxsLnJlZ2lzdGVyKFBh
Y2thZ2UoJ21vemxvZycsIFZlcnNpb24oNiwgMSkpKQorQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFj
a2FnZSgnbW96dGVybScsIFZlcnNpb24oMSwgMCwgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIo
UGFja2FnZSgnc2VsZW5pdW0nLCBWZXJzaW9uKDMsIDE0MSwgMCkpKQogQXV0b0luc3RhbGwucmVn
aXN0ZXIoUGFja2FnZSgndG9tbCcsIFZlcnNpb24oMCwgMTAsIDEpKSkKSW5kZXg6IFRvb2xzL1Nj
cmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRfXy5weQo9PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s
cy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI2NjIz
MykKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRfXy5weQkod29y
a2luZyBjb3B5KQpAQCAtMTA4LDEwICsxMDgsNiBAQCBjbGFzcyBBdXRvaW5zdGFsbEltcG9ydEhv
b2sob2JqZWN0KToKICAgICAgICAgICAgIHNlbGYuaW5zdGFsbF9jaHJvbWVkcml2ZXIoKQogICAg
ICAgICBlbGlmICcuZ2Vja29kcml2ZXInIGluIGZ1bGxuYW1lOgogICAgICAgICAgICAgc2VsZi5p
bnN0YWxsX2dlY2tvZHJpdmVyKCkKLSAgICAgICAgZWxpZiAnLm1vemxvZycgaW4gZnVsbG5hbWU6
Ci0gICAgICAgICAgICBzZWxmLl9pbnN0YWxsX21vemxvZygpCi0gICAgICAgIGVsaWYgJy5tb3pw
cm9jZXNzJyBpbiBmdWxsbmFtZToKLSAgICAgICAgICAgIHNlbGYuX2luc3RhbGxfbW96cHJvY2Vz
cygpCiAgICAgICAgIGVsaWYgJy5weXRlc3RfdGltZW91dCcgaW4gZnVsbG5hbWU6CiAgICAgICAg
ICAgICBzZWxmLl9pbnN0YWxsX3B5dGVzdF90aW1lb3V0KCkKICAgICAgICAgZWxpZiAnLnB5dGVz
dCcgaW4gZnVsbG5hbWU6CkBAIC0xNDcsMTggKzE0Myw2IEBAIGNsYXNzIEF1dG9pbnN0YWxsSW1w
b3J0SG9vayhvYmplY3QpOgogICAgICAgICBzZWxmLl9pbnN0YWxsKCJodHRwczovL2ZpbGVzLnB5
dGhvbmhvc3RlZC5vcmcvcGFja2FnZXMvc291cmNlL3AvcHljb2Rlc3R5bGUvcHljb2Rlc3R5bGUt
Mi41LjAudGFyLmd6IiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInB5Y29kZXN0eWxl
LTIuNS4wL3B5Y29kZXN0eWxlLnB5IikKIAotICAgIGRlZiBfaW5zdGFsbF9tb3psb2coc2VsZik6
Ci0gICAgICAgIHNlbGYuX2Vuc3VyZV9hdXRvaW5zdGFsbGVkX2Rpcl9pc19pbl9zeXNfcGF0aCgp
Ci0gICAgICAgIHNlbGYuX2luc3RhbGwoImh0dHBzOi8vZmlsZXMucHl0aG9uaG9zdGVkLm9yZy9w
YWNrYWdlcy9hMC82OS81ZmY2MDAxZGY5OGNmMTg5NGU2ZmI0YWE3NGVkYTE1MDRmODMwNTE1ZTUy
ZmM2YjBhM2FjYzhjMWE3ODgvbW96dGVybS0xLjAuMC50YXIuZ3oiLAotICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgIm1venRlcm0tMS4wLjAvbW96dGVybSIpCi0gICAgICAgIHNlbGYuX2lu
c3RhbGwoImh0dHBzOi8vZmlsZXMucHl0aG9uaG9zdGVkLm9yZy9wYWNrYWdlcy82Yi83ZC8zMGQ1
MmMzYjJjYzAyMjI4MGM0MWY0N2YwNDk5YWZjNmQ4NzExNmIyMzA1MWJmNjljNjgzYWFhMWNkY2Iv
bW96bG9nLTUuMC50YXIuZ3oiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIm1vemxv
Zy01LjAvbW96bG9nIikKLQotICAgIGRlZiBfaW5zdGFsbF9tb3pwcm9jZXNzKHNlbGYpOgotICAg
ICAgICBzZWxmLl9lbnN1cmVfYXV0b2luc3RhbGxlZF9kaXJfaXNfaW5fc3lzX3BhdGgoKQotICAg
ICAgICBzZWxmLl9pbnN0YWxsKCJodHRwczovL2ZpbGVzLnB5dGhvbmhvc3RlZC5vcmcvcGFja2Fn
ZXMvOTcvZTcvNzkwN2YwYmYyZDBiNDJiMTU0NzQxZjhmZjYzYTE5OTQ4NmZjNjdjOTBhYWM4OGNk
ZTVmMmQxYWQxZWEyL21venByb2Nlc3MtMS4xLjAudGFyLmd6IiwKLSAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICJtb3pwcm9jZXNzLTEuMS4wL21venByb2Nlc3MiKQotCiAgICAgZGVmIF9p
bnN0YWxsX3B5dGVzdF90aW1lb3V0KHNlbGYpOgogICAgICAgICBzZWxmLl9pbnN0YWxsKCJodHRw
czovL2ZpbGVzLnB5dGhvbmhvc3RlZC5vcmcvcGFja2FnZXMvY2MvYjcvYjJhNjEzNjVlYTZiNmQy
ZTg4ODEzNjBhZTdlZDhkYWQwMzI3YWQyZGY4OWYyZjBiZTRhMDIzMDRkZWIyL3B5dGVzdC10aW1l
b3V0LTEuMi4wLnRhci5neiIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAicHl0ZXN0
LXRpbWVvdXQtMS4yLjAvcHl0ZXN0X3RpbWVvdXQucHkiKQpJbmRleDogVG9vbHMvU2NyaXB0cy93
ZWJraXRweS93ZWJkcml2ZXJfdGVzdHMvd2ViZHJpdmVyX3czY19leGVjdXRvci5weQo9PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3dlYmRyaXZlcl90ZXN0cy93ZWJkcml2ZXJf
dzNjX2V4ZWN1dG9yLnB5CShyZXZpc2lvbiAyNjYyMzMpCisrKyBUb29scy9TY3JpcHRzL3dlYmtp
dHB5L3dlYmRyaXZlcl90ZXN0cy93ZWJkcml2ZXJfdzNjX2V4ZWN1dG9yLnB5CSh3b3JraW5nIGNv
cHkpCkBAIC0yOCw4ICsyOCw3IEBAIGltcG9ydCBzeXMKIGZyb20gbXVsdGlwcm9jZXNzaW5nIGlt
cG9ydCBQcm9jZXNzLCBRdWV1ZQogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmZpbGVzeXN0
ZW0gaW1wb3J0IEZpbGVTeXN0ZW0KIGZyb20gd2Via2l0cHkuY29tbW9uLndlYmtpdF9maW5kZXIg
aW1wb3J0IFdlYktpdEZpbmRlcgotaW1wb3J0IHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3Rh
bGxlZC5tb3psb2cKLWltcG9ydCB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQubW96
cHJvY2VzcworCiBmcm9tIG1vemxvZyBpbXBvcnQgc3RydWN0dXJlZGxvZwogCiB3M2NfdG9vbHNf
ZGlyID0gV2ViS2l0RmluZGVyKEZpbGVTeXN0ZW0oKSkucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCdX
ZWJEcml2ZXJUZXN0cycsICdpbXBvcnRlZCcsICd3M2MnLCAndG9vbHMnKQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>409309</attachid>
            <date>2020-09-21 13:10:48 -0700</date>
            <delta_ts>2020-09-21 13:16:37 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-215889-20200921131048.patch</filename>
            <type>text/plain</type>
            <size>4571</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI2NzM1OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE4IEBACisyMDIwLTA5LTIxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBbd2Via2l0cHldIFVzZSB3ZWJraXRjb3JlcHkncyBhdXRvIGluc3RhbGxl
ciBmb3IgbW96KiBwYWNrYWdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjE1ODg5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82Nzg3NzkzNT4KKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMv
d2Via2l0cHkvX19pbml0X18ucHk6IEFkZCBtb3pwcm9jZXNzLCBtb3psb2cgYW5kIG1venRlcm0g
dG8gQXV0b0luc3RhbGxlZCBwYWNrYWdlcy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Ro
aXJkcGFydHkvX19pbml0X18ucHk6CisgICAgICAgIChBdXRvaW5zdGFsbEltcG9ydEhvb2suZmlu
ZF9tb2R1bGUpOiBSZW1vdmUgbW96bG9nIGFuZCBtb3pwcm9jZXNzLgorICAgICAgICAoQXV0b2lu
c3RhbGxJbXBvcnRIb29rLl9pbnN0YWxsX21vemxvZyk6IERlbGV0ZWQuCisgICAgICAgIChBdXRv
aW5zdGFsbEltcG9ydEhvb2suX2luc3RhbGxfbW96cHJvY2Vzcyk6IERlbGV0ZWQuCisgICAgICAg
ICogU2NyaXB0cy93ZWJraXRweS93ZWJkcml2ZXJfdGVzdHMvd2ViZHJpdmVyX3czY19leGVjdXRv
ci5weTogSW1wbGljaXRseSB1c2Ugd2Via2l0Y29yZXB5J3MgYXV0by1pbnN0YWxsZXIuCisKIDIw
MjAtMDktMjEgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICBF
bmFibGUgQWRkcmVzc1Nhbml0aXplciBpbiBDKysgc3RkIGxpYnJhcnkgdGVtcGxhdGVzCkluZGV4
OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L19faW5pdF9fLnB5Cj09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz
L1NjcmlwdHMvd2Via2l0cHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI2NzM1OSkKKysrIFRvb2xz
L1NjcmlwdHMvd2Via2l0cHkvX19pbml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAgLTI4LDYgKzI4
LDkgQEAgZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IEF1dG9JbnN0YWxsLCBQYQogQXV0b0luc3Rh
bGwuc2V0X2RpcmVjdG9yeShvcy5wYXRoLmpvaW4obGlicmFyaWVzLCAnYXV0b2luc3RhbGxlZCcs
ICdweXRob24te30nLmZvcm1hdChzeXMudmVyc2lvbl9pbmZvWzBdKSkpCiAKIEF1dG9JbnN0YWxs
LnJlZ2lzdGVyKFBhY2thZ2UoJ2NvdmVyYWdlJywgVmVyc2lvbig1LCAyLCAxKSkpCitBdXRvSW5z
dGFsbC5yZWdpc3RlcihQYWNrYWdlKCdtb3pwcm9jZXNzJywgVmVyc2lvbigxLCAyLCAwKSkpCitB
dXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdtb3psb2cnLCBWZXJzaW9uKDYsIDEpKSkKK0F1
dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ21venRlcm0nLCBWZXJzaW9uKDEsIDAsIDApKSkK
IEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3NlbGVuaXVtJywgVmVyc2lvbigzLCAxNDEs
IDApKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3RvbWwnLCBWZXJzaW9uKDAsIDEw
LCAxKSkpCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRf
Xy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19p
bml0X18ucHkJKHJldmlzaW9uIDI2NzM1OSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhp
cmRwYXJ0eS9fX2luaXRfXy5weQkod29ya2luZyBjb3B5KQpAQCAtMTA5LDEwICsxMDksNiBAQCBj
bGFzcyBBdXRvaW5zdGFsbEltcG9ydEhvb2sob2JqZWN0KToKICAgICAgICAgICAgIHNlbGYuaW5z
dGFsbF9jaHJvbWVkcml2ZXIoKQogICAgICAgICBlbGlmICcuZ2Vja29kcml2ZXInIGluIGZ1bGxu
YW1lOgogICAgICAgICAgICAgc2VsZi5pbnN0YWxsX2dlY2tvZHJpdmVyKCkKLSAgICAgICAgZWxp
ZiAnLm1vemxvZycgaW4gZnVsbG5hbWU6Ci0gICAgICAgICAgICBzZWxmLl9pbnN0YWxsX21vemxv
ZygpCi0gICAgICAgIGVsaWYgJy5tb3pwcm9jZXNzJyBpbiBmdWxsbmFtZToKLSAgICAgICAgICAg
IHNlbGYuX2luc3RhbGxfbW96cHJvY2VzcygpCiAgICAgICAgIGVsaWYgJy5weXRlc3RfdGltZW91
dCcgaW4gZnVsbG5hbWU6CiAgICAgICAgICAgICBzZWxmLl9pbnN0YWxsX3B5dGVzdF90aW1lb3V0
KCkKICAgICAgICAgZWxpZiAnLnB5dGVzdCcgaW4gZnVsbG5hbWU6CkBAIC0xNDgsMTggKzE0NCw2
IEBAIGNsYXNzIEF1dG9pbnN0YWxsSW1wb3J0SG9vayhvYmplY3QpOgogICAgICAgICBzZWxmLl9p
bnN0YWxsKCJodHRwczovL2ZpbGVzLnB5dGhvbmhvc3RlZC5vcmcvcGFja2FnZXMvc291cmNlL3Av
cHljb2Rlc3R5bGUvcHljb2Rlc3R5bGUtMi41LjAudGFyLmd6IiwKICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgInB5Y29kZXN0eWxlLTIuNS4wL3B5Y29kZXN0eWxlLnB5IikKIAotICAgIGRl
ZiBfaW5zdGFsbF9tb3psb2coc2VsZik6Ci0gICAgICAgIHNlbGYuX2Vuc3VyZV9hdXRvaW5zdGFs
bGVkX2Rpcl9pc19pbl9zeXNfcGF0aCgpCi0gICAgICAgIHNlbGYuX2luc3RhbGwoImh0dHBzOi8v
ZmlsZXMucHl0aG9uaG9zdGVkLm9yZy9wYWNrYWdlcy9hMC82OS81ZmY2MDAxZGY5OGNmMTg5NGU2
ZmI0YWE3NGVkYTE1MDRmODMwNTE1ZTUyZmM2YjBhM2FjYzhjMWE3ODgvbW96dGVybS0xLjAuMC50
YXIuZ3oiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIm1venRlcm0tMS4wLjAvbW96
dGVybSIpCi0gICAgICAgIHNlbGYuX2luc3RhbGwoImh0dHBzOi8vZmlsZXMucHl0aG9uaG9zdGVk
Lm9yZy9wYWNrYWdlcy82Yi83ZC8zMGQ1MmMzYjJjYzAyMjI4MGM0MWY0N2YwNDk5YWZjNmQ4NzEx
NmIyMzA1MWJmNjljNjgzYWFhMWNkY2IvbW96bG9nLTUuMC50YXIuZ3oiLAotICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgIm1vemxvZy01LjAvbW96bG9nIikKLQotICAgIGRlZiBfaW5zdGFs
bF9tb3pwcm9jZXNzKHNlbGYpOgotICAgICAgICBzZWxmLl9lbnN1cmVfYXV0b2luc3RhbGxlZF9k
aXJfaXNfaW5fc3lzX3BhdGgoKQotICAgICAgICBzZWxmLl9pbnN0YWxsKCJodHRwczovL2ZpbGVz
LnB5dGhvbmhvc3RlZC5vcmcvcGFja2FnZXMvOTcvZTcvNzkwN2YwYmYyZDBiNDJiMTU0NzQxZjhm
ZjYzYTE5OTQ4NmZjNjdjOTBhYWM4OGNkZTVmMmQxYWQxZWEyL21venByb2Nlc3MtMS4xLjAudGFy
Lmd6IiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJtb3pwcm9jZXNzLTEuMS4wL21v
enByb2Nlc3MiKQotCiAgICAgZGVmIF9pbnN0YWxsX3B5dGVzdF90aW1lb3V0KHNlbGYpOgogICAg
ICAgICBzZWxmLl9pbnN0YWxsKCJodHRwczovL2ZpbGVzLnB5dGhvbmhvc3RlZC5vcmcvcGFja2Fn
ZXMvY2MvYjcvYjJhNjEzNjVlYTZiNmQyZTg4ODEzNjBhZTdlZDhkYWQwMzI3YWQyZGY4OWYyZjBi
ZTRhMDIzMDRkZWIyL3B5dGVzdC10aW1lb3V0LTEuMi4wLnRhci5neiIsCiAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAicHl0ZXN0LXRpbWVvdXQtMS4yLjAvcHl0ZXN0X3RpbWVvdXQucHki
KQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS93ZWJkcml2ZXJfdGVzdHMvd2ViZHJpdmVy
X3czY19leGVjdXRvci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3dl
YmRyaXZlcl90ZXN0cy93ZWJkcml2ZXJfdzNjX2V4ZWN1dG9yLnB5CShyZXZpc2lvbiAyNjczNTkp
CisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3dlYmRyaXZlcl90ZXN0cy93ZWJkcml2ZXJfdzNj
X2V4ZWN1dG9yLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yOCw4ICsyOCw3IEBAIGltcG9ydCBzeXMK
IGZyb20gbXVsdGlwcm9jZXNzaW5nIGltcG9ydCBQcm9jZXNzLCBRdWV1ZQogZnJvbSB3ZWJraXRw
eS5jb21tb24uc3lzdGVtLmZpbGVzeXN0ZW0gaW1wb3J0IEZpbGVTeXN0ZW0KIGZyb20gd2Via2l0
cHkuY29tbW9uLndlYmtpdF9maW5kZXIgaW1wb3J0IFdlYktpdEZpbmRlcgotaW1wb3J0IHdlYmtp
dHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxlZC5tb3psb2cKLWltcG9ydCB3ZWJraXRweS50aGly
ZHBhcnR5LmF1dG9pbnN0YWxsZWQubW96cHJvY2VzcworCiBmcm9tIG1vemxvZyBpbXBvcnQgc3Ry
dWN0dXJlZGxvZwogCiB3M2NfdG9vbHNfZGlyID0gV2ViS2l0RmluZGVyKEZpbGVTeXN0ZW0oKSku
cGF0aF9mcm9tX3dlYmtpdF9iYXNlKCdXZWJEcml2ZXJUZXN0cycsICdpbXBvcnRlZCcsICd3M2Mn
LCAndG9vbHMnKQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>409311</attachid>
            <date>2020-09-21 13:16:38 -0700</date>
            <delta_ts>2020-09-21 13:58:23 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-215889-20200921131637.patch</filename>
            <type>text/plain</type>
            <size>4571</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI2NzM1OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE4IEBACisyMDIwLTA5LTIxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBbd2Via2l0cHldIFVzZSB3ZWJraXRjb3JlcHkncyBhdXRvIGluc3RhbGxl
ciBmb3IgbW96KiBwYWNrYWdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjE1ODg5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82Nzg3NzkzNT4KKwor
ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMv
d2Via2l0cHkvX19pbml0X18ucHk6IEFkZCBtb3pwcm9jZXNzLCBtb3psb2cgYW5kIG1venRlcm0g
dG8gQXV0b0luc3RhbGxlZCBwYWNrYWdlcy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Ro
aXJkcGFydHkvX19pbml0X18ucHk6CisgICAgICAgIChBdXRvaW5zdGFsbEltcG9ydEhvb2suZmlu
ZF9tb2R1bGUpOiBSZW1vdmUgbW96bG9nIGFuZCBtb3pwcm9jZXNzLgorICAgICAgICAoQXV0b2lu
c3RhbGxJbXBvcnRIb29rLl9pbnN0YWxsX21vemxvZyk6IERlbGV0ZWQuCisgICAgICAgIChBdXRv
aW5zdGFsbEltcG9ydEhvb2suX2luc3RhbGxfbW96cHJvY2Vzcyk6IERlbGV0ZWQuCisgICAgICAg
ICogU2NyaXB0cy93ZWJraXRweS93ZWJkcml2ZXJfdGVzdHMvd2ViZHJpdmVyX3czY19leGVjdXRv
ci5weTogSW1wbGljaXRseSB1c2Ugd2Via2l0Y29yZXB5J3MgYXV0by1pbnN0YWxsZXIuCisKIDIw
MjAtMDktMjEgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICBF
bmFibGUgQWRkcmVzc1Nhbml0aXplciBpbiBDKysgc3RkIGxpYnJhcnkgdGVtcGxhdGVzCkluZGV4
OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L19faW5pdF9fLnB5Cj09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz
L1NjcmlwdHMvd2Via2l0cHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI2NzM1OSkKKysrIFRvb2xz
L1NjcmlwdHMvd2Via2l0cHkvX19pbml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAgLTI4LDYgKzI4
LDkgQEAgZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IEF1dG9JbnN0YWxsLCBQYQogQXV0b0luc3Rh
bGwuc2V0X2RpcmVjdG9yeShvcy5wYXRoLmpvaW4obGlicmFyaWVzLCAnYXV0b2luc3RhbGxlZCcs
ICdweXRob24te30nLmZvcm1hdChzeXMudmVyc2lvbl9pbmZvWzBdKSkpCiAKIEF1dG9JbnN0YWxs
LnJlZ2lzdGVyKFBhY2thZ2UoJ2NvdmVyYWdlJywgVmVyc2lvbig1LCAyLCAxKSkpCitBdXRvSW5z
dGFsbC5yZWdpc3RlcihQYWNrYWdlKCdtb3pwcm9jZXNzJywgVmVyc2lvbigxLCAyLCAwKSkpCitB
dXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdtb3psb2cnLCBWZXJzaW9uKDYsIDEpKSkKK0F1
dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ21venRlcm0nLCBWZXJzaW9uKDEsIDAsIDApKSkK
IEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3NlbGVuaXVtJywgVmVyc2lvbigzLCAxNDEs
IDApKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3RvbWwnLCBWZXJzaW9uKDAsIDEw
LCAxKSkpCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRf
Xy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19p
bml0X18ucHkJKHJldmlzaW9uIDI2NzM1OSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhp
cmRwYXJ0eS9fX2luaXRfXy5weQkod29ya2luZyBjb3B5KQpAQCAtMTA5LDEwICsxMDksNiBAQCBj
bGFzcyBBdXRvaW5zdGFsbEltcG9ydEhvb2sob2JqZWN0KToKICAgICAgICAgICAgIHNlbGYuaW5z
dGFsbF9jaHJvbWVkcml2ZXIoKQogICAgICAgICBlbGlmICcuZ2Vja29kcml2ZXInIGluIGZ1bGxu
YW1lOgogICAgICAgICAgICAgc2VsZi5pbnN0YWxsX2dlY2tvZHJpdmVyKCkKLSAgICAgICAgZWxp
ZiAnLm1vemxvZycgaW4gZnVsbG5hbWU6Ci0gICAgICAgICAgICBzZWxmLl9pbnN0YWxsX21vemxv
ZygpCi0gICAgICAgIGVsaWYgJy5tb3pwcm9jZXNzJyBpbiBmdWxsbmFtZToKLSAgICAgICAgICAg
IHNlbGYuX2luc3RhbGxfbW96cHJvY2VzcygpCiAgICAgICAgIGVsaWYgJy5weXRlc3RfdGltZW91
dCcgaW4gZnVsbG5hbWU6CiAgICAgICAgICAgICBzZWxmLl9pbnN0YWxsX3B5dGVzdF90aW1lb3V0
KCkKICAgICAgICAgZWxpZiAnLnB5dGVzdCcgaW4gZnVsbG5hbWU6CkBAIC0xNDgsMTggKzE0NCw2
IEBAIGNsYXNzIEF1dG9pbnN0YWxsSW1wb3J0SG9vayhvYmplY3QpOgogICAgICAgICBzZWxmLl9p
bnN0YWxsKCJodHRwczovL2ZpbGVzLnB5dGhvbmhvc3RlZC5vcmcvcGFja2FnZXMvc291cmNlL3Av
cHljb2Rlc3R5bGUvcHljb2Rlc3R5bGUtMi41LjAudGFyLmd6IiwKICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgInB5Y29kZXN0eWxlLTIuNS4wL3B5Y29kZXN0eWxlLnB5IikKIAotICAgIGRl
ZiBfaW5zdGFsbF9tb3psb2coc2VsZik6Ci0gICAgICAgIHNlbGYuX2Vuc3VyZV9hdXRvaW5zdGFs
bGVkX2Rpcl9pc19pbl9zeXNfcGF0aCgpCi0gICAgICAgIHNlbGYuX2luc3RhbGwoImh0dHBzOi8v
ZmlsZXMucHl0aG9uaG9zdGVkLm9yZy9wYWNrYWdlcy9hMC82OS81ZmY2MDAxZGY5OGNmMTg5NGU2
ZmI0YWE3NGVkYTE1MDRmODMwNTE1ZTUyZmM2YjBhM2FjYzhjMWE3ODgvbW96dGVybS0xLjAuMC50
YXIuZ3oiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIm1venRlcm0tMS4wLjAvbW96
dGVybSIpCi0gICAgICAgIHNlbGYuX2luc3RhbGwoImh0dHBzOi8vZmlsZXMucHl0aG9uaG9zdGVk
Lm9yZy9wYWNrYWdlcy82Yi83ZC8zMGQ1MmMzYjJjYzAyMjI4MGM0MWY0N2YwNDk5YWZjNmQ4NzEx
NmIyMzA1MWJmNjljNjgzYWFhMWNkY2IvbW96bG9nLTUuMC50YXIuZ3oiLAotICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgIm1vemxvZy01LjAvbW96bG9nIikKLQotICAgIGRlZiBfaW5zdGFs
bF9tb3pwcm9jZXNzKHNlbGYpOgotICAgICAgICBzZWxmLl9lbnN1cmVfYXV0b2luc3RhbGxlZF9k
aXJfaXNfaW5fc3lzX3BhdGgoKQotICAgICAgICBzZWxmLl9pbnN0YWxsKCJodHRwczovL2ZpbGVz
LnB5dGhvbmhvc3RlZC5vcmcvcGFja2FnZXMvOTcvZTcvNzkwN2YwYmYyZDBiNDJiMTU0NzQxZjhm
ZjYzYTE5OTQ4NmZjNjdjOTBhYWM4OGNkZTVmMmQxYWQxZWEyL21venByb2Nlc3MtMS4xLjAudGFy
Lmd6IiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJtb3pwcm9jZXNzLTEuMS4wL21v
enByb2Nlc3MiKQotCiAgICAgZGVmIF9pbnN0YWxsX3B5dGVzdF90aW1lb3V0KHNlbGYpOgogICAg
ICAgICBzZWxmLl9pbnN0YWxsKCJodHRwczovL2ZpbGVzLnB5dGhvbmhvc3RlZC5vcmcvcGFja2Fn
ZXMvY2MvYjcvYjJhNjEzNjVlYTZiNmQyZTg4ODEzNjBhZTdlZDhkYWQwMzI3YWQyZGY4OWYyZjBi
ZTRhMDIzMDRkZWIyL3B5dGVzdC10aW1lb3V0LTEuMi4wLnRhci5neiIsCiAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAicHl0ZXN0LXRpbWVvdXQtMS4yLjAvcHl0ZXN0X3RpbWVvdXQucHki
KQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS93ZWJkcml2ZXJfdGVzdHMvd2ViZHJpdmVy
X3czY19leGVjdXRvci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3dl
YmRyaXZlcl90ZXN0cy93ZWJkcml2ZXJfdzNjX2V4ZWN1dG9yLnB5CShyZXZpc2lvbiAyNjczNTkp
CisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3dlYmRyaXZlcl90ZXN0cy93ZWJkcml2ZXJfdzNj
X2V4ZWN1dG9yLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yOCw4ICsyOCw3IEBAIGltcG9ydCBzeXMK
IGZyb20gbXVsdGlwcm9jZXNzaW5nIGltcG9ydCBQcm9jZXNzLCBRdWV1ZQogZnJvbSB3ZWJraXRw
eS5jb21tb24uc3lzdGVtLmZpbGVzeXN0ZW0gaW1wb3J0IEZpbGVTeXN0ZW0KIGZyb20gd2Via2l0
cHkuY29tbW9uLndlYmtpdF9maW5kZXIgaW1wb3J0IFdlYktpdEZpbmRlcgotaW1wb3J0IHdlYmtp
dHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxlZC5tb3psb2cKLWltcG9ydCB3ZWJraXRweS50aGly
ZHBhcnR5LmF1dG9pbnN0YWxsZWQubW96cHJvY2VzcworCiBmcm9tIG1vemxvZyBpbXBvcnQgc3Ry
dWN0dXJlZGxvZwogCiB3M2NfdG9vbHNfZGlyID0gV2ViS2l0RmluZGVyKEZpbGVTeXN0ZW0oKSku
cGF0aF9mcm9tX3dlYmtpdF9iYXNlKCdXZWJEcml2ZXJUZXN0cycsICdpbXBvcnRlZCcsICd3M2Mn
LCAndG9vbHMnKQo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>409317</attachid>
            <date>2020-09-21 13:58:25 -0700</date>
            <delta_ts>2020-09-21 14:20:22 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-215889-20200921135824.patch</filename>
            <type>text/plain</type>
            <size>4576</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI2NzM2NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE4IEBACisyMDIwLTA5LTIxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBbd2Via2l0cHldIFVzZSB3ZWJraXRjb3JlcHkncyBhdXRvIGluc3RhbGxl
ciBmb3IgbW96KiBwYWNrYWdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjE1ODg5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82Nzg3NzkzNT4KKwor
ICAgICAgICBSdWJiZXItc3RhbXBlZCBieSBBYWthc2ggSmFpbi4KKworICAgICAgICAqIFNjcmlw
dHMvd2Via2l0cHkvX19pbml0X18ucHk6IEFkZCBtb3pwcm9jZXNzLCBtb3psb2cgYW5kIG1venRl
cm0gdG8gQXV0b0luc3RhbGxlZCBwYWNrYWdlcy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5
L3RoaXJkcGFydHkvX19pbml0X18ucHk6CisgICAgICAgIChBdXRvaW5zdGFsbEltcG9ydEhvb2su
ZmluZF9tb2R1bGUpOiBSZW1vdmUgbW96bG9nIGFuZCBtb3pwcm9jZXNzLgorICAgICAgICAoQXV0
b2luc3RhbGxJbXBvcnRIb29rLl9pbnN0YWxsX21vemxvZyk6IERlbGV0ZWQuCisgICAgICAgIChB
dXRvaW5zdGFsbEltcG9ydEhvb2suX2luc3RhbGxfbW96cHJvY2Vzcyk6IERlbGV0ZWQuCisgICAg
ICAgICogU2NyaXB0cy93ZWJraXRweS93ZWJkcml2ZXJfdGVzdHMvd2ViZHJpdmVyX3czY19leGVj
dXRvci5weTogSW1wbGljaXRseSB1c2Ugd2Via2l0Y29yZXB5J3MgYXV0by1pbnN0YWxsZXIuCisK
IDIwMjAtMDktMjEgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAg
ICAgIFt3ZWJraXRweV0gVXNlIHdlYmtpdGNvcmVweSdzIGF1dG8gaW5zdGFsbGVyIGZvciBzaXgK
SW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvX19pbml0X18ucHkKPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g
VG9vbHMvU2NyaXB0cy93ZWJraXRweS9fX2luaXRfXy5weQkocmV2aXNpb24gMjY3MzY1KQorKysg
VG9vbHMvU2NyaXB0cy93ZWJraXRweS9fX2luaXRfXy5weQkod29ya2luZyBjb3B5KQpAQCAtMjgs
NiArMjgsOSBAQCBmcm9tIHdlYmtpdGNvcmVweSBpbXBvcnQgQXV0b0luc3RhbGwsIFBhCiBBdXRv
SW5zdGFsbC5zZXRfZGlyZWN0b3J5KG9zLnBhdGguam9pbihsaWJyYXJpZXMsICdhdXRvaW5zdGFs
bGVkJywgJ3B5dGhvbi17fScuZm9ybWF0KHN5cy52ZXJzaW9uX2luZm9bMF0pKSkKIAogQXV0b0lu
c3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnY292ZXJhZ2UnLCBWZXJzaW9uKDUsIDIsIDEpKSkKK0F1
dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ21venByb2Nlc3MnLCBWZXJzaW9uKDEsIDIsIDAp
KSkKK0F1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ21vemxvZycsIFZlcnNpb24oNiwgMSkp
KQorQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnbW96dGVybScsIFZlcnNpb24oMSwgMCwg
MCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnc2VsZW5pdW0nLCBWZXJzaW9uKDMs
IDE0MSwgMCkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgndG9tbCcsIFZlcnNpb24o
MCwgMTAsIDEpKSkKIApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19f
aW5pdF9fLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0
eS9fX2luaXRfXy5weQkocmV2aXNpb24gMjY3MzY1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRw
eS90aGlyZHBhcnR5L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMDksMTAgKzEwOSw2
IEBAIGNsYXNzIEF1dG9pbnN0YWxsSW1wb3J0SG9vayhvYmplY3QpOgogICAgICAgICAgICAgc2Vs
Zi5pbnN0YWxsX2Nocm9tZWRyaXZlcigpCiAgICAgICAgIGVsaWYgJy5nZWNrb2RyaXZlcicgaW4g
ZnVsbG5hbWU6CiAgICAgICAgICAgICBzZWxmLmluc3RhbGxfZ2Vja29kcml2ZXIoKQotICAgICAg
ICBlbGlmICcubW96bG9nJyBpbiBmdWxsbmFtZToKLSAgICAgICAgICAgIHNlbGYuX2luc3RhbGxf
bW96bG9nKCkKLSAgICAgICAgZWxpZiAnLm1venByb2Nlc3MnIGluIGZ1bGxuYW1lOgotICAgICAg
ICAgICAgc2VsZi5faW5zdGFsbF9tb3pwcm9jZXNzKCkKICAgICAgICAgZWxpZiAnLnB5dGVzdF90
aW1lb3V0JyBpbiBmdWxsbmFtZToKICAgICAgICAgICAgIHNlbGYuX2luc3RhbGxfcHl0ZXN0X3Rp
bWVvdXQoKQogICAgICAgICBlbGlmICcucHl0ZXN0JyBpbiBmdWxsbmFtZToKQEAgLTE0MywxOCAr
MTM5LDYgQEAgY2xhc3MgQXV0b2luc3RhbGxJbXBvcnRIb29rKG9iamVjdCk6CiAgICAgICAgIHNl
bGYuX2luc3RhbGwoImh0dHBzOi8vZmlsZXMucHl0aG9uaG9zdGVkLm9yZy9wYWNrYWdlcy9zb3Vy
Y2UvcC9weWNvZGVzdHlsZS9weWNvZGVzdHlsZS0yLjUuMC50YXIuZ3oiLAogICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAicHljb2Rlc3R5bGUtMi41LjAvcHljb2Rlc3R5bGUucHkiKQogCi0g
ICAgZGVmIF9pbnN0YWxsX21vemxvZyhzZWxmKToKLSAgICAgICAgc2VsZi5fZW5zdXJlX2F1dG9p
bnN0YWxsZWRfZGlyX2lzX2luX3N5c19wYXRoKCkKLSAgICAgICAgc2VsZi5faW5zdGFsbCgiaHR0
cHM6Ly9maWxlcy5weXRob25ob3N0ZWQub3JnL3BhY2thZ2VzL2EwLzY5LzVmZjYwMDFkZjk4Y2Yx
ODk0ZTZmYjRhYTc0ZWRhMTUwNGY4MzA1MTVlNTJmYzZiMGEzYWNjOGMxYTc4OC9tb3p0ZXJtLTEu
MC4wLnRhci5neiIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAibW96dGVybS0xLjAu
MC9tb3p0ZXJtIikKLSAgICAgICAgc2VsZi5faW5zdGFsbCgiaHR0cHM6Ly9maWxlcy5weXRob25o
b3N0ZWQub3JnL3BhY2thZ2VzLzZiLzdkLzMwZDUyYzNiMmNjMDIyMjgwYzQxZjQ3ZjA0OTlhZmM2
ZDg3MTE2YjIzMDUxYmY2OWM2ODNhYWExY2RjYi9tb3psb2ctNS4wLnRhci5neiIsCi0gICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAibW96bG9nLTUuMC9tb3psb2ciKQotCi0gICAgZGVmIF9p
bnN0YWxsX21venByb2Nlc3Moc2VsZik6Ci0gICAgICAgIHNlbGYuX2Vuc3VyZV9hdXRvaW5zdGFs
bGVkX2Rpcl9pc19pbl9zeXNfcGF0aCgpCi0gICAgICAgIHNlbGYuX2luc3RhbGwoImh0dHBzOi8v
ZmlsZXMucHl0aG9uaG9zdGVkLm9yZy9wYWNrYWdlcy85Ny9lNy83OTA3ZjBiZjJkMGI0MmIxNTQ3
NDFmOGZmNjNhMTk5NDg2ZmM2N2M5MGFhYzg4Y2RlNWYyZDFhZDFlYTIvbW96cHJvY2Vzcy0xLjEu
MC50YXIuZ3oiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIm1venByb2Nlc3MtMS4x
LjAvbW96cHJvY2VzcyIpCi0KICAgICBkZWYgX2luc3RhbGxfcHl0ZXN0X3RpbWVvdXQoc2VsZik6
CiAgICAgICAgIHNlbGYuX2luc3RhbGwoImh0dHBzOi8vZmlsZXMucHl0aG9uaG9zdGVkLm9yZy9w
YWNrYWdlcy9jYy9iNy9iMmE2MTM2NWVhNmI2ZDJlODg4MTM2MGFlN2VkOGRhZDAzMjdhZDJkZjg5
ZjJmMGJlNGEwMjMwNGRlYjIvcHl0ZXN0LXRpbWVvdXQtMS4yLjAudGFyLmd6IiwKICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICJweXRlc3QtdGltZW91dC0xLjIuMC9weXRlc3RfdGltZW91
dC5weSIpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3dlYmRyaXZlcl90ZXN0cy93ZWJk
cml2ZXJfdzNjX2V4ZWN1dG9yLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0
cHkvd2ViZHJpdmVyX3Rlc3RzL3dlYmRyaXZlcl93M2NfZXhlY3V0b3IucHkJKHJldmlzaW9uIDI2
NzM2NSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvd2ViZHJpdmVyX3Rlc3RzL3dlYmRyaXZl
cl93M2NfZXhlY3V0b3IucHkJKHdvcmtpbmcgY29weSkKQEAgLTI4LDggKzI4LDcgQEAgaW1wb3J0
IHN5cwogZnJvbSBtdWx0aXByb2Nlc3NpbmcgaW1wb3J0IFByb2Nlc3MsIFF1ZXVlCiBmcm9tIHdl
YmtpdHB5LmNvbW1vbi5zeXN0ZW0uZmlsZXN5c3RlbSBpbXBvcnQgRmlsZVN5c3RlbQogZnJvbSB3
ZWJraXRweS5jb21tb24ud2Via2l0X2ZpbmRlciBpbXBvcnQgV2ViS2l0RmluZGVyCi1pbXBvcnQg
d2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkLm1vemxvZwotaW1wb3J0IHdlYmtpdHB5
LnRoaXJkcGFydHkuYXV0b2luc3RhbGxlZC5tb3pwcm9jZXNzCisKIGZyb20gbW96bG9nIGltcG9y
dCBzdHJ1Y3R1cmVkbG9nCiAKIHczY190b29sc19kaXIgPSBXZWJLaXRGaW5kZXIoRmlsZVN5c3Rl
bSgpKS5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoJ1dlYkRyaXZlclRlc3RzJywgJ2ltcG9ydGVkJywg
J3czYycsICd0b29scycpCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>