<?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>232443</bug_id>
          
          <creation_ts>2021-10-28 10:27:48 -0700</creation_ts>
          <short_desc>[webkitscmpy] Fix commits set on branch</short_desc>
          <delta_ts>2021-10-28 14:04:47 -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>
          
          
          <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>darin</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1809743</commentid>
    <comment_count>0</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-10-28 10:27:48 -0700</bug_when>
    <thetext>When we are grabbing a set of commits on a branch, the current code returns incorrect identifiers for those commits in git.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1809744</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-10-28 10:28:02 -0700</bug_when>
    <thetext>&lt;rdar://problem/84763432&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1809745</commentid>
    <comment_count>2</comment_count>
      <attachid>442717</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-10-28 10:32:22 -0700</bug_when>
    <thetext>Created attachment 442717
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1809772</commentid>
    <comment_count>3</comment_count>
      <attachid>442717</attachid>
    <who name="Darin Adler">darin</who>
    <bug_when>2021-10-28 12:06:28 -0700</bug_when>
    <thetext>Comment on attachment 442717
Patch

Do we have a way to test this?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1809780</commentid>
    <comment_count>4</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-10-28 12:20:04 -0700</bug_when>
    <thetext>Pull-request: https://github.com/WebKit/WebKit/pull/26</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1809784</commentid>
    <comment_count>5</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-10-28 12:36:55 -0700</bug_when>
    <thetext>(In reply to Darin Adler from comment #3)
&gt; Comment on attachment 442717 [details]
&gt; Patch
&gt; 
&gt; Do we have a way to test this?

Went back to double-check, and yes.  Our existing tests almost caught it in the first place (they needed 3 commits on a branch instead of 2)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1809785</commentid>
    <comment_count>6</comment_count>
      <attachid>442731</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-10-28 12:38:17 -0700</bug_when>
    <thetext>Created attachment 442731
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1809809</commentid>
    <comment_count>7</comment_count>
      <attachid>442737</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2021-10-28 13:30:00 -0700</bug_when>
    <thetext>Created attachment 442737
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1809824</commentid>
    <comment_count>8</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-10-28 14:04:45 -0700</bug_when>
    <thetext>Committed r285002 (243648@main): &lt;https://commits.webkit.org/243648@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 442737.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>442717</attachid>
            <date>2021-10-28 10:32:22 -0700</date>
            <delta_ts>2021-10-28 12:38:14 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232443-20211028103221.patch</filename>
            <type>text/plain</type>
            <size>2505</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTkxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYWJjOTg3NWVmMDA1NmQ3MzQwYzdmOWI2Zjk0NjAxY2Ew
Y2IyM2RmNS4uNTUzYmU5Njg3YTY3NGRjMjk1N2Q2NTcyMzYzMjE0OGRkMGI5ZmVkZiAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0
IEBACisyMDIxLTEwLTI4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor
ICAgICAgICBbd2Via2l0c2NtcHldIEZpeCBjb21taXRzIHNldCBvbiBicmFuY2gKKyAgICAgICAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjQ0MworICAgICAgICA8
cmRhcjovL3Byb2JsZW0vODQ3NjM0MzI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP
T1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz
Y21weS9sb2NhbC9naXQucHk6CisgICAgICAgIChHaXQuY29tbWl0cyk6IFdlIGFyZSBhcHBlbmRp
bmcgdG8gbGlzdCBvZiBjb21taXRzLCBub3QgcHJlLXBlbmRpbmcuCisKIDIwMjEtMTAtMjggIFNp
bW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUHJlcGFyZSBT
aW5nbGVUZXN0UnVubmVyVGVzdCB0byByZWFkIGZ1enp5IHBpeGVsIG1hdGNoaW5nIGRhdGEKZGlm
ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5
L2xvY2FsL2dpdC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp
dHNjbXB5L2xvY2FsL2dpdC5weQppbmRleCAwYjQ5NTA1OTI4OTZkOTJhMTIxZGQzYmFkZTcyZTQx
MzczMGY1NGIwLi5mY2I5M2JiZGY5ZjA3NTMwNjczNzIxMTAxNGQ3OGRlZjQzY2EwZGViIDEwMDY0
NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9s
b2NhbC9naXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi
a2l0c2NtcHkvbG9jYWwvZ2l0LnB5CkBAIC02ODgsMTAgKzY4OCwxMCBAQCBjbGFzcyBHaXQoU2Nt
KToKICAgICAgICAgICAgIHdoaWxlIGxpbmU6CiAgICAgICAgICAgICAgICAgaWYgbm90IGxpbmUu
c3RhcnRzd2l0aCgnY29tbWl0ICcpOgogICAgICAgICAgICAgICAgICAgICByYWlzZSBPU0Vycm9y
KCdGYWlsZWQgdG8gcGFyc2UgYGdpdCBsb2dgIGZvcm1hdCcpCi0gICAgICAgICAgICAgICAgYnJh
bmNoX3BvaW50ID0gcHJldmlvdXNbMF0uYnJhbmNoX3BvaW50Ci0gICAgICAgICAgICAgICAgaWRl
bnRpZmllciA9IHByZXZpb3VzWzBdLmlkZW50aWZpZXIKKyAgICAgICAgICAgICAgICBicmFuY2hf
cG9pbnQgPSBwcmV2aW91c1stMV0uYnJhbmNoX3BvaW50CisgICAgICAgICAgICAgICAgaWRlbnRp
ZmllciA9IHByZXZpb3VzWy0xXS5pZGVudGlmaWVyCiAgICAgICAgICAgICAgICAgaGFzaCA9IGxp
bmUuc3BsaXQoJyAnKVstMV0ucnN0cmlwKCkKLSAgICAgICAgICAgICAgICBpZiBoYXNoICE9IHBy
ZXZpb3VzWzBdLmhhc2g6CisgICAgICAgICAgICAgICAgaWYgaGFzaCAhPSBwcmV2aW91c1stMV0u
aGFzaDoKICAgICAgICAgICAgICAgICAgICAgaWRlbnRpZmllciAtPSAxCiAKICAgICAgICAgICAg
ICAgICBpZiBub3QgaWRlbnRpZmllcjoKQEAgLTcxNSwxMiArNzE1LDEyIEBAIGNsYXNzIEdpdChT
Y20pOgogICAgICAgICAgICAgICAgICkKIAogICAgICAgICAgICAgICAgICMgRW5zdXJlIHRoYXQg
d2UgZG9uJ3QgZHVwbGljYXRlIHRoZSBmaXJzdCBhbmQgbGFzdCBjb21taXRzCi0gICAgICAgICAg
ICAgICAgaWYgY29tbWl0Lmhhc2ggPT0gcHJldmlvdXNbMF0uaGFzaDoKLSAgICAgICAgICAgICAg
ICAgICAgcHJldmlvdXNbMF0gPSBjb21taXQKKyAgICAgICAgICAgICAgICBpZiBjb21taXQuaGFz
aCA9PSBwcmV2aW91c1stMV0uaGFzaDoKKyAgICAgICAgICAgICAgICAgICAgcHJldmlvdXNbLTFd
ID0gY29tbWl0CiAKICAgICAgICAgICAgICAgICAjIElmIHdlIHNoYXJlIGEgdGltZXN0YW1wIHdp
dGggdGhlIHByZXZpb3VzIGNvbW1pdCwgdGhhdCBtZWFucyB0aGF0IHRoaXMgY29tbWl0IGhhcyBh
biBvcmRlcgogICAgICAgICAgICAgICAgICMgbGVzcyB0aGFuIHRoZSBzZXQgb2YgY29tbWl0cyBj
YWNoZWQgaW4gcHJldmlvdXMKLSAgICAgICAgICAgICAgICBlbGlmIGNvbW1pdC50aW1lc3RhbXAg
PT0gcHJldmlvdXNbMF0udGltZXN0YW1wOgorICAgICAgICAgICAgICAgIGVsaWYgY29tbWl0LnRp
bWVzdGFtcCA9PSBwcmV2aW91c1stMV0udGltZXN0YW1wOgogICAgICAgICAgICAgICAgICAgICBm
b3IgY2FjaGVkIGluIHByZXZpb3VzOgogICAgICAgICAgICAgICAgICAgICAgICAgY2FjaGVkLm9y
ZGVyICs9IDEKICAgICAgICAgICAgICAgICAgICAgcHJldmlvdXMuYXBwZW5kKGNvbW1pdCkK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>442731</attachid>
            <date>2021-10-28 12:38:17 -0700</date>
            <delta_ts>2021-10-28 13:29:58 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232443-20211028123816.patch</filename>
            <type>text/plain</type>
            <size>5204</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTk0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYWJjOTg3NWVmMDA1NmQ3MzQwYzdmOWI2Zjk0NjAxY2Ew
Y2IyM2RmNS4uNzM4ODA0YzJlOGQ0ZDg1Y2NjMjgwOWM0N2E5MjU2YzI4OWU3NzZkNiAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4
IEBACisyMDIxLTEwLTI4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor
ICAgICAgICBbd2Via2l0c2NtcHldIEZpeCBjb21taXRzIHNldCBvbiBicmFuY2gKKyAgICAgICAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjQ0MworICAgICAgICA8
cmRhcjovL3Byb2JsZW0vODQ3NjM0MzI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRs
ZXIuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weTog
QnVtcCB2ZXJzaW9uLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl
YmtpdHNjbXB5L19faW5pdF9fLnB5OiBEaXR0by4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmll
cy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHk6CisgICAgICAgIChHaXQuY29t
bWl0cyk6IFdlIGFyZSBhcHBlbmRpbmcgdG8gbGlzdCBvZiBjb21taXRzLCBub3QgcHJlLXBlbmRp
bmcuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv
dGVzdC9naXRfdW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0R2l0SHViLnRlc3RfY29tbWl0c19i
cmFuY2hfcmVmKToKKwogMjAyMS0xMC0yOCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFw
cGxlLmNvbT4KIAogICAgICAgICBQcmVwYXJlIFNpbmdsZVRlc3RSdW5uZXJUZXN0IHRvIHJlYWQg
ZnV6enkgcGl4ZWwgbWF0Y2hpbmcgZGF0YQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJy
YXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr
aXRzY21weS9zZXR1cC5weQppbmRleCBiMTg0NmNjMDA4NDgzODZhNmU3N2M4MmRkNjAxMmEwYjlm
ZTRkMzJhLi40NjFiMWZjOTk1NTM2ZTNjOWU3OWRjZDlhZjlhZjY2YTA2OGIwYTA3IDEwMDY0NAot
LS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQorKysgYi9U
b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQpAQCAtMjksNyArMjks
NyBAQCBkZWYgcmVhZG1lKCk6CiAKIHNldHVwKAogICAgIG5hbWU9J3dlYmtpdHNjbXB5JywKLSAg
ICB2ZXJzaW9uPScyLjIuMTgnLAorICAgIHZlcnNpb249JzIuMi4xOScsCiAgICAgZGVzY3JpcHRp
b249J0xpYnJhcnkgZGVzaWduZWQgdG8gaW50ZXJhY3Qgd2l0aCBnaXQgYW5kIHN2biByZXBvc2l0
b3JpZXMuJywKICAgICBsb25nX2Rlc2NyaXB0aW9uPXJlYWRtZSgpLAogICAgIGNsYXNzaWZpZXJz
PVsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp
dHNjbXB5L19faW5pdF9fLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv
d2Via2l0c2NtcHkvX19pbml0X18ucHkKaW5kZXggNWE5MDFhYWUzMGYyNDI4MzBjNjZkNGI5ZWIy
NWQ1MTMyNDQyZDMyMi4uZGM5YmU4NjkwYTdkMDhlY2IwNzQzNmZmM2I0NmExYTE0NWFlZDQ3MCAx
MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt
cHkvX19pbml0X18ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv
d2Via2l0c2NtcHkvX19pbml0X18ucHkKQEAgLTQ2LDcgKzQ2LDcgQEAgZXhjZXB0IEltcG9ydEVy
cm9yOgogICAgICAgICAiUGxlYXNlIGluc3RhbGwgd2Via2l0Y29yZXB5IHdpdGggYHBpcCBpbnN0
YWxsIHdlYmtpdGNvcmVweSAtLWV4dHJhLWluZGV4LXVybCA8cGFja2FnZSBpbmRleCBVUkw+YCIK
ICAgICApCiAKLXZlcnNpb24gPSBWZXJzaW9uKDIsIDIsIDE4KQordmVyc2lvbiA9IFZlcnNpb24o
MiwgMiwgMTkpCiAKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2Zhc3RlbmVycycsIFZl
cnNpb24oMCwgMTUsIDApKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2ppbmphMics
IFZlcnNpb24oMiwgMTEsIDMpKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVz
L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weSBiL1Rvb2xzL1NjcmlwdHMvbGli
cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weQppbmRleCAwYjQ5NTA1
OTI4OTZkOTJhMTIxZGQzYmFkZTcyZTQxMzczMGY1NGIwLi5mY2I5M2JiZGY5ZjA3NTMwNjczNzIx
MTAxNGQ3OGRlZjQzY2EwZGViIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93
ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9s
aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5CkBAIC02ODgsMTAg
KzY4OCwxMCBAQCBjbGFzcyBHaXQoU2NtKToKICAgICAgICAgICAgIHdoaWxlIGxpbmU6CiAgICAg
ICAgICAgICAgICAgaWYgbm90IGxpbmUuc3RhcnRzd2l0aCgnY29tbWl0ICcpOgogICAgICAgICAg
ICAgICAgICAgICByYWlzZSBPU0Vycm9yKCdGYWlsZWQgdG8gcGFyc2UgYGdpdCBsb2dgIGZvcm1h
dCcpCi0gICAgICAgICAgICAgICAgYnJhbmNoX3BvaW50ID0gcHJldmlvdXNbMF0uYnJhbmNoX3Bv
aW50Ci0gICAgICAgICAgICAgICAgaWRlbnRpZmllciA9IHByZXZpb3VzWzBdLmlkZW50aWZpZXIK
KyAgICAgICAgICAgICAgICBicmFuY2hfcG9pbnQgPSBwcmV2aW91c1stMV0uYnJhbmNoX3BvaW50
CisgICAgICAgICAgICAgICAgaWRlbnRpZmllciA9IHByZXZpb3VzWy0xXS5pZGVudGlmaWVyCiAg
ICAgICAgICAgICAgICAgaGFzaCA9IGxpbmUuc3BsaXQoJyAnKVstMV0ucnN0cmlwKCkKLSAgICAg
ICAgICAgICAgICBpZiBoYXNoICE9IHByZXZpb3VzWzBdLmhhc2g6CisgICAgICAgICAgICAgICAg
aWYgaGFzaCAhPSBwcmV2aW91c1stMV0uaGFzaDoKICAgICAgICAgICAgICAgICAgICAgaWRlbnRp
ZmllciAtPSAxCiAKICAgICAgICAgICAgICAgICBpZiBub3QgaWRlbnRpZmllcjoKQEAgLTcxNSwx
MiArNzE1LDEyIEBAIGNsYXNzIEdpdChTY20pOgogICAgICAgICAgICAgICAgICkKIAogICAgICAg
ICAgICAgICAgICMgRW5zdXJlIHRoYXQgd2UgZG9uJ3QgZHVwbGljYXRlIHRoZSBmaXJzdCBhbmQg
bGFzdCBjb21taXRzCi0gICAgICAgICAgICAgICAgaWYgY29tbWl0Lmhhc2ggPT0gcHJldmlvdXNb
MF0uaGFzaDoKLSAgICAgICAgICAgICAgICAgICAgcHJldmlvdXNbMF0gPSBjb21taXQKKyAgICAg
ICAgICAgICAgICBpZiBjb21taXQuaGFzaCA9PSBwcmV2aW91c1stMV0uaGFzaDoKKyAgICAgICAg
ICAgICAgICAgICAgcHJldmlvdXNbLTFdID0gY29tbWl0CiAKICAgICAgICAgICAgICAgICAjIElm
IHdlIHNoYXJlIGEgdGltZXN0YW1wIHdpdGggdGhlIHByZXZpb3VzIGNvbW1pdCwgdGhhdCBtZWFu
cyB0aGF0IHRoaXMgY29tbWl0IGhhcyBhbiBvcmRlcgogICAgICAgICAgICAgICAgICMgbGVzcyB0
aGFuIHRoZSBzZXQgb2YgY29tbWl0cyBjYWNoZWQgaW4gcHJldmlvdXMKLSAgICAgICAgICAgICAg
ICBlbGlmIGNvbW1pdC50aW1lc3RhbXAgPT0gcHJldmlvdXNbMF0udGltZXN0YW1wOgorICAgICAg
ICAgICAgICAgIGVsaWYgY29tbWl0LnRpbWVzdGFtcCA9PSBwcmV2aW91c1stMV0udGltZXN0YW1w
OgogICAgICAgICAgICAgICAgICAgICBmb3IgY2FjaGVkIGluIHByZXZpb3VzOgogICAgICAgICAg
ICAgICAgICAgICAgICAgY2FjaGVkLm9yZGVyICs9IDEKICAgICAgICAgICAgICAgICAgICAgcHJl
dmlvdXMuYXBwZW5kKGNvbW1pdCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVz
L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2Ny
aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3Qu
cHkKaW5kZXggOGZkNmI0MTYxZDkxNTU2MmQxM2NjMDBiMTQ0YTVlZTRmMmExNjQwMS4uMzM4NzBi
MmY1ZDNhMjY2MzA4ZGJjZGNmZmE2OTVhMzM5NTA2NGVhZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny
aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3Qu
cHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv
dGVzdC9naXRfdW5pdHRlc3QucHkKQEAgLTYyOCw2ICs2MjgsMTUgQEAgY2xhc3MgVGVzdEdpdEh1
Yih0ZXN0aW5nLlRlc3RDYXNlKToKICAgICAgICAgICAgICAgICBnaXQuY29tbWl0KGhhc2g9Jzli
ODMxMWYyJyksCiAgICAgICAgICAgICBdKSwgQ29tbWl0LkVuY29kZXIoKS5kZWZhdWx0KGxpc3Qo
Z2l0LmNvbW1pdHMoYmVnaW49ZGljdChhcmd1bWVudD0nOWI4MzExZjInKSwgZW5kPWRpY3QoYXJn
dW1lbnQ9JzYyMTY1MmFkJykpKSkpCiAKKyAgICBkZWYgdGVzdF9jb21taXRzX2JyYW5jaF9yZWYo
c2VsZik6CisgICAgICAgIHdpdGggbW9ja3MucmVtb3RlLkdpdEh1YigpOgorICAgICAgICAgICAg
Z2l0ID0gcmVtb3RlLkdpdEh1YihzZWxmLnJlbW90ZSkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0
RXF1YWwoQ29tbWl0LkVuY29kZXIoKS5kZWZhdWx0KFsKKyAgICAgICAgICAgICAgICBnaXQuY29t
bWl0KGhhc2g9Jzc5MDcyNWE2JyksCisgICAgICAgICAgICAgICAgZ2l0LmNvbW1pdChoYXNoPScz
Y2QzMmUzNScpLAorICAgICAgICAgICAgICAgIGdpdC5jb21taXQoaGFzaD0nYTMwY2U4NDknKSwK
KyAgICAgICAgICAgIF0pLCBDb21taXQuRW5jb2RlcigpLmRlZmF1bHQobGlzdChnaXQuY29tbWl0
cyhiZWdpbj1kaWN0KGFyZ3VtZW50PSdhMzBjZTg0OScpLCBlbmQ9ZGljdChhcmd1bWVudD0nYnJh
bmNoLWInKSkpKSkKKwogCiBjbGFzcyBUZXN0Qml0QnVja2V0KHRlc3RpbmcuVGVzdENhc2UpOgog
ICAgIHJlbW90ZSA9ICdodHRwczovL2JpdGJ1Y2tldC5leGFtcGxlLmNvbS9wcm9qZWN0cy9XRUJL
SVQvcmVwb3Mvd2Via2l0Jwo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>442737</attachid>
            <date>2021-10-28 13:30:00 -0700</date>
            <delta_ts>2021-10-28 14:04:46 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-232443-20211028132959.patch</filename>
            <type>text/plain</type>
            <size>5147</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTk3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYWJjOTg3NWVmMDA1NmQ3MzQwYzdmOWI2Zjk0NjAxY2Ew
Y2IyM2RmNS4uNzM4ODA0YzJlOGQ0ZDg1Y2NjMjgwOWM0N2E5MjU2YzI4OWU3NzZkNiAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4
IEBACisyMDIxLTEwLTI4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor
ICAgICAgICBbd2Via2l0c2NtcHldIEZpeCBjb21taXRzIHNldCBvbiBicmFuY2gKKyAgICAgICAg
aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjQ0MworICAgICAgICA8
cmRhcjovL3Byb2JsZW0vODQ3NjM0MzI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRs
ZXIuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weTog
QnVtcCB2ZXJzaW9uLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl
YmtpdHNjbXB5L19faW5pdF9fLnB5OiBEaXR0by4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmll
cy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHk6CisgICAgICAgIChHaXQuY29t
bWl0cyk6IFdlIGFyZSBhcHBlbmRpbmcgdG8gbGlzdCBvZiBjb21taXRzLCBub3QgcHJlLXBlbmRp
bmcuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv
dGVzdC9naXRfdW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0R2l0SHViLnRlc3RfY29tbWl0c19i
cmFuY2hfcmVmKToKKwogMjAyMS0xMC0yOCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFw
cGxlLmNvbT4KIAogICAgICAgICBQcmVwYXJlIFNpbmdsZVRlc3RSdW5uZXJUZXN0IHRvIHJlYWQg
ZnV6enkgcGl4ZWwgbWF0Y2hpbmcgZGF0YQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJy
YXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr
aXRzY21weS9zZXR1cC5weQppbmRleCBiMTg0NmNjMDA4NDgzODZhNmU3N2M4MmRkNjAxMmEwYjlm
ZTRkMzJhLi40NjFiMWZjOTk1NTM2ZTNjOWU3OWRjZDlhZjlhZjY2YTA2OGIwYTA3IDEwMDY0NAot
LS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQorKysgYi9U
b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQpAQCAtMjksNyArMjks
NyBAQCBkZWYgcmVhZG1lKCk6CiAKIHNldHVwKAogICAgIG5hbWU9J3dlYmtpdHNjbXB5JywKLSAg
ICB2ZXJzaW9uPScyLjIuMTgnLAorICAgIHZlcnNpb249JzIuMi4xOScsCiAgICAgZGVzY3JpcHRp
b249J0xpYnJhcnkgZGVzaWduZWQgdG8gaW50ZXJhY3Qgd2l0aCBnaXQgYW5kIHN2biByZXBvc2l0
b3JpZXMuJywKICAgICBsb25nX2Rlc2NyaXB0aW9uPXJlYWRtZSgpLAogICAgIGNsYXNzaWZpZXJz
PVsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp
dHNjbXB5L19faW5pdF9fLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv
d2Via2l0c2NtcHkvX19pbml0X18ucHkKaW5kZXggNWE5MDFhYWUzMGYyNDI4MzBjNjZkNGI5ZWIy
NWQ1MTMyNDQyZDMyMi4uZGM5YmU4NjkwYTdkMDhlY2IwNzQzNmZmM2I0NmExYTE0NWFlZDQ3MCAx
MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt
cHkvX19pbml0X18ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv
d2Via2l0c2NtcHkvX19pbml0X18ucHkKQEAgLTQ2LDcgKzQ2LDcgQEAgZXhjZXB0IEltcG9ydEVy
cm9yOgogICAgICAgICAiUGxlYXNlIGluc3RhbGwgd2Via2l0Y29yZXB5IHdpdGggYHBpcCBpbnN0
YWxsIHdlYmtpdGNvcmVweSAtLWV4dHJhLWluZGV4LXVybCA8cGFja2FnZSBpbmRleCBVUkw+YCIK
ICAgICApCiAKLXZlcnNpb24gPSBWZXJzaW9uKDIsIDIsIDE4KQordmVyc2lvbiA9IFZlcnNpb24o
MiwgMiwgMTkpCiAKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2Zhc3RlbmVycycsIFZl
cnNpb24oMCwgMTUsIDApKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2ppbmphMics
IFZlcnNpb24oMiwgMTEsIDMpKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVz
L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weSBiL1Rvb2xzL1NjcmlwdHMvbGli
cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weQppbmRleCAwYjQ5NTA1
OTI4OTZkOTJhMTIxZGQzYmFkZTcyZTQxMzczMGY1NGIwLi5mY2I5M2JiZGY5ZjA3NTMwNjczNzIx
MTAxNGQ3OGRlZjQzY2EwZGViIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93
ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9s
aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5CkBAIC02ODgsMTAg
KzY4OCwxMCBAQCBjbGFzcyBHaXQoU2NtKToKICAgICAgICAgICAgIHdoaWxlIGxpbmU6CiAgICAg
ICAgICAgICAgICAgaWYgbm90IGxpbmUuc3RhcnRzd2l0aCgnY29tbWl0ICcpOgogICAgICAgICAg
ICAgICAgICAgICByYWlzZSBPU0Vycm9yKCdGYWlsZWQgdG8gcGFyc2UgYGdpdCBsb2dgIGZvcm1h
dCcpCi0gICAgICAgICAgICAgICAgYnJhbmNoX3BvaW50ID0gcHJldmlvdXNbMF0uYnJhbmNoX3Bv
aW50Ci0gICAgICAgICAgICAgICAgaWRlbnRpZmllciA9IHByZXZpb3VzWzBdLmlkZW50aWZpZXIK
KyAgICAgICAgICAgICAgICBicmFuY2hfcG9pbnQgPSBwcmV2aW91c1stMV0uYnJhbmNoX3BvaW50
CisgICAgICAgICAgICAgICAgaWRlbnRpZmllciA9IHByZXZpb3VzWy0xXS5pZGVudGlmaWVyCiAg
ICAgICAgICAgICAgICAgaGFzaCA9IGxpbmUuc3BsaXQoJyAnKVstMV0ucnN0cmlwKCkKLSAgICAg
ICAgICAgICAgICBpZiBoYXNoICE9IHByZXZpb3VzWzBdLmhhc2g6CisgICAgICAgICAgICAgICAg
aWYgaGFzaCAhPSBwcmV2aW91c1stMV0uaGFzaDoKICAgICAgICAgICAgICAgICAgICAgaWRlbnRp
ZmllciAtPSAxCiAKICAgICAgICAgICAgICAgICBpZiBub3QgaWRlbnRpZmllcjoKQEAgLTcxNSwx
MiArNzE1LDEyIEBAIGNsYXNzIEdpdChTY20pOgogICAgICAgICAgICAgICAgICkKIAogICAgICAg
ICAgICAgICAgICMgRW5zdXJlIHRoYXQgd2UgZG9uJ3QgZHVwbGljYXRlIHRoZSBmaXJzdCBhbmQg
bGFzdCBjb21taXRzCi0gICAgICAgICAgICAgICAgaWYgY29tbWl0Lmhhc2ggPT0gcHJldmlvdXNb
MF0uaGFzaDoKLSAgICAgICAgICAgICAgICAgICAgcHJldmlvdXNbMF0gPSBjb21taXQKKyAgICAg
ICAgICAgICAgICBpZiBjb21taXQuaGFzaCA9PSBwcmV2aW91c1stMV0uaGFzaDoKKyAgICAgICAg
ICAgICAgICAgICAgcHJldmlvdXNbLTFdID0gY29tbWl0CiAKICAgICAgICAgICAgICAgICAjIElm
IHdlIHNoYXJlIGEgdGltZXN0YW1wIHdpdGggdGhlIHByZXZpb3VzIGNvbW1pdCwgdGhhdCBtZWFu
cyB0aGF0IHRoaXMgY29tbWl0IGhhcyBhbiBvcmRlcgogICAgICAgICAgICAgICAgICMgbGVzcyB0
aGFuIHRoZSBzZXQgb2YgY29tbWl0cyBjYWNoZWQgaW4gcHJldmlvdXMKLSAgICAgICAgICAgICAg
ICBlbGlmIGNvbW1pdC50aW1lc3RhbXAgPT0gcHJldmlvdXNbMF0udGltZXN0YW1wOgorICAgICAg
ICAgICAgICAgIGVsaWYgY29tbWl0LnRpbWVzdGFtcCA9PSBwcmV2aW91c1stMV0udGltZXN0YW1w
OgogICAgICAgICAgICAgICAgICAgICBmb3IgY2FjaGVkIGluIHByZXZpb3VzOgogICAgICAgICAg
ICAgICAgICAgICAgICAgY2FjaGVkLm9yZGVyICs9IDEKICAgICAgICAgICAgICAgICAgICAgcHJl
dmlvdXMuYXBwZW5kKGNvbW1pdCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVz
L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2Ny
aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3Qu
cHkKaW5kZXggOGZkNmI0MTYxZDkxNTU2MmQxM2NjMDBiMTQ0YTVlZTRmMmExNjQwMS4uNDQ4MGM5
MzY4MDM0MmJhMjZmZjFhYTUwZTI1MTVlZjQwMzNmZjk5MyAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny
aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3Qu
cHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv
dGVzdC9naXRfdW5pdHRlc3QucHkKQEAgLTYyOCw2ICs2MjgsMTUgQEAgY2xhc3MgVGVzdEdpdEh1
Yih0ZXN0aW5nLlRlc3RDYXNlKToKICAgICAgICAgICAgICAgICBnaXQuY29tbWl0KGhhc2g9Jzli
ODMxMWYyJyksCiAgICAgICAgICAgICBdKSwgQ29tbWl0LkVuY29kZXIoKS5kZWZhdWx0KGxpc3Qo
Z2l0LmNvbW1pdHMoYmVnaW49ZGljdChhcmd1bWVudD0nOWI4MzExZjInKSwgZW5kPWRpY3QoYXJn
dW1lbnQ9JzYyMTY1MmFkJykpKSkpCiAKKyAgICBkZWYgdGVzdF9jb21taXRzX2JyYW5jaF9yZWYo
c2VsZik6CisgICAgICAgIHNlbGYubWF4RGlmZiA9IE5vbmUKKyAgICAgICAgd2l0aCBtb2Nrcy5y
ZW1vdGUuR2l0SHViKCk6CisgICAgICAgICAgICBnaXQgPSByZW1vdGUuR2l0SHViKHNlbGYucmVt
b3RlKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKKyAgICAgICAgICAgICAgICBbJzIu
M0BicmFuY2gtYicsICcyLjJAYnJhbmNoLWInLCAnMi4xQGJyYW5jaC1iJ10sCisgICAgICAgICAg
ICAgICAgW3N0cihjb21taXQpIGZvciBjb21taXQgaW4gZ2l0LmNvbW1pdHMoYmVnaW49ZGljdChh
cmd1bWVudD0nYTMwY2U4NDknKSwgZW5kPWRpY3QoYXJndW1lbnQ9J2JyYW5jaC1iJykpXSwKKyAg
ICAgICAgICAgICkKKwogCiBjbGFzcyBUZXN0Qml0QnVja2V0KHRlc3RpbmcuVGVzdENhc2UpOgog
ICAgIHJlbW90ZSA9ICdodHRwczovL2JpdGJ1Y2tldC5leGFtcGxlLmNvbS9wcm9qZWN0cy9XRUJL
SVQvcmVwb3Mvd2Via2l0Jwo=
</data>

          </attachment>
      

    </bug>

</bugzilla>