209850 2020-04-01 02:55:12 -0700 [Flatpak SDK] Migration to version 0.2 2020-04-01 06:28:13 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pnormand pnormand changseok clopez webkit-bug-importer oldest_to_newest 1636437 0 pnormand 2020-04-01 02:55:12 -0700 . 1636440 1 395154 pnormand 2020-04-01 03:03:26 -0700 Created attachment 395154 Patch 1636446 2 pnormand 2020-04-01 03:38:46 -0700 $ webkit-flatpak --command=bash [📦 org.webkit.Webkit WebKit]$ rr --version rr version 5.3.0 [📦 org.webkit.Webkit WebKit]$ pkg-config --cflags --libs manette-0.2 -I/usr/include/libmanette -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -lmanette-0.2 -lglib-2.0 [📦 org.webkit.Webkit WebKit]$ pkg-config --cflags --libs openxr -lopenxr_loader -lpthread [📦 org.webkit.Webkit WebKit]$ 1636447 3 395154 clopez 2020-04-01 04:07:29 -0700 Comment on attachment 395154 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395154&action=review > Tools/flatpak/flatpakutils.py:103 > + @classmethod > + def colored_message(cls, color, str_format, *args): > + if args: > + msg = str_format % args > + else: > + msg = str_format > + > + cls.message("\n%s%s%s", color, msg, Colors.ENDC) > + > + @classmethod > + def error_message(cls, str_format, *args): > + cls.colored_message(Colors.FAIL, str_format, *args) > + > + @classmethod > + def warning_message(cls, str_format, *args): > + cls.colored_message(Colors.WARNING, str_format, *args) Our bots run with environment variable TERM=dumb to disable colored output, since this ANSI colors looks bad on a text log. Can you check if the terminal supports colors and only output ANSI color characters in that case? Here is a suggested code for that: http://sprunge.us/wSNHtz And a test: $ wget http://sprunge.us/wSNHtz $ python wSNHtz True $ TERM=dumb python wSNHtz False 1636451 4 pnormand 2020-04-01 05:11:59 -0700 Good point Carlos, I'll add code to check the TERM env var. Thanks for the review! 1636458 5 pnormand 2020-04-01 06:15:31 -0700 (In reply to Philippe Normand from comment #4) > Good point Carlos, I'll add code to check the TERM env var. Thanks for the > review! I mean, the code you mentioned :) 1636461 6 pnormand 2020-04-01 06:28:01 -0700 Committed r259341: <https://trac.webkit.org/changeset/259341> 1636462 7 webkit-bug-importer 2020-04-01 06:28:13 -0700 <rdar://problem/61154885> 395154 2020-04-01 03:03:26 -0700 2020-04-01 04:07:29 -0700 Patch bug-209850-20200401110324.patch text/plain 13915 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MzM4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzlhMWU2MDRkZTRlNzM2YzUyZWM1ZjQ1OTliMDY4NzYx NTU4ZDhhOC4uODFkYmYwYWQ0ZGYxN2UwMTczZDU3ZDUzMDY5ODE5NzUwOTY3Nzk0NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQx IEBACisyMDIwLTA0LTAxICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIE1pZ3JhdGlvbiB0byB2ZXJzaW9uIDAuMgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5ODUwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVmVyc2lvbiAwLjIgb2Yg dGhlIFNESyBpcyBub3cgYnVpbHQgd2l0aCBCdWlsZHN0cmVhbSBpbnN0ZWFkIG9mCisgICAgICAg IGZsYXRwYWstYnVpbGRlci4gV2l0aCB0aGlzIG5ldyB2ZXJzaW9uIGl0IHdpbGwgYmUgZWFzaWVy IHRvIGFkZAorICAgICAgICBuZXcgZGVwZW5kZW5jaWVzIGFuZCBoYWNrIG9uIGRlcGVuZGVuY2ll cyBzaGlwcGVkIGJ5IHRoZSBTREsuCisKKyAgICAgICAgU2FkbHkgSSBoYXZlbid0IGZvdW5kIGEg bmljZSB3YXkgdG8gdXBncmFkZSBzbW9vdGhseSB3aXRob3V0CisgICAgICAgIHJlbW92aW5nIHRo ZSBVc2VyRmxhdHBhayBkaXJlY3RvcnkuIEluIHRoZW9yeSB0aGlzIHNob3VsZG4ndCBiZQorICAg ICAgICBuZWVkZWQgYnV0IHRoZW4gb2xkIFNESyBicmFuY2hlcyB3b3VsZCBhY2N1bXVsYXRlIHRo ZXJlLCB3YXN0aW5nCisgICAgICAgIGRpc2stc3BhY2UuCisKKyAgICAgICAgKiBmbGF0cGFrL2Zs YXRwYWt1dGlscy5weToKKyAgICAgICAgKENvbnNvbGUpOgorICAgICAgICAoQ29uc29sZS5jb2xv cmVkX21lc3NhZ2UpOgorICAgICAgICAoQ29uc29sZS5lcnJvcl9tZXNzYWdlKToKKyAgICAgICAg KENvbnNvbGUud2FybmluZ19tZXNzYWdlKToKKyAgICAgICAgKGNoZWNrX2ZsYXRwYWspOgorICAg ICAgICAoRmxhdHBha09iamVjdC5mbGF0cGFrKToKKyAgICAgICAgKEZsYXRwYWtSZXBvLl9faW5p dF9fKToKKyAgICAgICAgKEZsYXRwYWtSZXBvKToKKyAgICAgICAgKEZsYXRwYWtSZXBvLmlzX2Fw cF9pbnN0YWxsZWQpOgorICAgICAgICAoRmxhdHBha1BhY2thZ2UuX19pbml0X18pOgorICAgICAg ICAoRmxhdHBha1BhY2thZ2UuaW5zdGFsbCk6CisgICAgICAgIChGbGF0cGFrUGFja2FnZS51cGRh dGUpOgorICAgICAgICAoV2Via2l0RmxhdHBhay5fX2luaXRfXyk6CisgICAgICAgIChXZWJraXRG bGF0cGFrLmNsZWFuX2FyZ3MpOgorICAgICAgICAoV2Via2l0RmxhdHBhay5fcmVzZXRfcmVwb3Np dG9yeSk6CisgICAgICAgIChXZWJraXRGbGF0cGFrLnNldHVwX2dzdGJ1aWxkKToKKyAgICAgICAg KFdlYmtpdEZsYXRwYWsubWFpbik6CisgICAgICAgIChXZWJraXRGbGF0cGFrLnJ1bik6CisgICAg ICAgIChXZWJraXRGbGF0cGFrLnNldHVwX2Rldl9lbnYpOgorICAgICAgICAoV2Via2l0RmxhdHBh ay5fZ2V0X3BhY2thZ2VzKToKKwogMjAyMC0wMy0zMSAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVf Y2hlbmV5QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXF1ZXN0cyBmb3IgbWVzc2FnZUhhbmRsZXJz KCkgaW4gdGhlIERPTVdpbmRvdyBzaG91bGQgYmUgaWdub3JlZCBmb3Igbm9uLWFwcC1ib3VuZCBu YXZpZ2F0aW9ucwpkaWZmIC0tZ2l0IGEvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkgYi9U b29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weQppbmRleCA4NmNmMTg1ZDQxODdjNGRiOGFhYzQz MDcxOGY4ODRhN2IyZTAzYTFiLi4yNmU2YmJlNzc0OTFkOWE1YmM0M2ZlNjM1YTI4MWQ3MDc2NDc2 NGQwIDEwMDY0NAotLS0gYS9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weQorKysgYi9Ub29s cy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weQpAQCAtODUsNiArODUsMjIgQEAgY2xhc3MgQ29uc29s ZToKICAgICAgICAgIyBhcyB3ZSB1c2UgbWFueSBzdWJwcm9jZXNzZXMuCiAgICAgICAgIHN5cy5z dGRvdXQuZmx1c2goKQogCisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIGNvbG9yZWRfbWVzc2Fn ZShjbHMsIGNvbG9yLCBzdHJfZm9ybWF0LCAqYXJncyk6CisgICAgICAgIGlmIGFyZ3M6CisgICAg ICAgICAgICBtc2cgPSBzdHJfZm9ybWF0ICUgYXJncworICAgICAgICBlbHNlOgorICAgICAgICAg ICAgbXNnID0gc3RyX2Zvcm1hdAorCisgICAgICAgIGNscy5tZXNzYWdlKCJcbiVzJXMlcyIsIGNv bG9yLCBtc2csIENvbG9ycy5FTkRDKQorCisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIGVycm9y X21lc3NhZ2UoY2xzLCBzdHJfZm9ybWF0LCAqYXJncyk6CisgICAgICAgIGNscy5jb2xvcmVkX21l c3NhZ2UoQ29sb3JzLkZBSUwsIHN0cl9mb3JtYXQsICphcmdzKQorCisgICAgQGNsYXNzbWV0aG9k CisgICAgZGVmIHdhcm5pbmdfbWVzc2FnZShjbHMsIHN0cl9mb3JtYXQsICphcmdzKToKKyAgICAg ICAgY2xzLmNvbG9yZWRfbWVzc2FnZShDb2xvcnMuV0FSTklORywgc3RyX2Zvcm1hdCwgKmFyZ3Mp CiAKIGRlZiBjaGVja19mbGF0cGFrKHZlcmJvc2U9VHJ1ZSk6CiAgICAgIyBGbGF0cGFrIGlzIG9u bHkgc3VwcG9ydGVkIG9uIExpbnV4LgpAQCAtOTYsMTIgKzExMiwxMiBAQCBkZWYgY2hlY2tfZmxh dHBhayh2ZXJib3NlPVRydWUpOgogICAgICAgICAgICAgb3V0cHV0ID0gc3VicHJvY2Vzcy5jaGVj a19vdXRwdXQoW2FwcCwgIi0tdmVyc2lvbiJdKQogICAgICAgICBleGNlcHQgKHN1YnByb2Nlc3Mu Q2FsbGVkUHJvY2Vzc0Vycm9yLCBPU0Vycm9yKToKICAgICAgICAgICAgIGlmIHZlcmJvc2U6Ci0g ICAgICAgICAgICAgICAgQ29uc29sZS5tZXNzYWdlKCJcbiVzWW91IG5lZWQgdG8gaW5zdGFsbCAl cyA+PSAlcyIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiB0byBiZSBhYmxlIHRv IHVzZSB0aGUgJyVzJyBzY3JpcHQuXG5cbiIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIllvdSBjYW4gZmluZCBzb21lIGluZm9ybWF0aW9ucyBhYm91dCIKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIiBob3cgdG8gaW5zdGFsbCBpdCBmb3IgeW91ciBkaXN0cmlidXRp b24gYXQ6XG4iCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIgICAgKiBodHRwOi8v ZmxhdHBhay5vcmcvJXNcbiIsIENvbG9ycy5GQUlMLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBhcHAsIHJlcXVpcmVkX3ZlcnNpb24sIHN5cy5hcmd2WzBdLCBDb2xvcnMuRU5EQykK KyAgICAgICAgICAgICAgICBDb25zb2xlLmVycm9yX21lc3NhZ2UoIllvdSBuZWVkIHRvIGluc3Rh bGwgJXMgPj0gJXMiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIgdG8g YmUgYWJsZSB0byB1c2UgdGhlICclcycgc2NyaXB0LlxuXG4iCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICJZb3UgY2FuIGZpbmQgc29tZSBpbmZvcm1hdGlvbnMgYWJvdXQi CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIgaG93IHRvIGluc3RhbGwg aXQgZm9yIHlvdXIgZGlzdHJpYnV0aW9uIGF0OlxuIgorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAiICAgICogaHR0cDovL2ZsYXRwYWsub3JnLyVzXG4iLCBhcHAsIHJlcXVp cmVkX3ZlcnNpb24sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN5cy5h cmd2WzBdKQogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCiAKICAgICAgICAgZGVmIGNvbXBhcmFi bGVfdmVyc2lvbih2ZXJzaW9uKToKQEAgLTExMSw5ICsxMjcsOCBAQCBkZWYgY2hlY2tfZmxhdHBh ayh2ZXJib3NlPVRydWUpOgogICAgICAgICBjdXJyZW50ID0gY29tcGFyYWJsZV92ZXJzaW9uKHZl cnNpb24pCiAgICAgICAgIEZMQVRQQUtfVkVSU0lPTlthcHBdID0gY3VycmVudAogICAgICAgICBp ZiBjdXJyZW50IDwgY29tcGFyYWJsZV92ZXJzaW9uKHJlcXVpcmVkX3ZlcnNpb24pOgotICAgICAg ICAgICAgQ29uc29sZS5tZXNzYWdlKCJcbiVzJXMgJXMgcmVxdWlyZWQgYnV0ICVzIGZvdW5kLiIK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAiIFBsZWFzZSB1cGRhdGUgYW5kIHRyeSBhZ2Fp biVzXG4iLCBDb2xvcnMuRkFJTCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBhcHAsIHJl cXVpcmVkX3ZlcnNpb24sIHZlcnNpb24sIENvbG9ycy5FTkRDKQorICAgICAgICAgICAgQ29uc29s ZS5lcnJvcl9tZXNzYWdlKCIlcyAlcyByZXF1aXJlZCBidXQgJXMgZm91bmQuIFBsZWFzZSB1cGRh dGUgYW5kIHRyeSBhZ2FpblxuIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBh cHAsIHJlcXVpcmVkX3ZlcnNpb24sIHZlcnNpb24pCiAgICAgICAgICAgICByZXR1cm4gRmFsc2UK IAogICAgIHJldHVybiBUcnVlCkBAIC0xMzUsMTAgKzE1MCwxMSBAQCBjbGFzcyBGbGF0cGFrT2Jq ZWN0OgogICAgICAgICAgICAgcmVzID0gc3VicHJvY2Vzcy5jaGVja19vdXRwdXQoY29tbWFuZCAr IFsiLS1oZWxwIl0pLmRlY29kZSgidXRmLTgiKQogICAgICAgICAgICAgaWYgIi0tdXNlciIgaW4g cmVzOgogICAgICAgICAgICAgICAgIGNvbW1hbmQuYXBwZW5kKCItLXVzZXIiKQotICAgICAgICAg ICAgaWYgIi0tYXNzdW1leWVzIiBpbiByZXM6Ci0gICAgICAgICAgICAgICAgY29tbWFuZC5hcHBl bmQoIi0tYXNzdW1leWVzIikKKyAgICAgICAgaWYgIi0tYXNzdW1leWVzIiBpbiByZXM6CisgICAg ICAgICAgICBjb21tYW5kLmFwcGVuZCgiLS1hc3N1bWV5ZXMiKQogICAgICAgICBjb21tYW5kLmV4 dGVuZChhcmdzKQogCisgICAgICAgIF9sb2cuZGVidWcoIkV4ZWN1dGluZyAlcyIgJSAnICcuam9p bihjb21tYW5kKSkKICAgICAgICAgaWYgbm90IHNob3dfb3V0cHV0OgogICAgICAgICAgICAgcmV0 dXJuIHN1YnByb2Nlc3MuY2hlY2tfb3V0cHV0KGNvbW1hbmQpLmRlY29kZSgidXRmLTgiKQogCkBA IC0yNDgsNiArMjY0LDIzIEBAIGNsYXNzIEZsYXRwYWtSZXBvKEZsYXRwYWtPYmplY3QpOgogICAg ICAgICBlbHNlOgogICAgICAgICAgICAgYXNzZXJ0IHVybAogCisgICAgICAgIHNlbGYuX2FwcF9y ZWdpc3RyeSA9IHt9CisgICAgICAgIG91dHB1dCA9IHNlbGYuZmxhdHBhaygibGlzdCIsICItLWNv bHVtbnM9YXBwbGljYXRpb24sYnJhbmNoLG9yaWdpbiIpCisgICAgICAgIGZvciBsaW5lIGluIG91 dHB1dC5zcGxpdGxpbmVzKCk6CisgICAgICAgICAgICBuYW1lLCBicmFuY2gsIG9yaWdpbiA9IGxp bmUuc3BsaXQoIlx0IikKKyAgICAgICAgICAgIGlmIG9yaWdpbiAhPSBzZWxmLm5hbWU6CisgICAg ICAgICAgICAgICAgY29udGludWUKKyAgICAgICAgICAgIHNlbGYuX2FwcF9yZWdpc3RyeVtuYW1l XSA9IGJyYW5jaAorCisgICAgZGVmIGlzX2FwcF9pbnN0YWxsZWQoc2VsZiwgbmFtZSwgYnJhbmNo PU5vbmUpOgorICAgICAgICBpZiBicmFuY2g6CisgICAgICAgICAgICB0cnk6CisgICAgICAgICAg ICAgICAgcmV0dXJuIHNlbGYuX2FwcF9yZWdpc3RyeVtuYW1lXSA9PSBicmFuY2gKKyAgICAgICAg ICAgIGV4Y2VwdCBLZXlFcnJvcjoKKyAgICAgICAgICAgICAgICByZXR1cm4gRmFsc2UKKyAgICAg ICAgZWxzZToKKyAgICAgICAgICAgIHJldHVybiBuYW1lIGluIHNlbGYuX2FwcF9yZWdpc3RyeS5r ZXlzKCkKKwogICAgIEBwcm9wZXJ0eQogICAgIGRlZiByZXBvX2ZpbGUoc2VsZik6CiAgICAgICAg IGlmIHNlbGYuX3JlcG9fZmlsZToKQEAgLTI3MSw3ICszMDQsNiBAQCBjbGFzcyBGbGF0cGFrUGFj a2FnZShGbGF0cGFrT2JqZWN0KToKICAgICAgICAgc2VsZi5icmFuY2ggPSBzdHIoYnJhbmNoKQog ICAgICAgICBzZWxmLnJlcG8gPSByZXBvCiAgICAgICAgIHNlbGYuYXJjaCA9IGFyY2gKLSAgICAg ICAgc2VsZi5oYXNoID0gaGFzaAogCiAgICAgZGVmIF9fcmVwcl9fKHNlbGYpOgogICAgICAgICBy ZXR1cm4gIiVzLyVzLyVzICVzIiAlIChzZWxmLm5hbWUsIHNlbGYuYXJjaCwgc2VsZi5icmFuY2gs IHNlbGYucmVwby5uYW1lKQpAQCAtMjk3LDI4ICszMjksMTcgQEAgY2xhc3MgRmxhdHBha1BhY2th Z2UoRmxhdHBha09iamVjdCk6CiAgICAgICAgIGlmIG5vdCBzZWxmLnJlcG86CiAgICAgICAgICAg ICByZXR1cm4gRmFsc2UKIAotICAgICAgICBhcmdzID0gWyJpbnN0YWxsIiwgc2VsZi5yZXBvLm5h bWUsIHNlbGYubmFtZSwgIi0tcmVpbnN0YWxsIiwgc2VsZi5icmFuY2gsICItLWFzc3VtZXllcyJd Ci0gICAgICAgIGNvbW1lbnQgPSAiSW5zdGFsbGluZyBmcm9tICIgKyBzZWxmLnJlcG8ubmFtZSAr ICIgIiArIHNlbGYubmFtZSArICIgIiArIHNlbGYuYXJjaCArICIgIiArIHNlbGYuYnJhbmNoCisg ICAgICAgIGJyYW5jaCA9IHNlbGYuYnJhbmNoCisgICAgICAgIGFyZ3MgPSAoImluc3RhbGwiLCBz ZWxmLnJlcG8ubmFtZSwgc2VsZi5uYW1lLCAiLS1yZWluc3RhbGwiLCBicmFuY2gpCisgICAgICAg IGNvbW1lbnQgPSAiSW5zdGFsbGluZyBmcm9tICIgKyBzZWxmLnJlcG8ubmFtZSArICIgIiArIHNl bGYubmFtZSArICIgIiArIHNlbGYuYXJjaCArICIgIiArIGJyYW5jaAogICAgICAgICBzZWxmLmZs YXRwYWsoKmFyZ3MsIHNob3dfb3V0cHV0PVRydWUsIGNvbW1lbnQ9Y29tbWVudCkKLSAgICAgICAg aWYgc2VsZi5oYXNoOgotICAgICAgICAgICAgYXJncyA9IFsidXBkYXRlIiwgIi0tY29tbWl0Iiwg c2VsZi5oYXNoLCBzZWxmLm5hbWVdCi0gICAgICAgICAgICBjb21tZW50ID0gIlVwZGF0aW5nIHRv ICVzIiAlIHNlbGYuaGFzaAotICAgICAgICAgICAgc2VsZi5mbGF0cGFrKCphcmdzLCBzaG93X291 dHB1dD1UcnVlLCBjb21tZW50PWNvbW1lbnQpCiAKICAgICBkZWYgdXBkYXRlKHNlbGYpOgogICAg ICAgICBpZiBub3Qgc2VsZi5pc19pbnN0YWxsZWQoc2VsZi5icmFuY2gpOgogICAgICAgICAgICAg cmV0dXJuIHNlbGYuaW5zdGFsbCgpCiAKLSAgICAgICAgZXh0cmFfYXJncyA9IFtdCiAgICAgICAg IGNvbW1lbnQgPSAiVXBkYXRpbmcgJXMiICUgc2VsZi5uYW1lCi0gICAgICAgIGlmIHNlbGYuaGFz aDoKLSAgICAgICAgICAgIGV4dHJhX2FyZ3MgPSBbIi0tY29tbWl0Iiwgc2VsZi5oYXNoXQotICAg ICAgICAgICAgY29tbWVudCArPSAiIHRvICVzIiAlIHNlbGYuaGFzaAotCi0gICAgICAgIGV4dHJh X2FyZ3MuYXBwZW5kKCItLWFzc3VtZXllcyIpCi0KLSAgICAgICAgc2VsZi5mbGF0cGFrKCJ1cGRh dGUiLCBzZWxmLm5hbWUsIHNlbGYuYnJhbmNoLCBzaG93X291dHB1dD1UcnVlLAotICAgICAgICAg ICAgICAgICAgICAgKmV4dHJhX2FyZ3MsIGNvbW1lbnQ9Y29tbWVudCkKKyAgICAgICAgc2VsZi5m bGF0cGFrKCJ1cGRhdGUiLCBzZWxmLm5hbWUsIHNlbGYuYnJhbmNoLCBzaG93X291dHB1dD1UcnVl LCBjb21tZW50PWNvbW1lbnQpCiAKIAogQGNvbnRleHRtYW5hZ2VyCkBAIC00MDMsOSArNDI0LDcg QEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICBkZWYgX19pbml0X18oc2VsZik6CiAgICAgICAg IHNlbGYuc2RrX3JlcG8gPSBOb25lCiAgICAgICAgIHNlbGYucnVudGltZSA9IE5vbmUKLSAgICAg ICAgc2VsZi5sb2NhbGUgPSBOb25lCiAgICAgICAgIHNlbGYuc2RrID0gTm9uZQotICAgICAgICBz ZWxmLmFwcCA9IE5vbmUKIAogICAgICAgICBzZWxmLnZlcmJvc2UgPSBGYWxzZQogICAgICAgICBz ZWxmLnF1aWV0ID0gRmFsc2UKQEAgLTQyNyw3ICs0NDYsNyBAQCBjbGFzcyBXZWJraXRGbGF0cGFr OgogICAgICAgICBzZWxmLmJ1aWxkX2dzdCA9IEZhbHNlCiAgICAgICAgIHNlbGYuYnVpbGRfYWxs ID0gRmFsc2UKIAotICAgICAgICBzZWxmLnNka19icmFuY2ggPSAiMC4xIgorICAgICAgICBzZWxm LnNka19icmFuY2ggPSAiMC4yIgogICAgICAgICBzZWxmLnBsYXRmb3JtID0gImd0ayIKICAgICAg ICAgc2VsZi5idWlsZF90eXBlID0gIlJlbGVhc2UiCiAgICAgICAgIHNlbGYubWFuaWZlc3RfcGF0 aCA9IE5vbmUKQEAgLTQzNSw3ICs0NTQsNiBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAgICAg ICBzZWxmLmJ1aWxkX25hbWUgPSBOb25lCiAgICAgICAgIHNlbGYuZmxhdHBha19yb290X3BhdGgg PSBOb25lCiAgICAgICAgIHNlbGYuY2FjaGVfcGF0aCA9IE5vbmUKLSAgICAgICAgc2VsZi5hcHBf bW9kdWxlID0gTm9uZQogICAgICAgICBzZWxmLmZsYXRwYWtfZGVmYXVsdF9hcmdzID0gW10KICAg ICAgICAgc2VsZi5jaGVja19hdmFpbGFibGUgPSBGYWxzZQogCkBAIC00OTcsMTIgKzUxNSw3IEBA IGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKIAogICAgICAg ICBzZWxmLmZpbmlzaF9hcmdzID0gW10KLSAgICAgICAgc2VsZi5yZXBvcyA9IEZsYXRwYWtSZXBv cygpCi0gICAgICAgIHNlbGYuc2RrX3JlcG8gPSBzZWxmLnJlcG9zLmFkZCgKLSAgICAgICAgICAg IEZsYXRwYWtSZXBvKCJ3ZWJraXQtc2RrIiwKLSAgICAgICAgICAgICAgICAgICAgICAgIHVybD0i aHR0cHM6Ly9zb2Z0d2FyZS5pZ2FsaWEuY29tL3dlYmtpdC1zZGstcmVwby8iLAotICAgICAgICAg ICAgICAgICAgICAgICAgcmVwb19maWxlPSJodHRwczovL3NvZnR3YXJlLmlnYWxpYS5jb20vZmxh dHBhay1yZWZzL3dlYmtpdC1zZGsuZmxhdHBha3JlcG8iKQotICAgICAgICApCisgICAgICAgIHNl bGYuX3Jlc2V0X3JlcG9zaXRvcnkoKQogCiAgICAgICAgIHRyeToKICAgICAgICAgICAgIHdpdGgg b3BlbihzZWxmLmNvbmZpZ19maWxlKSBhcyBjb25maWc6CkBAIC01MTMsNiArNTI2LDE0IEBAIGNs YXNzIFdlYmtpdEZsYXRwYWs6CiAKICAgICAgICAgcmV0dXJuIFRydWUKIAorICAgIGRlZiBfcmVz ZXRfcmVwb3NpdG9yeShzZWxmKToKKyAgICAgICAgc2VsZi5yZXBvcyA9IEZsYXRwYWtSZXBvcygp CisgICAgICAgIHNlbGYuc2RrX3JlcG8gPSBzZWxmLnJlcG9zLmFkZCgKKyAgICAgICAgICAgIEZs YXRwYWtSZXBvKCJ3ZWJraXQtc2RrIiwKKyAgICAgICAgICAgICAgICAgICAgICAgIHVybD0iaHR0 cHM6Ly9zb2Z0d2FyZS5pZ2FsaWEuY29tL3dlYmtpdC1zZGstcmVwby8iLAorICAgICAgICAgICAg ICAgICAgICAgICAgcmVwb19maWxlPSJodHRwczovL3NvZnR3YXJlLmlnYWxpYS5jb20vZmxhdHBh ay1yZWZzL3dlYmtpdC1zZGsuZmxhdHBha3JlcG8iKQorICAgICAgICApCisKICAgICBkZWYgc2V0 dXBfYnVpbGRkaXIoc2VsZiwgKiprd2FyZ3MpOgogICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhv cy5wYXRoLmpvaW4oc2VsZi5mbGF0cGFrX2J1aWxkX3BhdGgsICJtZXRhZGF0YSIpKToKICAgICAg ICAgICAgIHJldHVybgpAQCAtNTI5LDcgKzU1MCw3IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAg ICAgICAgIGdzdF9kaXIgPSBvcy5lbnZpcm9uLmdldCgnR1NUX0JVSUxEX1BBVEgnKQogICAgICAg ICBpZiBub3QgZ3N0X2RpcjoKICAgICAgICAgICAgIGlmIGJ1aWxkaW5nOgotICAgICAgICAgICAg ICAgIENvbnNvbGUubWVzc2FnZSgiJXMkR1NUX0JVSUxEX1BBVEggZW52aXJvbm1lbnQgdmFyaWFi bGUgbm90IHNldC4gU2tpcHBpbmcgZ3N0LWJ1aWxkJXNcbiIsIENvbG9ycy5XQVJOSU5HLCBDb2xv cnMuRU5EQykKKyAgICAgICAgICAgICAgICBDb25zb2xlLndhcm5pbmdfbWVzc2FnZSgiJEdTVF9C VUlMRF9QQVRIIGVudmlyb25tZW50IHZhcmlhYmxlIG5vdCBzZXQuIFNraXBwaW5nIGdzdC1idWls ZFxuIikKICAgICAgICAgICAgIHJldHVybiBbXQogCiAgICAgICAgIGlmIG5vdCBvcy5wYXRoLmV4 aXN0cyhvcy5wYXRoLmpvaW4oZ3N0X2RpciwgJ2dzdC1lbnYucHknKSk6CkBAIC03MTksNyArNzQw LDE1IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgIGlmIHNlbGYudXBkYXRlOgogICAg ICAgICAgICAgQ29uc29sZS5tZXNzYWdlKCJVcGRhdGluZyBGbGF0cGFrICVzIGVudmlyb25tZW50 IiAlIHNlbGYuYnVpbGRfdHlwZSkKICAgICAgICAgICAgIGlmIG5vdCBzZWxmLm5vX2ZsYXRwYWtf dXBkYXRlOgotICAgICAgICAgICAgICAgIHNlbGYuc2RrX3JlcG8uZmxhdHBhaygidXBkYXRlIikK KyAgICAgICAgICAgICAgICByZXBvID0gc2VsZi5zZGtfcmVwbworICAgICAgICAgICAgICAgIHJl cG8uZmxhdHBhaygidXBkYXRlIikKKyAgICAgICAgICAgICAgICBmb3IgcGFja2FnZSBpbiBzZWxm Ll9nZXRfcGFja2FnZXMoKToKKyAgICAgICAgICAgICAgICAgICAgaWYgcGFja2FnZS5uYW1lLnN0 YXJ0c3dpdGgoIm9yZy53ZWJraXQiKSBhbmQgcmVwby5pc19hcHBfaW5zdGFsbGVkKHBhY2thZ2Uu bmFtZSkgXAorICAgICAgICAgICAgICAgICAgICAgICBhbmQgbm90IHJlcG8uaXNfYXBwX2luc3Rh bGxlZChwYWNrYWdlLm5hbWUsIGJyYW5jaD1zZWxmLnNka19icmFuY2gpOgorICAgICAgICAgICAg ICAgICAgICAgICAgQ29uc29sZS5tZXNzYWdlKCJOZXcgU0RLIHZlcnNpb24gYXZhaWxhYmxlLCBy ZW1vdmluZyBsb2NhbCBVc2VyRmxhdHBhayBkaXJlY3RvcnkgYmVmb3JlIHN3aXRjaGluZyB0byBu ZXcgdmVyc2lvbiIpCisgICAgICAgICAgICAgICAgICAgICAgICBzaHV0aWwucm10cmVlKHNlbGYu ZmxhdHBha19idWlsZF9wYXRoKQorICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5fcmVzZXRf cmVwb3NpdG9yeSgpCisgICAgICAgICAgICAgICAgICAgICAgICBicmVhawogCiAgICAgICAgIHJl dHVybiBzZWxmLnNldHVwX2Rldl9lbnYoKQogCkBAIC03MjcsOCArNzU2LDggQEAgY2xhc3MgV2Vi a2l0RmxhdHBhazoKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgcmV0dXJuIHNlbGYubWFpbigp CiAgICAgICAgIGV4Y2VwdCBzdWJwcm9jZXNzLkNhbGxlZFByb2Nlc3NFcnJvciBhcyBlcnJvcjoK LSAgICAgICAgICAgIENvbnNvbGUubWVzc2FnZSgiXG4lc1RoZSBmb2xsb3dpbmcgY29tbWFuZCBy ZXR1cm5lZCBhIG5vbi16ZXJvIGV4aXQgc3RhdHVzOiAlc1xuIgotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICJPdXRwdXQ6ICVzJXMiLCBDb2xvcnMuRkFJTCwgJyAnLmpvaW4oZXJyb3IuY21k KSwgZXJyb3Iub3V0cHV0LCBDb2xvcnMuRU5EQykKKyAgICAgICAgICAgIENvbnNvbGUuZXJyb3Jf bWVzc2FnZSgiVGhlIGZvbGxvd2luZyBjb21tYW5kIHJldHVybmVkIGEgbm9uLXplcm8gZXhpdCBz dGF0dXM6ICVzXG4iCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIk91dHB1dDog JXMiLCAnICcuam9pbihlcnJvci5jbWQpLCBlcnJvci5vdXRwdXQpCiAgICAgICAgICAgICByZXR1 cm4gZXJyb3IucmV0dXJuY29kZQogICAgICAgICByZXR1cm4gMAogCkBAIC03NTQsNiArNzgzLDEy IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAgICBzZWxmLnNldHVwX2ljZWNjKCkK ICAgICAgICAgICAgIHNlbGYuc2F2ZV9jb25maWcoKQogCisgICAgICAgIGlmIG5vdCBzZWxmLnVw ZGF0ZToKKyAgICAgICAgICAgIGZvciBwYWNrYWdlIGluIHNlbGYuX2dldF9wYWNrYWdlcygpOgor ICAgICAgICAgICAgICAgIGlmIHBhY2thZ2UubmFtZS5zdGFydHN3aXRoKCJvcmcud2Via2l0Iikg YW5kIG5vdCBwYWNrYWdlLmlzX2luc3RhbGxlZChzZWxmLnNka19icmFuY2gpOgorICAgICAgICAg ICAgICAgICAgICBDb25zb2xlLmVycm9yX21lc3NhZ2UoIkZsYXRwYWsgcGFja2FnZSAlcyBub3Qg aW5zdGFsbGVkLiBQbGVhc2UgdXBkYXRlIHlvdXIgU0RLOiBUb29scy9TY3JpcHRzL3VwZGF0ZS13 ZWJraXQtZmxhdHBhayIsIHBhY2thZ2UpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiAxCisK ICAgICAgICAgYnVpbGRfdHlwZSA9ICItLWRlYnVnIiBpZiBzZWxmLmRlYnVnIGVsc2UgIi0tcmVs ZWFzZSIKIAogICAgICAgICBpZiBzZWxmLmJ1aWxkX3dlYmtpdDoKQEAgLTc4NiwxMSArODIxLDkg QEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICBkZWYgX2dldF9wYWNrYWdlcyhzZWxmKToKICAg ICAgICAgc2VsZi5ydW50aW1lID0gRmxhdHBha1BhY2thZ2UoIm9yZy53ZWJraXQuUGxhdGZvcm0i LCBzZWxmLnNka19icmFuY2gsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHNlbGYuc2RrX3JlcG8sICJ4ODZfNjQiKQotICAgICAgICBzZWxmLmxvY2FsZSA9IEZsYXRwYWtQ YWNrYWdlKCJvcmcud2Via2l0LlBsYXRmb3JtLkxvY2FsZSIsIHNlbGYuc2RrX2JyYW5jaCwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLnNka19yZXBvLCAieDg2XzY0 IikKICAgICAgICAgc2VsZi5zZGsgPSBGbGF0cGFrUGFja2FnZSgib3JnLndlYmtpdC5TZGsiLCBz ZWxmLnNka19icmFuY2gsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5z ZGtfcmVwbywgIng4Nl82NCIpCi0gICAgICAgIHBhY2thZ2VzID0gW3NlbGYucnVudGltZSwgc2Vs Zi5sb2NhbGUsIHNlbGYuc2RrXQorICAgICAgICBwYWNrYWdlcyA9IFtzZWxmLnJ1bnRpbWUsIHNl bGYuc2RrXQogCiAgICAgICAgICMgRklYTUU6IEZvciB1bmtub3duIHJlYXNvbnMsIHRoZSBHTCBl eHRlbnNpb24gbmVlZHMgdG8gYmUgZXhwbGljaXRlbHkKICAgICAgICAgIyBpbnN0YWxsZWQgZm9y IEZsYXRwYWsgMS4yLnggdG8gYmUgYWJsZSB0byBtYWtlIHVzZSBvZiBpdC4gU2VlbXMgbGlrZQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CmluZGV4IGVjNzQ5NWNhNmIwMWI4MDkxMmI4ZDU4NzkyODk2MDM5OGJlMWM0ZDguLjFhOWU0ZGVj YjY3NDBhMWZmNWVmNTE2MWU4NmM3NDY3ZTVmMmU1ZTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAyMC0wNC0wMSAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CisKKyAg ICAgICAgW0ZsYXRwYWsgU0RLXSBNaWdyYXRpb24gdG8gdmVyc2lvbiAwLjIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwOTg1MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0cC9jb25mL2ZsYXRwYWst aHR0cGQuY29uZjogU3dpdGNoIGJhY2sgdG8gL3Vzci9saWIvYXBhY2hlMgorICAgICAgICBwYXRo IGZvciBtb2R1bGVzLiBUaGUgMC4xIHZlcnNpb24gb2YgdGhlIFNESyBpbnN0YWxsZWQgdGhvc2Ug aW4KKyAgICAgICAgL3Vzci8gYnV0IGluIHJldHJvc3BlY3RpdmUsIHRoaXMgd2FzIGEgbWlzdGFr ZS4KKwogMjAyMC0wMy0zMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFtNdWx0aUNvbHVtbl0gQ2FsbCBSZW5kZXJUcmVlQnVpbGRlcjo6bXVsdGlDb2x1bW5EZXNj ZW5kYW50SW5zZXJ0ZWQgb25seSB3aGVuIHRoZSBlbmNsb3NpbmcgZnJhZ21lbnRlZCBmbG93IGhh cyBjaGFuZ2VkCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL2NvbmYvZmxhdHBhay1odHRw ZC5jb25mIGIvTGF5b3V0VGVzdHMvaHR0cC9jb25mL2ZsYXRwYWstaHR0cGQuY29uZgppbmRleCBi ZjUyMTVkNTg5YWQ2MWY4ODJkNTNhMDY3NWFkNjdhNDQ2YWI5NDNmLi5jYTljOWE4OThjYmY4NGIw ODQ0MzgxOTkyNmZlNTcwMzEyYjIzMGY2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL2Nv bmYvZmxhdHBhay1odHRwZC5jb25mCisrKyBiL0xheW91dFRlc3RzL2h0dHAvY29uZi9mbGF0cGFr LWh0dHBkLmNvbmYKQEAgLTEsNSArMSw1IEBACiBTZXJ2ZXJUb2tlbnMgT1MKLVNlcnZlclJvb3Qg Ii91c3IvIgorU2VydmVyUm9vdCAiL3Vzci9saWIvYXBhY2hlMiIKIAogUGlkRmlsZSAiL3RtcC9X ZWJLaXQvaHR0cGQucGlkIgogU2NvcmVCb2FyZEZpbGUgIi90bXAvV2ViS2l0L2h0dHBkLnNjb3Jl Ym9hcmQiCg==