<?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>218724</bug_id>
          
          <creation_ts>2020-11-09 14:03:35 -0800</creation_ts>
          <short_desc>[FlatPak] update-webkitgtk-libs fails after a clean build</short_desc>
          <delta_ts>2020-11-18 02:46:19 -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="Carlos Alberto Lopez Perez">clopez</reporter>
          <assigned_to name="Carlos Alberto Lopez Perez">clopez</assigned_to>
          <cc>aakash_jain</cc>
    
    <cc>bugs-noreply</cc>
    
    <cc>clopez</cc>
    
    <cc>dpino</cc>
    
    <cc>jbedard</cc>
    
    <cc>lmoura</cc>
    
    <cc>pnormand</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1705877</commentid>
    <comment_count>0</comment_count>
    <who name="Carlos Alberto Lopez Perez">clopez</who>
    <bug_when>2020-11-09 14:03:35 -0800</bug_when>
    <thetext>Running update-webkitgtk-libs for the first time (after a clean build) fails with this:

Flatpak package org.webkit.Platform/x86_64/0.3 not installed. Please update your SDK: Tools/Scripts/update-webkit-flatpak
Traceback (most recent call last):
  File &quot;Tools/Scripts/update-webkit-flatpak&quot;, line 28, in &lt;module&gt;
    sys.exit(WebkitFlatpak.load_from_args([&quot;--update&quot;] + sys.argv[1:]).run())
  File &quot;./Tools/flatpak/flatpakutils.py&quot;, line 901, in run
    return self.main()
  File &quot;./Tools/flatpak/flatpakutils.py&quot;, line 893, in main
    toolchains = self.pack_toolchain((&quot;gcc&quot;, &quot;g++&quot;), {&quot;/usr/bin/c++&quot;: &quot;/usr/bin/g++&quot;})
  File &quot;./Tools/flatpak/flatpakutils.py&quot;, line 941, in pack_toolchain
    icc_version_filename, = re.findall(br&apos;.*creating (.*)&apos;, tmpfile.read())
ValueError: need more than 0 values to unpack
Died at Tools/Scripts/update-webkitgtk-libs line 28.



