213432 2020-06-20 10:42:11 -0700 [Flatpak SDK] relax restriction on build-webkit script name 2020-06-23 02:16:18 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pnormand pnormand lmoura webkit-bug-importer zan oldest_to_newest 1664748 0 pnormand 2020-06-20 10:42:11 -0700 I've started writing a python variant of build-webkit, called build-webkit-ng, so handle it in flatpakutils too. 1664750 1 402390 pnormand 2020-06-20 10:45:04 -0700 Created attachment 402390 Patch 1665017 2 402390 lmoura 2020-06-22 07:39:32 -0700 Comment on attachment 402390 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=402390&action=review > Tools/flatpak/flatpakutils.py:686 > + if args and args[0].find("build-webkit") != -1 and not self.is_branch_build(): As the index of "build-webkit" is not needed, it could be better to use `if args and "build-webkit" in args[0] and...`. (This is even a recommendation in the find method: https://docs.python.org/3/library/stdtypes.html#str.find) And to be more safe, maybe check against `os.path.basename(args[0])` instead of `args[0]`? (Who knows who might be using webkit inside a build-webkit directory...) 1665035 3 402475 pnormand 2020-06-22 08:15:39 -0700 Created attachment 402475 Patch 1665318 4 ews-feeder 2020-06-23 02:15:47 -0700 Committed r263390: <https://trac.webkit.org/changeset/263390> All reviewed patches have been landed. Closing bug and clearing flags on attachment 402475. 1665320 5 webkit-bug-importer 2020-06-23 02:16:18 -0700 <rdar://problem/64632745> 402390 2020-06-20 10:45:04 -0700 2020-06-22 08:15:34 -0700 Patch bug-213432-20200620104502.patch text/plain 1771 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMzE4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmI2YTYwY2Y5MDgzOTZiNTk1OWFjNDcyZWE3MjI0YjQ2 MGM4ODk2MC4uMjM2Y2VkZDk4Y2M0MjA2YjQ1ZjRmNGNjYThmMGEyMGUyODZkNDc1MSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDIwLTA2LTIwICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIHJlbGF4IHJlc3RyaWN0aW9uIG9uIGJ1aWxkLXdlYmtp dCBzY3JpcHQgbmFtZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjEzNDMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBmbGF0cGFrL2ZsYXRwYWt1dGlscy5weToKKyAgICAgICAgKFdlYmtpdEZsYXRwYWsu cnVuX2luX3NhbmRib3gpOiBNYXRjaCB0aGUgYnVpbGQtd2Via2l0IHN0cmluZyBpbiB0aGUgd2hv bGUgY29tbWFuZC1saW5lCisgICAgICAgIGFyZ3VtZW50IGFuZCB0aHVzIGFsbG93IGFsdGVybmF0 aXZlIGltcGxlbWVudGF0aW9ucyBvZiBidWlsZC13ZWJraXQuIEFsc28gbGV0IHRoZQorICAgICAg ICBNQVhfQ1BVX0xPQUQgZW52IHZhciBpbiB0aGUgc2FuZGJveC4KKwogMjAyMC0wNi0xOSAgSm9u YXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgQnJpbmcgdXAgd2F0 Y2hPUy90dk9TIG9uIGJ1aWxkLndlYmtpdC5vcmcgKEZvbGxvdy11cCBmaXgpCmRpZmYgLS1naXQg YS9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weSBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0 aWxzLnB5CmluZGV4IGIyMGVjZWFjMDVmYjkwMDc1ZDFmNzk5MjNlOGE4OWRiMmU1OTVmOGUuLjU4 ZDI3OGUzMTNlMWUxZWUzNWQzNzU2MjNkMTU2MDdkMzc5ZTgxNGUgMTAwNjQ0Ci0tLSBhL1Rvb2xz L2ZsYXRwYWsvZmxhdHBha3V0aWxzLnB5CisrKyBiL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0aWxz LnB5CkBAIC02ODMsNyArNjgzLDcgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICItLXRhbGstbmFtZT1vcmcuZ3RrLnZmcyIsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAiLS10YWxrLW5hbWU9b3JnLmd0ay52ZnMuKiJdCiAKLSAgICAgICAgaWYg YXJncyBhbmQgYXJnc1swXS5lbmRzd2l0aCgiYnVpbGQtd2Via2l0IikgYW5kIG5vdCBzZWxmLmlz X2JyYW5jaF9idWlsZCgpOgorICAgICAgICBpZiBhcmdzIGFuZCBhcmdzWzBdLmZpbmQoImJ1aWxk LXdlYmtpdCIpICE9IC0xIGFuZCBub3Qgc2VsZi5pc19icmFuY2hfYnVpbGQoKToKICAgICAgICAg ICAgICMgRW5zdXJlIHNlbGYuYnVpbGRfcGF0aCBleGlzdHMuCiAgICAgICAgICAgICB0cnk6CiAg ICAgICAgICAgICAgICAgb3MubWFrZWRpcnMoc2VsZi5idWlsZF9wYXRoKQpAQCAtNzQyLDYgKzc0 Miw3IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAgICAiSmF2YVNjcmlwdENvcmVV c2VKSVQiLAogICAgICAgICAgICAgIkxBTkciLAogICAgICAgICAgICAgIkxERkxBR1MiLAorICAg ICAgICAgICAgIk1BWF9DUFVfTE9BRCIsCiAgICAgICAgICAgICAiTWFsbG9jIiwKICAgICAgICAg ICAgICJOVU1CRVJfT0ZfUFJPQ0VTU09SUyIsCiAgICAgICAgICAgICAiUU1MMl9JTVBPUlRfUEFU SCIsCg== 402475 2020-06-22 08:15:39 -0700 2020-06-23 02:15:47 -0700 Patch bug-213432-20200622081537.patch text/plain 2597 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMzQ4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzhlNTVmNWNiOTVmM2JiOGI2NTk4YWQ1NGI4YjE5NDBl MWQwODA3NC4uOTJiODE0MjgwZGZiNzI3NGY0ZTkyMmQzOTc5Y2UxNTQ5ZjQyMDJhMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDIwLTA2LTIwICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBhayBTREtdIHJlbGF4IHJlc3RyaWN0aW9uIG9uIGJ1aWxkLXdlYmtp dCBzY3JpcHQgbmFtZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjEzNDMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBmbGF0cGFrL2ZsYXRwYWt1dGlscy5weToKKyAgICAgICAgKFdlYmtpdEZsYXRwYWsu cnVuX2luX3NhbmRib3gpOiBNYXRjaCB0aGUgYnVpbGQtd2Via2l0IHN0cmluZyBpbiB0aGUgd2hv bGUgY29tbWFuZC1saW5lCisgICAgICAgIGFyZ3VtZW50IGFuZCB0aHVzIGFsbG93IGFsdGVybmF0 aXZlIGltcGxlbWVudGF0aW9ucyBvZiBidWlsZC13ZWJraXQuIEFsc28gbGV0IHRoZQorICAgICAg ICBNQVhfQ1BVX0xPQUQgZW52IHZhciBpbiB0aGUgc2FuZGJveC4KKwogMjAyMC0wNi0yMiAgQWFr YXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgW2V3c10gU3dpdGNo IGNvbnRyaWJ1dG9ycy5qc29uIHVybCBmcm9tIHRyYWMgdG8gc3ZuIHNlcnZlcgpkaWZmIC0tZ2l0 IGEvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkgYi9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1 dGlscy5weQppbmRleCA3YjkyMTJlOGVhMjczMGRhODA3MDU2NGU5ZWRiODdhYWY0NWM4NDU2Li5i NmQxYzBlZTgwMmQyMWMyMmQxNTMzMDJiNDEwY2Y0MzFmZmY3NWIyIDEwMDY0NAotLS0gYS9Ub29s cy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weQorKysgYi9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGls cy5weQpAQCAtNjM5LDYgKzYzOSw5IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAg ICAgICAgcmV0dXJuIFRydWUKICAgICAgICAgcmV0dXJuIEZhbHNlCiAKKyAgICBkZWYgaXNfYnVp bGRfd2Via2l0KHNlbGYsIGNvbW1hbmQpOgorICAgICAgICByZXR1cm4gY29tbWFuZCBhbmQgImJ1 aWxkLXdlYmtpdCIgaW4gb3MucGF0aC5iYXNlbmFtZShjb21tYW5kKQorCiAgICAgZGVmIGhvc3Rf cGF0aF90b19zYW5kYm94X3BhdGgoc2VsZiwgaG9zdF9wYXRoKToKICAgICAgICAgIyBGb3Igbm93 IHRoaXMgc3VwcG9ydHMgb25seSBmaWxlcyBpbiB0aGUgV2ViS2l0IHBhdGgKICAgICAgICAgcmV0 dXJuIGhvc3RfcGF0aC5yZXBsYWNlKHNlbGYuc291cmNlX3Jvb3QsIHNlbGYuc2FuZGJveF9zb3Vy Y2Vfcm9vdCkKQEAgLTY4Myw3ICs2ODYsNyBAQCBjbGFzcyBXZWJraXRGbGF0cGFrOgogICAgICAg ICAgICAgICAgICAgICAgICAgICAgIi0tdGFsay1uYW1lPW9yZy5ndGsudmZzIiwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICItLXRhbGstbmFtZT1vcmcuZ3RrLnZmcy4qIl0KIAotICAgICAg ICBpZiBhcmdzIGFuZCBhcmdzWzBdLmVuZHN3aXRoKCJidWlsZC13ZWJraXQiKSBhbmQgbm90IHNl bGYuaXNfYnJhbmNoX2J1aWxkKCk6CisgICAgICAgIGlmIGFyZ3MgYW5kIHNlbGYuaXNfYnVpbGRf d2Via2l0KGFyZ3NbMF0pIGFuZCBub3Qgc2VsZi5pc19icmFuY2hfYnVpbGQoKToKICAgICAgICAg ICAgICMgRW5zdXJlIHNlbGYuYnVpbGRfcGF0aCBleGlzdHMuCiAgICAgICAgICAgICB0cnk6CiAg ICAgICAgICAgICAgICAgb3MubWFrZWRpcnMoc2VsZi5idWlsZF9wYXRoKQpAQCAtNzQyLDYgKzc0 NSw3IEBAIGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAgICAiSmF2YVNjcmlwdENvcmVV c2VKSVQiLAogICAgICAgICAgICAgIkxBTkciLAogICAgICAgICAgICAgIkxERkxBR1MiLAorICAg ICAgICAgICAgIk1BWF9DUFVfTE9BRCIsCiAgICAgICAgICAgICAiTWFsbG9jIiwKICAgICAgICAg ICAgICJOVU1CRVJfT0ZfUFJPQ0VTU09SUyIsCiAgICAgICAgICAgICAiUU1MMl9JTVBPUlRfUEFU SCIsCkBAIC05MzMsNyArOTM3LDcgQEAgY2xhc3MgV2Via2l0RmxhdHBhazoKICAgICAgICAgICAg IHJldHVybiBzZWxmLnJ1bl9nZGIoKQogICAgICAgICBlbGlmIHNlbGYudXNlcl9jb21tYW5kOgog ICAgICAgICAgICAgcHJvZ3JhbSA9IHNlbGYudXNlcl9jb21tYW5kWzBdCi0gICAgICAgICAgICBp ZiBwcm9ncmFtLmVuZHN3aXRoKCJidWlsZC13ZWJraXQiKSBhbmQgc2VsZi5jbWFrZWFyZ3M6Cisg ICAgICAgICAgICBpZiBzZWxmLmlzX2J1aWxkX3dlYmtpdChwcm9ncmFtKSBhbmQgc2VsZi5jbWFr ZWFyZ3M6CiAgICAgICAgICAgICAgICAgc2VsZi51c2VyX2NvbW1hbmQuYXBwZW5kKCItLWNtYWtl YXJncz0lcyIgJSBzZWxmLmNtYWtlYXJncykKIAogICAgICAgICAgICAgcmV0dXJuIHNlbGYucnVu X2luX3NhbmRib3goKnNlbGYudXNlcl9jb21tYW5kKQo=