However, if you re-run the same command twice then it works fine.
But the toolchains are not generated. You have to manually re-generate them via the script webkit-flatpak</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1705893</commentid>
    <comment_count>1</comment_count>
      <attachid>413635</attachid>
    <who name="Carlos Alberto Lopez Perez">clopez</who>
    <bug_when>2020-11-09 14:34:46 -0800</bug_when>
    <thetext>Created attachment 413635
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1706349</commentid>
    <comment_count>2</comment_count>
    <who name="Lauro Moura">lmoura</who>
    <bug_when>2020-11-10 21:38:59 -0800</bug_when>
    <thetext>(In reply to Carlos Alberto Lopez Perez from comment #1)
&gt; Created attachment 413635 [details]
&gt; Patch

Just tested it, indeed the error is gone when initializing an empty local repo.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1707728</commentid>
    <comment_count>3</comment_count>
      <attachid>413635</attachid>
    <who name="Philippe Normand">pnormand</who>
    <bug_when>2020-11-16 01:59:34 -0800</bug_when>
    <thetext>Comment on attachment 413635
Patch

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

&gt; Tools/flatpak/flatpakutils.py:948
&gt; +                        if os.path.isfile(config[&apos;icecc_version&apos;][compiler]):

This function is called outside of the flatpak sandbox, IIUC, but checks paths inside it, so it might fail if the host gcc or clang paths are different.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1708294</commentid>
    <comment_count>4</comment_count>
    <who name="Carlos Alberto Lopez Perez">clopez</who>
    <bug_when>2020-11-17 10:55:35 -0800</bug_when>
    <thetext>(In reply to Philippe Normand from comment #3)
&gt; Comment on attachment 413635 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=413635&amp;action=review
&gt; 
&gt; &gt; Tools/flatpak/flatpakutils.py:948
&gt; &gt; +                        if os.path.isfile(config[&apos;icecc_version&apos;][compiler]):
&gt; 
&gt; This function is called outside of the flatpak sandbox, IIUC, but checks
&gt; paths inside it, so it might fail if the host gcc or clang paths are
&gt; different.

The paths it checks are the compiler toolchains that are stored under the build directory. For example in my system I have:

$ cat WebKitBuild/UserFlatpak/webkit_flatpak_config.json 
{&quot;icecc_version&quot;: {&quot;gcc&quot;: &quot;/home/clopez/webkit/WebKitBuild/Toolchains/webkit-sdk-gcc-50ae74637e7fa7354ee261bb26005238.tar.gz&quot;, &quot;clang&quot;: &quot;/home/clopez/webkit/WebKitBuild/Toolchains/webkit-sdk-clang-7db6a9f1a6756ad6906bac8bcc51fffc.tar.gz&quot;}}

AFAIK any path inside the build directory should be valid either inside or outside of the flatpak sandbox.

Is there any use case where my assumption would be wrong?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1708528</commentid>
    <comment_count>5</comment_count>
    <who name="Philippe Normand">pnormand</who>
    <bug_when>2020-11-18 01:20:55 -0800</bug_when>
    <thetext>Right, I forgot the paths there correspond to the host.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1708545</commentid>
    <comment_count>6</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-11-18 02:45:02 -0800</bug_when>
    <thetext>Committed r269949: &lt;https://trac.webkit.org/changeset/269949&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 413635.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1708546</commentid>
    <comment_count>7</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-11-18 02:46:19 -0800</bug_when>
    <thetext>&lt;rdar://problem/71531183&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>413635</attachid>
            <date>2020-11-09 14:34:46 -0800</date>
            <delta_ts>2020-11-18 02:45:03 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-218724-20201109233445.patch</filename>
            <type>text/plain</type>
            <size>7811</size>
            <attacher name="Carlos Alberto Lopez Perez">clopez</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NjAzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjc1N2M5NDU0MGJhOGU1OTFlYjlkNWJiMWU4Nzg1NWY3
OWJjNzA5OC4uZGUwYTYyNTNhOGQ2ZWQ4Y2ZmZTE3ZTZlN2ZmYWZiZDVmN2E1NjMzNyAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMz
IEBACisyMDIwLTExLTA5ICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs
aWEuY29tPgorCisgICAgICAgIFtGbGF0UGFrXSB1cGRhdGUtd2Via2l0Z3RrLWxpYnMgZmFpbHMg
YWZ0ZXIgYSBjbGVhbiBidWlsZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MjE4NzI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgVGhlIGlzc3VlIHdhcyBjYXVzZWQgYmVjYXVzZSB3aGVuIGFkZGluZyBhIG5l
dyBmbGF0cGFrIHJlcG9zaXRvcnkKKyAgICAgICAgdmlhIHRoZSBtZXRob2QgRmxhdHBha1JlcG9z
LmFkZCgpIHRoYXQgcmVwb3NpdG9yeSBpcyBub3QgYWRkZWQgdG8KKyAgICAgICAgdGhlIGludGVy
bmFsIGxpc3Qgb2YgYXZhaWxhYmxlIHJlcG9zaXRvcmllcyBpbnNpZGUgdGhlIG9iamVjdCBGbGF0
cGFrUmVwb3MuCisgICAgICAgIFNvIHRoZW4gdGhlIGNoZWNrIG9uIHNldHVwX2J1aWxkZGlyKCkg
YWRkZWQgaW4gcjI2ODU0MiBmYWlsZWQgYmVjYXVzZQorICAgICAgICB0aGUgaW50ZXJuYWwgbGlz
dCBvZiByZXBvc2l0b3JpZXMgb24gdGhlIG9iamVjdCBGbGF0cGFrUmVwb3MoKSB3YXMKKyAgICAg
ICAgZW1wdHkgb24gdGhlIGZpcnN0IHJ1biAoYWZ0ZXIgYSBjbGVhbiBidWlsZCkuCisgICAgICAg
IFRvIGZpeCB0aGlzIHdlIGVuc3VyZSB0byByZS1nZW5lcmF0ZSB0aGUgaW50ZXJuYWwgbGlzdCBv
ZiBmbGF0cGFrCisgICAgICAgIHJlcG9zaXRvcmllcyBhbnkgdGltZSB0aGF0IGEgbmV3IHJlcG9y
aXN0b3J5IGlzIGFkZGVkIGJ5IGNhbGxpbmcKKyAgICAgICAgRmxhdHBha1JlcG9zLnVwZGF0ZSgp
IGFmdGVyIEZsYXRwYWtSZXBvcy5hZGQoKQorCisgICAgICAgIE9uIHRvcCBvZiB0aGF0IGZpeCwg
d2UgYWRkIGFub3RoZXIgZml4IHRvIG1ha2UgdGhlIGNvZGUgbW9yZSByb2J1c3QuCisgICAgICAg
IE5vdyBpdCBhbGxvd3MgdGhlIGdlbmVyYXRpb24gb2YgdG9vbGNoYWlucyB0byBmYWlsIHdpdGhv
dXQgY2F1c2luZworICAgICAgICBhIGZhdGFsIGVycm9yLiBBbHNvIGEgbmV3IGNoZWNrIGlzIGFk
ZGVkIGluIG9yZGVyIHRvIHJldHJ5IHRvIGdlbmVyYXRlCisgICAgICAgIHRoZSB0b29sY2hhaW5z
IGluIHRoZSBuZXh0IHJ1biBpZiBpcyBkZXRlY3RlZCB0aGF0IHRoZXkgd2VyZSBub3QKKyAgICAg
ICAgY29ycmVjdGx5IGdlbmVyYXRlZC4KKworICAgICAgICAqIGZsYXRwYWsvZmxhdHBha3V0aWxz
LnB5OgorICAgICAgICAoRmxhdHBha1JlcG9zLmFkZCk6CisgICAgICAgIChXZWJraXRGbGF0cGFr
LmxvYWRfZnJvbV9hcmdzKToKKyAgICAgICAgKFdlYmtpdEZsYXRwYWsubWFpbik6CisgICAgICAg
IChXZWJraXRGbGF0cGFrLmNoZWNrX3Rvb2xjaGFpbnNfZ2VuZXJhdGVkKToKKyAgICAgICAgKFdl
YmtpdEZsYXRwYWsucGFja190b29sY2hhaW4pOgorCiAyMDIwLTExLTA5ICBaYWxhbiBCdWp0YXMg
IDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgU2hvdyBsZWdhY3kgbGluZSBsYXlvdXQgdmlz
dWFsIGNvdmVyYWdlIGluc3RlYWQgb2YgInNpbXBsZSBsaW5lIiBsYXlvdXQuCmRpZmYgLS1naXQg
YS9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weSBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0
aWxzLnB5CmluZGV4IDRlYzZiZWZkODI3YTVmY2EyOTdlZmZiYmYxYzk4MjVhNTIyZjcwZTYuLjFi
N2I3OWY5YTk5ZWNmMWY5ZmI0ZTE3ZWYxM2M2MGRkZjg5OTU5MjQgMTAwNjQ0Ci0tLSBhL1Rvb2xz
L2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5CisrKyBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxz
LnB5CkBAIC0yNjMsMzEgKzI2MywzNCBAQCBjbGFzcyBGbGF0cGFrUmVwb3MoRmxhdHBha09iamVj
dCk6CiAgICAgICAgIHNlbGYucGFja2FnZXMgPSBGbGF0cGFrUGFja2FnZXMoc2VsZikKIAogICAg
IGRlZiBhZGQoc2VsZiwgcmVwbywgb3ZlcnJpZGU9VHJ1ZSk6Ci0gICAgICAgIHNhbWVfbmFtZSA9
IE5vbmUKLSAgICAgICAgZm9yIG5hbWUsIHRtcHJlcG8gaW4gc2VsZi5yZXBvcy5pdGVtcygpOgot
ICAgICAgICAgICAgaWYgcmVwby51cmwgPT0gdG1wcmVwby51cmw6Ci0gICAgICAgICAgICAgICAg
cmV0dXJuIHRtcHJlcG8KLSAgICAgICAgICAgIGVsaWYgcmVwby5uYW1lID09IG5hbWU6Ci0gICAg
ICAgICAgICAgICAgc2FtZV9uYW1lID0gdG1wcmVwbwotCi0gICAgICAgIGlmIHNhbWVfbmFtZToK
LSAgICAgICAgICAgIGlmIG92ZXJyaWRlOgotICAgICAgICAgICAgICAgIHNlbGYuZmxhdHBhaygi
cmVtb3RlLW1vZGlmeSIsIHJlcG8ubmFtZSwgIi0tdXJsPSIgKyByZXBvLnVybCkKLSAgICAgICAg
ICAgICAgICBzYW1lX25hbWUudXJsID0gcmVwby51cmwKLQotICAgICAgICAgICAgICAgIHJldHVy
biBzYW1lX25hbWUKLSAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgcmV0dXJuIE5v
bmUKLSAgICAgICAgZWxzZToKLSAgICAgICAgICAgIGFyZ3MgPSBbInJlbW90ZS1hZGQiLCByZXBv
Lm5hbWUsICItLWlmLW5vdC1leGlzdHMiXQotICAgICAgICAgICAgaWYgcmVwby5yZXBvX2ZpbGU6
Ci0gICAgICAgICAgICAgICAgYXJncy5leHRlbmQoWyItLWZyb20iLCByZXBvLnJlcG9fZmlsZS5u
YW1lXSkKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgc2FtZV9uYW1lID0gTm9uZQorICAgICAg
ICAgICAgZm9yIG5hbWUsIHRtcHJlcG8gaW4gc2VsZi5yZXBvcy5pdGVtcygpOgorICAgICAgICAg
ICAgICAgIGlmIHJlcG8udXJsID09IHRtcHJlcG8udXJsOgorICAgICAgICAgICAgICAgICAgICBy
ZXR1cm4gdG1wcmVwbworICAgICAgICAgICAgICAgIGVsaWYgcmVwby5uYW1lID09IG5hbWU6Cisg
ICAgICAgICAgICAgICAgICAgIHNhbWVfbmFtZSA9IHRtcHJlcG8KKworICAgICAgICAgICAgaWYg
c2FtZV9uYW1lOgorICAgICAgICAgICAgICAgIGlmIG92ZXJyaWRlOgorICAgICAgICAgICAgICAg
ICAgICBzZWxmLmZsYXRwYWsoInJlbW90ZS1tb2RpZnkiLCByZXBvLm5hbWUsICItLXVybD0iICsg
cmVwby51cmwpCisgICAgICAgICAgICAgICAgICAgIHNhbWVfbmFtZS51cmwgPSByZXBvLnVybAor
CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBzYW1lX25hbWUKKyAgICAgICAgICAgICAgICBl
bHNlOgorICAgICAgICAgICAgICAgICAgICByZXR1cm4gTm9uZQogICAgICAgICAgICAgZWxzZToK
LSAgICAgICAgICAgICAgICBhcmdzLmV4dGVuZChbIi0tbm8tZ3BnLXZlcmlmeSIsIHJlcG8udXJs
XSkKLSAgICAgICAgICAgIHNlbGYuZmxhdHBhaygqYXJncywgY29tbWVudD0iQWRkaW5nIHJlcG8g
JXMiICUgcmVwby5uYW1lKQorICAgICAgICAgICAgICAgIGFyZ3MgPSBbInJlbW90ZS1hZGQiLCBy
ZXBvLm5hbWUsICItLWlmLW5vdC1leGlzdHMiXQorICAgICAgICAgICAgICAgIGlmIHJlcG8ucmVw
b19maWxlOgorICAgICAgICAgICAgICAgICAgICBhcmdzLmV4dGVuZChbIi0tZnJvbSIsIHJlcG8u
cmVwb19maWxlLm5hbWVdKQorICAgICAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAg
ICAgIGFyZ3MuZXh0ZW5kKFsiLS1uby1ncGctdmVyaWZ5IiwgcmVwby51cmxdKQorICAgICAgICAg
ICAgICAgIHNlbGYuZmxhdHBhaygqYXJncywgY29tbWVudD0iQWRkaW5nIHJlcG8gJXMiICUgcmVw
by5uYW1lKQogCi0gICAgICAgIHJlcG8ucmVwb3MgPSBzZWxmCi0gICAgICAgIHJldHVybiByZXBv
CisgICAgICAgICAgICByZXBvLnJlcG9zID0gc2VsZgorICAgICAgICAgICAgcmV0dXJuIHJlcG8K
KyAgICAgICAgZmluYWxseToKKyAgICAgICAgICAgIHNlbGYudXBkYXRlKCkKIAogCiBjbGFzcyBG
bGF0cGFrUmVwbyhGbGF0cGFrT2JqZWN0KToKQEAgLTQ0MSw3ICs0NDQsNyBAQCBjbGFzcyBXZWJr
aXRGbGF0cGFrOgogICAgICAgICBkaXN0cmlidXRlZF9idWlsZF9vcHRpb25zID0gcGFyc2VyLmFk
ZF9hcmd1bWVudF9ncm91cCgiRGlzdHJpYnV0ZWQgYnVpbGRpbmciKQogICAgICAgICBkaXN0cmli
dXRlZF9idWlsZF9vcHRpb25zLmFkZF9hcmd1bWVudCgiLS11c2UtaWNlY3JlYW0iLCBkZXN0PSJ1
c2VfaWNlY3JlYW0iLCBoZWxwPSJVc2UgdGhlIGRpc3RyaWJ1dGVkIGljZWNyZWFtIChpY2VjYykg
Y29tcGlsZXIuIiwgYWN0aW9uPSJzdG9yZV90cnVlIikKICAgICAgICAgZGlzdHJpYnV0ZWRfYnVp
bGRfb3B0aW9ucy5hZGRfYXJndW1lbnQoIi1yIiwgIi0tcmVnZW5lcmF0ZS10b29sY2hhaW5zIiwg
ZGVzdD0icmVnZW5lcmF0ZV90b29sY2hhaW5zIiwgYWN0aW9uPSJzdG9yZV90cnVlIiwKLSAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgaGVscD0iUmVnZW5lcmF0ZSBJY2VDQyBkaXN0cmlidWFi
bGUgdG9vbGNoYWluIGFyY2hpdmVzIikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgaGVscD0iUmVnZW5lcmF0ZSBJY2VDQyBkaXN0cmlidXRhYmxlIHRvb2xj
aGFpbiBhcmNoaXZlcyIpCiAgICAgICAgIGRpc3RyaWJ1dGVkX2J1aWxkX29wdGlvbnMuYWRkX2Fy
Z3VtZW50KCItdCIsICItLXNjY2FjaGUtdG9rZW4iLCBkZXN0PSJzY2NhY2hlX3Rva2VuIiwKICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGVscD0ic2NjYWNo
ZSBhdXRoZW50aWNhdGlvbiB0b2tlbiIpCiAgICAgICAgIGRpc3RyaWJ1dGVkX2J1aWxkX29wdGlv
bnMuYWRkX2FyZ3VtZW50KCItcyIsICItLXNjY2FjaGUtc2NoZWR1bGVyIiwgZGVzdD0ic2NjYWNo
ZV9zY2hlZHVsZXIiLApAQCAtODcxLDcgKzg3NCw3IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAg
ICAgICAgICAgICByZXBvID0gc2VsZi5zZGtfcmVwbwogICAgICAgICAgICAgdmVyc2lvbl9iZWZv
cmVfdXBkYXRlID0gcmVwby52ZXJzaW9uKCJvcmcud2Via2l0LlNkayIpCiAgICAgICAgICAgICBy
ZXBvLmZsYXRwYWsoInVwZGF0ZSIsIGNvbW1lbnQ9IlVwZGF0aW5nIEZsYXRwYWsgJXMgZW52aXJv
bm1lbnQiICUgc2VsZi5idWlsZF90eXBlKQotICAgICAgICAgICAgcmVnZW5lcmF0ZV90b29sY2hh
aW5zID0gcmVwby52ZXJzaW9uKCJvcmcud2Via2l0LlNkayIpICE9IHZlcnNpb25fYmVmb3JlX3Vw
ZGF0ZQorICAgICAgICAgICAgcmVnZW5lcmF0ZV90b29sY2hhaW5zID0gKHJlcG8udmVyc2lvbigi
b3JnLndlYmtpdC5TZGsiKSAhPSB2ZXJzaW9uX2JlZm9yZV91cGRhdGUpIG9yIG5vdCBzZWxmLmNo
ZWNrX3Rvb2xjaGFpbnNfZ2VuZXJhdGVkKCkKIAogICAgICAgICAgICAgZm9yIHBhY2thZ2UgaW4g
c2VsZi5fZ2V0X3BhY2thZ2VzKCk6CiAgICAgICAgICAgICAgICAgaWYgcGFja2FnZS5uYW1lLnN0
YXJ0c3dpdGgoIm9yZy53ZWJraXQiKSBhbmQgcmVwby5pc19hcHBfaW5zdGFsbGVkKHBhY2thZ2Uu
bmFtZSkgXApAQCAtODg5LDEwICs4OTIsMTQgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKIAogICAg
ICAgICByZXN1bHQgPSBzZWxmLnNldHVwX2Rldl9lbnYoKQogICAgICAgICBpZiByZWdlbmVyYXRl
X3Rvb2xjaGFpbnM6CisgICAgICAgICAgICBDb25zb2xlLm1lc3NhZ2UoIlVwZGF0aW5nIGljZWNj
IGRpc3RyaWJ1dGFibGUgdG9vbGNoYWluIGFyY2hpdmVzIikKICAgICAgICAgICAgIHNlbGYuaWNj
X3ZlcnNpb24gPSB7fQogICAgICAgICAgICAgdG9vbGNoYWlucyA9IHNlbGYucGFja190b29sY2hh
aW4oKCJnY2MiLCAiZysrIiksIHsiL3Vzci9iaW4vYysrIjogIi91c3IvYmluL2crKyJ9KQogICAg
ICAgICAgICAgdG9vbGNoYWlucy5leHRlbmQoc2VsZi5wYWNrX3Rvb2xjaGFpbigoImNsYW5nIiwg
ImNsYW5nKysiKSwgeyIvdXNyL2Jpbi9jbGFuZysrIjogIi91c3IvYmluL2NsYW5nKysifSkpCi0g
ICAgICAgICAgICBzZWxmLnNhdmVfY29uZmlnKHRvb2xjaGFpbnMpCisgICAgICAgICAgICBpZiBs
ZW4odG9vbGNoYWlucykgPiAxOgorICAgICAgICAgICAgICAgIHNlbGYuc2F2ZV9jb25maWcodG9v
bGNoYWlucykKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgQ29uc29sZS5lcnJv
cl9tZXNzYWdlKCJFcnJvciBnZW5lcmF0aW5nIGljZWNjIGRpc3RyaWJ1dGFibGUgdG9vbGNoYWlu
IGFyY2hpdmVzIikKIAogICAgICAgICByZXR1cm4gcmVzdWx0CiAKQEAgLTkzMSwxMSArOTM4LDI1
IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAgICB0b21sLmR1bXAoc2NjYWNoZV9j
b25maWcsIGNvbmZpZykKICAgICAgICAgICAgIENvbnNvbGUubWVzc2FnZSgiQ3JlYXRlZCAlcyBz
Y2NhY2hlIGNvbmZpZyBmaWxlLiBJdCB3aWxsIGF1dG9tYXRpY2FsbHkgYmUgdXNlZCB3aGVuIGJ1
aWxkaW5nIFdlYktpdCIsIHNlbGYuc2NjYWNoZV9jb25maWdfZmlsZSkKIAorICAgIGRlZiBjaGVj
a190b29sY2hhaW5zX2dlbmVyYXRlZChzZWxmKToKKyAgICAgICAgZm91bmRfdG9vbGNoYWlucyA9
IDAKKyAgICAgICAgaWYgb3MucGF0aC5pc2ZpbGUoc2VsZi5jb25maWdfZmlsZSk6CisgICAgICAg
ICAgICB3aXRoIG9wZW4oc2VsZi5jb25maWdfZmlsZSwgJ3InKSBhcyBjb25maWdfZmQ6CisgICAg
ICAgICAgICAgICAgY29uZmlnID0ganNvbi5sb2FkKGNvbmZpZ19mZCkKKyAgICAgICAgICAgICAg
ICBpZiAnaWNlY2NfdmVyc2lvbicgaW4gY29uZmlnOgorICAgICAgICAgICAgICAgICAgICBmb3Ig
Y29tcGlsZXIgaW4gY29uZmlnWydpY2VjY192ZXJzaW9uJ106CisgICAgICAgICAgICAgICAgICAg
ICAgICBpZiBvcy5wYXRoLmlzZmlsZShjb25maWdbJ2ljZWNjX3ZlcnNpb24nXVtjb21waWxlcl0p
OgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZvdW5kX3Rvb2xjaGFpbnMgKz0gMQorICAg
ICAgICByZXR1cm4gZm91bmRfdG9vbGNoYWlucyA+IDEKKwogICAgIGRlZiBwYWNrX3Rvb2xjaGFp
bihzZWxmLCBjb21waWxlcnMsIHBhdGhfbWFwcGluZyk6CiAgICAgICAgIHdpdGggdGVtcGZpbGUu
TmFtZWRUZW1wb3JhcnlGaWxlKCkgYXMgdG1wZmlsZToKICAgICAgICAgICAgIGNvbW1hbmQgPSBb
J2ljZWNjJywgJy0tYnVpbGQtbmF0aXZlJ10KICAgICAgICAgICAgIGNvbW1hbmQuZXh0ZW5kKFsi
L3Vzci9iaW4vJXMiICUgY29tcGlsZXIgZm9yIGNvbXBpbGVyIGluIGNvbXBpbGVyc10pCi0gICAg
ICAgICAgICBzZWxmLnJ1bl9pbl9zYW5kYm94KCpjb21tYW5kLCBzdGRvdXQ9dG1wZmlsZSwgY3dk
PXNlbGYuc291cmNlX3Jvb3QsIHNraXBfaWNjPVRydWUpCisgICAgICAgICAgICByZXRjb2RlID0g
c2VsZi5ydW5faW5fc2FuZGJveCgqY29tbWFuZCwgc3Rkb3V0PXRtcGZpbGUsIGN3ZD1zZWxmLnNv
dXJjZV9yb290LCBza2lwX2ljYz1UcnVlKQorICAgICAgICAgICAgaWYgcmV0Y29kZSAhPSAwOgor
ICAgICAgICAgICAgICAgIENvbnNvbGUuZXJyb3JfbWVzc2FnZSgnRmxhdHBhayBjb21tYW5kICIl
cyIgZmFpbGVkIHdpdGggcmV0dXJuIGNvZGUgJXMnLCAiICIuam9pbihjb21tYW5kKSwgcmV0Y29k
ZSkKKyAgICAgICAgICAgICAgICByZXR1cm4gW10KICAgICAgICAgICAgIHRtcGZpbGUuZmx1c2go
KQogICAgICAgICAgICAgdG1wZmlsZS5zZWVrKDApCiAgICAgICAgICAgICBpY2NfdmVyc2lvbl9m
aWxlbmFtZSwgPSByZS5maW5kYWxsKGJyJy4qY3JlYXRpbmcgKC4qKScsIHRtcGZpbGUucmVhZCgp
KQo=
</data>

          </attachment>
      

    </bug>

</bugzilla>