106195 2013-01-06 12:12:44 -0800 [GTK] Make Tools/gtk/generate-gtkdoc compatible with Python 3 2013-01-08 02:11:45 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan pnormand oldest_to_newest 801084 0 zan 2013-01-06 12:12:44 -0800 [GTK] Make Tools/gtk/generate-gtkdoc compatible with Python 3 801086 1 181463 zan 2013-01-06 12:21:53 -0800 Created attachment 181463 Patch 801303 2 181463 pnormand 2013-01-07 08:29:09 -0800 Comment on attachment 181463 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=181463&action=review > Tools/gtk/gtkdoc.py:188 > + stdout, stderr = map(lambda b: b.decode("utf-8"), process.communicate()) Wouldn't a list comprehension work here? I find those easier to deal with than map/lambda 801500 3 181538 zan 2013-01-07 11:52:16 -0800 Created attachment 181538 Patch 801502 4 zan 2013-01-07 11:52:44 -0800 (In reply to comment #2) > (From update of attachment 181463 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=181463&action=review > > > Tools/gtk/gtkdoc.py:188 > > + stdout, stderr = map(lambda b: b.decode("utf-8"), process.communicate()) > > Wouldn't a list comprehension work here? I find those easier to deal with than map/lambda You're right, that approach is clearer. 802155 5 181538 zan 2013-01-08 02:11:37 -0800 Comment on attachment 181538 Patch Clearing flags on attachment: 181538 Committed r139048: <http://trac.webkit.org/changeset/139048> 802156 6 zan 2013-01-08 02:11:45 -0800 All reviewed patches have been landed. Closing bug. 181463 2013-01-06 12:21:53 -0800 2013-01-07 11:52:12 -0800 Patch bug-106195-20130106211859.patch text/plain 5701 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4OTE3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTg0ZWE4ZGJjMjI1OGQxYTJkOWJiMWRiY2RmMjQ2NGYy MDc3NGMyMS4uMjI3OTAxMmUyZmNkYjhmN2UxN2M0NDBhN2U1NmZmYTY1NjRkMDA0ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDEzLTAxLTA2ICBaYW4gRG9iZXJzZWsgIDx6YW5kb2JlcnNla0BnbWFpbC5jb20+CisK KyAgICAgICAgW0dUS10gTWFrZSBUb29scy9ndGsvZ2VuZXJhdGUtZ3RrZG9jIGNvbXBhdGlibGUg d2l0aCBQeXRob24gMworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTA2MTk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgUGVyZm9ybSBjaGFuZ2VzIGluIHRoZSBnZW5lcmF0ZS1ndGtkb2Mgc2NyaXB0IGFuZCBj b21tb24gYW5kIGd0a2RvYyBtb2R1bGVzCisgICAgICAgIHRvIG1ha2UgdGhlIFB5dGhvbiBjb2Rl IGNvbXBhdGlibGUgd2l0aCBQeXRob24gMy4gVGhpcyBpbmNsdWRlcyBtb2RpZnlpbmcKKyAgICAg ICAgcHJpbnQgc3RhdGVtZW50cywgZXhjZXB0aW9uIGhhbmRsaW5nLCBkaWN0aW9uYXJ5IGl0ZXJh dGlvbiBhbmQKKyAgICAgICAgYnl0ZS1zZXF1ZW5jZS10by1zdHJpbmcgY29udmVyc2lvbi4KKwor ICAgICAgICAqIGd0ay9jb21tb24ucHk6CisgICAgICAgIChnZXRfYnVpbGRfcGF0aCk6CisgICAg ICAgIChwa2dfY29uZmlnX2ZpbGVfdmFyaWFibGUpOgorICAgICAgICAoZ3RrX3ZlcnNpb25fb2Zf cGtnX2NvbmZpZ19maWxlKToKKyAgICAgICAgKiBndGsvZ2VuZXJhdGUtZ3RrZG9jOgorICAgICAg ICAocHJpbnRfbWlzc2luZ19hcGkpOgorICAgICAgICAqIGd0ay9ndGtkb2MucHk6CisgICAgICAg IChHVEtEb2MuX19pbml0X18pOgorICAgICAgICAoR1RLRG9jLl9ydW5fY29tbWFuZCk6CisKIDIw MTMtMDEtMDUgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQWRk IHN2bjpleGVjdXRhYmxlIHRvIGEgYnVuY2ggb2Ygc2NyaXB0cyBpbiBCdWlsZFNsYXZlU3VwcG9y dC4KZGlmZiAtLWdpdCBhL1Rvb2xzL2d0ay9jb21tb24ucHkgYi9Ub29scy9ndGsvY29tbW9uLnB5 CmluZGV4IGRkMzJlMDgxNTI4YWRlODcwNWE1YTZlNThlNjU4OTIxN2JkYWViOTEuLjE1ZTRlZjE5 ZDUzYzBjN2QyY2YyMWJjMzI3Y2Q3NjYyZjg1NmE3NDkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2d0ay9j b21tb24ucHkKKysrIGIvVG9vbHMvZ3RrL2NvbW1vbi5weQpAQCAtNzUsNyArNzUsNyBAQCBkZWYg Z2V0X2J1aWxkX3BhdGgoKToKICAgICBpZiBpc192YWxpZF9idWlsZF9kaXJlY3RvcnkoYnVpbGRf ZGlyKToKICAgICAgICAgcmV0dXJuIGJ1aWxkX2RpcgogCi0gICAgcHJpbnQgJ0NvdWxkIG5vdCBk ZXRlcm1pbmUgYnVpbGQgZGlyZWN0b3J5LicKKyAgICBwcmludCgnQ291bGQgbm90IGRldGVybWlu ZSBidWlsZCBkaXJlY3RvcnkuJykKICAgICBzeXMuZXhpdCgxKQogCiAKQEAgLTg2LDcgKzg2LDcg QEAgZGVmIGJ1aWxkX3BhdGgoKmFyZ3MpOgogZGVmIHBrZ19jb25maWdfZmlsZV92YXJpYWJsZShw YWNrYWdlLCB2YXJpYWJsZSk6CiAgICAgcHJvY2VzcyA9IHN1YnByb2Nlc3MuUG9wZW4oWydwa2ct Y29uZmlnJywgJy0tdmFyaWFibGU9JXMnICUgdmFyaWFibGUsIHBhY2thZ2VdLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUpCi0gICAgc3Rkb3V0 ID0gcHJvY2Vzcy5jb21tdW5pY2F0ZSgpWzBdCisgICAgc3Rkb3V0ID0gcHJvY2Vzcy5jb21tdW5p Y2F0ZSgpWzBdLmRlY29kZSgidXRmLTgiKQogICAgIGlmIHByb2Nlc3MucmV0dXJuY29kZToKICAg ICAgICAgcmV0dXJuIE5vbmUKICAgICByZXR1cm4gc3Rkb3V0LnN0cmlwKCkKQEAgLTk5LDcgKzk5 LDcgQEAgZGVmIHByZWZpeF9vZl9wa2dfY29uZmlnX2ZpbGUocGFja2FnZSk6CiBkZWYgZ3RrX3Zl cnNpb25fb2ZfcGtnX2NvbmZpZ19maWxlKHBrZ19jb25maWdfcGF0aCk6CiAgICAgcHJvY2VzcyA9 IHN1YnByb2Nlc3MuUG9wZW4oWydwa2ctY29uZmlnJywgcGtnX2NvbmZpZ19wYXRoLCAnLS1wcmlu dC1yZXF1aXJlcyddLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0ZG91dD1zdWJw cm9jZXNzLlBJUEUpCi0gICAgc3Rkb3V0ID0gcHJvY2Vzcy5jb21tdW5pY2F0ZSgpWzBdCisgICAg c3Rkb3V0ID0gcHJvY2Vzcy5jb21tdW5pY2F0ZSgpWzBdLmRlY29kZSgidXRmLTgiKQogCiAgICAg aWYgJ2d0aystMy4wJyBpbiBzdGRvdXQ6CiAgICAgICAgIHJldHVybiAzCmRpZmYgLS1naXQgYS9U b29scy9ndGsvZ2VuZXJhdGUtZ3RrZG9jIGIvVG9vbHMvZ3RrL2dlbmVyYXRlLWd0a2RvYwppbmRl eCA0ZmQ0NGJjODA3M2I2OTYzYjVjOTU1OTQ0ZGViYjkyOGYzZWE5MTJlLi41YWYyZmMxODYwZWFk OTMwYzI5NzQxNDhiYjJlMGNiMTcwOWYzYzBhIDEwMDc1NQotLS0gYS9Ub29scy9ndGsvZ2VuZXJh dGUtZ3RrZG9jCisrKyBiL1Rvb2xzL2d0ay9nZW5lcmF0ZS1ndGtkb2MKQEAgLTE0Myw5ICsxNDMs OSBAQCBkZWYgcHJpbnRfbWlzc2luZ19hcGkoZ2VuZXJhdG9yKToKICAgICBtaXNzaW5nX2FwaSA9 IGdlbmVyYXRvci5hcGlfbWlzc2luZ19kb2N1bWVudGF0aW9uKCkKICAgICBpZiBub3QgbWlzc2lu Z19hcGk6CiAgICAgICAgIHJldHVybgotICAgIHByaW50ICJcblRoZSBmb2xsb3dpbmcgQVBJIGFy ZSBtaXNzaW5nIGRvY3VtZW50YXRpb246IgorICAgIHByaW50KCJcblRoZSBmb2xsb3dpbmcgQVBJ IGFyZSBtaXNzaW5nIGRvY3VtZW50YXRpb246IikKICAgICBmb3IgYXBpIGluIG1pc3NpbmdfYXBp OgotICAgICAgICBwcmludCAiXHQlcyIgJSBhcGkKKyAgICAgICAgcHJpbnQoIlx0JXMiICUgYXBp KQogCiBkZWYgZ2VuZXJhdGVfZG9jKGdlbmVyYXRvcik6CiAgICAgZ2VuZXJhdG9yLmdlbmVyYXRl KGh0bWw9Jy0tc2tpcC1odG1sJyBub3QgaW4gc3lzLmFyZ3YpCkBAIC0xNzgsMjcgKzE3OCwyNyBA QCBpZiBvcy5wYXRoLmV4aXN0cyhwa2dfY29uZmlnX3BhdGgpOgogICAgIG9wdGlvbnMgPSBnZXRf d2Via2l0MV9vcHRpb25zKGNvbW1vbi5ndGtfdmVyc2lvbl9vZl9wa2dfY29uZmlnX2ZpbGUocGtn X2NvbmZpZ19wYXRoKSkKICAgICBnZW5lcmF0b3IgPSBndGtkb2MuUGtnQ29uZmlnR1RLRG9jKHBr Z19jb25maWdfcGF0aCwgb3B0aW9ucykKICAgICBpZiAnLS1yZWJhc2UnIG5vdCBpbiBzeXMuYXJn djoKLSAgICAgICAgcHJpbnQgIkdlbmVyYXRpbmcgV2ViS2l0MSBkb2N1bWVudGF0aW9uLi4uIgor ICAgICAgICBwcmludCgiR2VuZXJhdGluZyBXZWJLaXQxIGRvY3VtZW50YXRpb24uLi4iKQogICAg ICAgICBzYXdfd2Via2l0MV93YXJuaW5ncyA9IGdlbmVyYXRlX2RvYyhnZW5lcmF0b3IpCiAgICAg ZWxzZToKLSAgICAgICAgcHJpbnQgIlJlYmFzaW5nIFdlYktpdDEgZG9jdW1lbnRhdGlvbi4uLiIK KyAgICAgICAgcHJpbnQoIlJlYmFzaW5nIFdlYktpdDEgZG9jdW1lbnRhdGlvbi4uLiIpCiAgICAg ICAgIHRyeToKICAgICAgICAgICAgIGdlbmVyYXRvci5yZWJhc2VfaW5zdGFsbGVkX2RvY3MoKQot ICAgICAgICBleGNlcHQgRXhjZXB0aW9uLGU6Ci0gICAgICAgICAgICBwcmludCAiUmViYXNlIGRp ZCBub3QgaGFwcGVuLCBsaWtlbHkgbm8gZG9jdW1lbnRhdGlvbiBpcyBwcmVzZW50LiIKKyAgICAg ICAgZXhjZXB0IEV4Y2VwdGlvbjoKKyAgICAgICAgICAgIHByaW50KCJSZWJhc2UgZGlkIG5vdCBo YXBwZW4sIGxpa2VseSBubyBkb2N1bWVudGF0aW9uIGlzIHByZXNlbnQuIikKIAogIyBXZWJLaXQy IG1pZ2h0IG5vdCBiZSBlbmFibGVkLCBzbyBjaGVjayBmb3IgdGhlIHBrZy1jb25maWcgZmlsZSBi ZWZvcmUgYnVpbGRpbmcgZG9jdW1lbnRhdGlvbi4KIHBrZ19jb25maWdfcGF0aCA9IGNvbW1vbi5i dWlsZF9wYXRoKCdTb3VyY2UnLCAnV2ViS2l0MicsICd3ZWJraXQyZ3RrLTMuMC5wYycpCiBpZiBv cy5wYXRoLmV4aXN0cyhwa2dfY29uZmlnX3BhdGgpOgogICAgIGdlbmVyYXRvciA9IGd0a2RvYy5Q a2dDb25maWdHVEtEb2MocGtnX2NvbmZpZ19wYXRoLCBnZXRfd2Via2l0Ml9vcHRpb25zKCkpCiAg ICAgaWYgJy0tcmViYXNlJyBub3QgaW4gc3lzLmFyZ3Y6Ci0gICAgICAgIHByaW50ICJcbkdlbmVy YXRpbmcgV2ViS2l0MiBkb2N1bWVudGF0aW9uLi4uIgorICAgICAgICBwcmludCgiXG5HZW5lcmF0 aW5nIFdlYktpdDIgZG9jdW1lbnRhdGlvbi4uLiIpCiAgICAgICAgIHNhd193ZWJraXQyX3dhcm5p bmdzID0gZ2VuZXJhdGVfZG9jKGdlbmVyYXRvcikKICAgICBlbHNlOgotICAgICAgICBwcmludCAi XG5SZWJhc2luZyBXZWJLaXQyIGRvY3VtZW50YXRpb24uLi4iCisgICAgICAgIHByaW50KCJcblJl YmFzaW5nIFdlYktpdDIgZG9jdW1lbnRhdGlvbi4uLiIpCiAgICAgICAgIHRyeToKICAgICAgICAg ICAgIGdlbmVyYXRvci5yZWJhc2VfaW5zdGFsbGVkX2RvY3MoKQotICAgICAgICBleGNlcHQgRXhj ZXB0aW9uLGU6Ci0gICAgICAgICAgICBwcmludCAiUmViYXNlIGRpZCBub3QgaGFwcGVuLCBsaWtl bHkgbm8gZG9jdW1lbnRhdGlvbiBpcyBwcmVzZW50LiIKKyAgICAgICAgZXhjZXB0IEV4Y2VwdGlv bjoKKyAgICAgICAgICAgIHByaW50KCJSZWJhc2UgZGlkIG5vdCBoYXBwZW4sIGxpa2VseSBubyBk b2N1bWVudGF0aW9uIGlzIHByZXNlbnQuIikKIAogc3lzLmV4aXQoc2F3X3dlYmtpdDFfd2Fybmlu Z3Mgb3Igc2F3X3dlYmtpdDJfd2FybmluZ3MpCmRpZmYgLS1naXQgYS9Ub29scy9ndGsvZ3RrZG9j LnB5IGIvVG9vbHMvZ3RrL2d0a2RvYy5weQppbmRleCA3ZjdmMGFkMzEzODA5NjAwY2IzMzljYjQ3 OGYzNTI3NzVkZDYzNTJjLi43NjJkZDZjZDY0NDczYjhiNjA0ZTNmM2U1NWU5ZjJlODBjMmQ2MzQ3 IDEwMDY0NAotLS0gYS9Ub29scy9ndGsvZ3RrZG9jLnB5CisrKyBiL1Rvb2xzL2d0ay9ndGtkb2Mu cHkKQEAgLTEwNyw3ICsxMDcsNyBAQCBjbGFzcyBHVEtEb2Mob2JqZWN0KToKIAogICAgICAgICBz ZWxmLmxvZ2dlciA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKCdndGtkb2MnKQogCi0gICAgICAgIGZvciBr ZXksIHZhbHVlIGluIGFyZ3MuaXRlcml0ZW1zKCk6CisgICAgICAgIGZvciBrZXksIHZhbHVlIGlu IGl0ZXIoYXJncy5pdGVtcygpKToKICAgICAgICAgICAgIHNldGF0dHIoc2VsZiwga2V5LCB2YWx1 ZSkKIAogICAgICAgICBkZWYgcmFpc2VfZXJyb3JfaWZfbm90X3NwZWNpZmllZChrZXkpOgpAQCAt MTg1LDcgKzE4NSw3IEBAIGNsYXNzIEdUS0RvYyhvYmplY3QpOgogICAgICAgICBwcm9jZXNzID0g c3VicHJvY2Vzcy5Qb3BlbihhcmdzLCBlbnY9ZW52LCBjd2Q9Y3dkLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBzdGRlcnI9c3VicHJvY2Vzcy5QSVBFKQotICAgICAgICBz dGRvdXQsIHN0ZGVyciA9IHByb2Nlc3MuY29tbXVuaWNhdGUoKQorICAgICAgICBzdGRvdXQsIHN0 ZGVyciA9IG1hcChsYW1iZGEgYjogYi5kZWNvZGUoInV0Zi04IiksIHByb2Nlc3MuY29tbXVuaWNh dGUoKSkKIAogICAgICAgICBpZiBwcmludF9vdXRwdXQ6CiAgICAgICAgICAgICBpZiBzdGRvdXQ6 Cg== 181538 2013-01-07 11:52:16 -0800 2013-01-08 02:11:37 -0800 Patch bug-106195-20130107204921.patch text/plain 5666 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4OTcyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjJkMDNlMTE0NmQ0OWFmOWY0YWIzYTI1YTdiMWJlMjM4 YWE1Y2NhMi4uY2I2MmFjMDk3NjA4MzE3YjAwYmY0NjZhYmVlMDBkZWY0M2FmNzMyMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDEzLTAxLTA3ICBaYW4gRG9iZXJzZWsgIDx6YW5kb2JlcnNla0BnbWFpbC5jb20+CisK KyAgICAgICAgW0dUS10gTWFrZSBUb29scy9ndGsvZ2VuZXJhdGUtZ3RrZG9jIGNvbXBhdGlibGUg d2l0aCBQeXRob24gMworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTA2MTk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgUGVyZm9ybSBjaGFuZ2VzIGluIHRoZSBnZW5lcmF0ZS1ndGtkb2Mgc2NyaXB0IGFuZCBj b21tb24gYW5kIGd0a2RvYyBtb2R1bGVzCisgICAgICAgIHRvIG1ha2UgdGhlIFB5dGhvbiBjb2Rl IGNvbXBhdGlibGUgd2l0aCBQeXRob24gMy4gVGhpcyBpbmNsdWRlcyBtb2RpZnlpbmcKKyAgICAg ICAgcHJpbnQgc3RhdGVtZW50cywgZXhjZXB0aW9uIGhhbmRsaW5nLCBkaWN0aW9uYXJ5IGl0ZXJh dGlvbiBhbmQKKyAgICAgICAgYnl0ZS1zZXF1ZW5jZS10by1zdHJpbmcgY29udmVyc2lvbi4KKwor ICAgICAgICAqIGd0ay9jb21tb24ucHk6CisgICAgICAgIChnZXRfYnVpbGRfcGF0aCk6CisgICAg ICAgIChwa2dfY29uZmlnX2ZpbGVfdmFyaWFibGUpOgorICAgICAgICAoZ3RrX3ZlcnNpb25fb2Zf cGtnX2NvbmZpZ19maWxlKToKKyAgICAgICAgKiBndGsvZ2VuZXJhdGUtZ3RrZG9jOgorICAgICAg ICAocHJpbnRfbWlzc2luZ19hcGkpOgorICAgICAgICAqIGd0ay9ndGtkb2MucHk6CisgICAgICAg IChHVEtEb2MuX19pbml0X18pOgorICAgICAgICAoR1RLRG9jLl9ydW5fY29tbWFuZCk6CisKIDIw MTMtMDEtMDcgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQnVp bGQgZml4IGF0dGVtcHQgYWZ0ZXIgcjEzODgxMC4KZGlmZiAtLWdpdCBhL1Rvb2xzL2d0ay9jb21t b24ucHkgYi9Ub29scy9ndGsvY29tbW9uLnB5CmluZGV4IGRkMzJlMDgxNTI4YWRlODcwNWE1YTZl NThlNjU4OTIxN2JkYWViOTEuLjE1ZTRlZjE5ZDUzYzBjN2QyY2YyMWJjMzI3Y2Q3NjYyZjg1NmE3 NDkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL2d0ay9jb21tb24ucHkKKysrIGIvVG9vbHMvZ3RrL2NvbW1v bi5weQpAQCAtNzUsNyArNzUsNyBAQCBkZWYgZ2V0X2J1aWxkX3BhdGgoKToKICAgICBpZiBpc192 YWxpZF9idWlsZF9kaXJlY3RvcnkoYnVpbGRfZGlyKToKICAgICAgICAgcmV0dXJuIGJ1aWxkX2Rp cgogCi0gICAgcHJpbnQgJ0NvdWxkIG5vdCBkZXRlcm1pbmUgYnVpbGQgZGlyZWN0b3J5LicKKyAg ICBwcmludCgnQ291bGQgbm90IGRldGVybWluZSBidWlsZCBkaXJlY3RvcnkuJykKICAgICBzeXMu ZXhpdCgxKQogCiAKQEAgLTg2LDcgKzg2LDcgQEAgZGVmIGJ1aWxkX3BhdGgoKmFyZ3MpOgogZGVm IHBrZ19jb25maWdfZmlsZV92YXJpYWJsZShwYWNrYWdlLCB2YXJpYWJsZSk6CiAgICAgcHJvY2Vz cyA9IHN1YnByb2Nlc3MuUG9wZW4oWydwa2ctY29uZmlnJywgJy0tdmFyaWFibGU9JXMnICUgdmFy aWFibGUsIHBhY2thZ2VdLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0ZG91dD1z dWJwcm9jZXNzLlBJUEUpCi0gICAgc3Rkb3V0ID0gcHJvY2Vzcy5jb21tdW5pY2F0ZSgpWzBdCisg ICAgc3Rkb3V0ID0gcHJvY2Vzcy5jb21tdW5pY2F0ZSgpWzBdLmRlY29kZSgidXRmLTgiKQogICAg IGlmIHByb2Nlc3MucmV0dXJuY29kZToKICAgICAgICAgcmV0dXJuIE5vbmUKICAgICByZXR1cm4g c3Rkb3V0LnN0cmlwKCkKQEAgLTk5LDcgKzk5LDcgQEAgZGVmIHByZWZpeF9vZl9wa2dfY29uZmln X2ZpbGUocGFja2FnZSk6CiBkZWYgZ3RrX3ZlcnNpb25fb2ZfcGtnX2NvbmZpZ19maWxlKHBrZ19j b25maWdfcGF0aCk6CiAgICAgcHJvY2VzcyA9IHN1YnByb2Nlc3MuUG9wZW4oWydwa2ctY29uZmln JywgcGtnX2NvbmZpZ19wYXRoLCAnLS1wcmludC1yZXF1aXJlcyddLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUpCi0gICAgc3Rkb3V0ID0gcHJv Y2Vzcy5jb21tdW5pY2F0ZSgpWzBdCisgICAgc3Rkb3V0ID0gcHJvY2Vzcy5jb21tdW5pY2F0ZSgp WzBdLmRlY29kZSgidXRmLTgiKQogCiAgICAgaWYgJ2d0aystMy4wJyBpbiBzdGRvdXQ6CiAgICAg ICAgIHJldHVybiAzCmRpZmYgLS1naXQgYS9Ub29scy9ndGsvZ2VuZXJhdGUtZ3RrZG9jIGIvVG9v bHMvZ3RrL2dlbmVyYXRlLWd0a2RvYwppbmRleCA0ZmQ0NGJjODA3M2I2OTYzYjVjOTU1OTQ0ZGVi YjkyOGYzZWE5MTJlLi41YWYyZmMxODYwZWFkOTMwYzI5NzQxNDhiYjJlMGNiMTcwOWYzYzBhIDEw MDc1NQotLS0gYS9Ub29scy9ndGsvZ2VuZXJhdGUtZ3RrZG9jCisrKyBiL1Rvb2xzL2d0ay9nZW5l cmF0ZS1ndGtkb2MKQEAgLTE0Myw5ICsxNDMsOSBAQCBkZWYgcHJpbnRfbWlzc2luZ19hcGkoZ2Vu ZXJhdG9yKToKICAgICBtaXNzaW5nX2FwaSA9IGdlbmVyYXRvci5hcGlfbWlzc2luZ19kb2N1bWVu dGF0aW9uKCkKICAgICBpZiBub3QgbWlzc2luZ19hcGk6CiAgICAgICAgIHJldHVybgotICAgIHBy aW50ICJcblRoZSBmb2xsb3dpbmcgQVBJIGFyZSBtaXNzaW5nIGRvY3VtZW50YXRpb246IgorICAg IHByaW50KCJcblRoZSBmb2xsb3dpbmcgQVBJIGFyZSBtaXNzaW5nIGRvY3VtZW50YXRpb246IikK ICAgICBmb3IgYXBpIGluIG1pc3NpbmdfYXBpOgotICAgICAgICBwcmludCAiXHQlcyIgJSBhcGkK KyAgICAgICAgcHJpbnQoIlx0JXMiICUgYXBpKQogCiBkZWYgZ2VuZXJhdGVfZG9jKGdlbmVyYXRv cik6CiAgICAgZ2VuZXJhdG9yLmdlbmVyYXRlKGh0bWw9Jy0tc2tpcC1odG1sJyBub3QgaW4gc3lz LmFyZ3YpCkBAIC0xNzgsMjcgKzE3OCwyNyBAQCBpZiBvcy5wYXRoLmV4aXN0cyhwa2dfY29uZmln X3BhdGgpOgogICAgIG9wdGlvbnMgPSBnZXRfd2Via2l0MV9vcHRpb25zKGNvbW1vbi5ndGtfdmVy c2lvbl9vZl9wa2dfY29uZmlnX2ZpbGUocGtnX2NvbmZpZ19wYXRoKSkKICAgICBnZW5lcmF0b3Ig PSBndGtkb2MuUGtnQ29uZmlnR1RLRG9jKHBrZ19jb25maWdfcGF0aCwgb3B0aW9ucykKICAgICBp ZiAnLS1yZWJhc2UnIG5vdCBpbiBzeXMuYXJndjoKLSAgICAgICAgcHJpbnQgIkdlbmVyYXRpbmcg V2ViS2l0MSBkb2N1bWVudGF0aW9uLi4uIgorICAgICAgICBwcmludCgiR2VuZXJhdGluZyBXZWJL aXQxIGRvY3VtZW50YXRpb24uLi4iKQogICAgICAgICBzYXdfd2Via2l0MV93YXJuaW5ncyA9IGdl bmVyYXRlX2RvYyhnZW5lcmF0b3IpCiAgICAgZWxzZToKLSAgICAgICAgcHJpbnQgIlJlYmFzaW5n IFdlYktpdDEgZG9jdW1lbnRhdGlvbi4uLiIKKyAgICAgICAgcHJpbnQoIlJlYmFzaW5nIFdlYktp dDEgZG9jdW1lbnRhdGlvbi4uLiIpCiAgICAgICAgIHRyeToKICAgICAgICAgICAgIGdlbmVyYXRv ci5yZWJhc2VfaW5zdGFsbGVkX2RvY3MoKQotICAgICAgICBleGNlcHQgRXhjZXB0aW9uLGU6Ci0g ICAgICAgICAgICBwcmludCAiUmViYXNlIGRpZCBub3QgaGFwcGVuLCBsaWtlbHkgbm8gZG9jdW1l bnRhdGlvbiBpcyBwcmVzZW50LiIKKyAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbjoKKyAgICAgICAg ICAgIHByaW50KCJSZWJhc2UgZGlkIG5vdCBoYXBwZW4sIGxpa2VseSBubyBkb2N1bWVudGF0aW9u IGlzIHByZXNlbnQuIikKIAogIyBXZWJLaXQyIG1pZ2h0IG5vdCBiZSBlbmFibGVkLCBzbyBjaGVj ayBmb3IgdGhlIHBrZy1jb25maWcgZmlsZSBiZWZvcmUgYnVpbGRpbmcgZG9jdW1lbnRhdGlvbi4K IHBrZ19jb25maWdfcGF0aCA9IGNvbW1vbi5idWlsZF9wYXRoKCdTb3VyY2UnLCAnV2ViS2l0Mics ICd3ZWJraXQyZ3RrLTMuMC5wYycpCiBpZiBvcy5wYXRoLmV4aXN0cyhwa2dfY29uZmlnX3BhdGgp OgogICAgIGdlbmVyYXRvciA9IGd0a2RvYy5Qa2dDb25maWdHVEtEb2MocGtnX2NvbmZpZ19wYXRo LCBnZXRfd2Via2l0Ml9vcHRpb25zKCkpCiAgICAgaWYgJy0tcmViYXNlJyBub3QgaW4gc3lzLmFy Z3Y6Ci0gICAgICAgIHByaW50ICJcbkdlbmVyYXRpbmcgV2ViS2l0MiBkb2N1bWVudGF0aW9uLi4u IgorICAgICAgICBwcmludCgiXG5HZW5lcmF0aW5nIFdlYktpdDIgZG9jdW1lbnRhdGlvbi4uLiIp CiAgICAgICAgIHNhd193ZWJraXQyX3dhcm5pbmdzID0gZ2VuZXJhdGVfZG9jKGdlbmVyYXRvcikK ICAgICBlbHNlOgotICAgICAgICBwcmludCAiXG5SZWJhc2luZyBXZWJLaXQyIGRvY3VtZW50YXRp b24uLi4iCisgICAgICAgIHByaW50KCJcblJlYmFzaW5nIFdlYktpdDIgZG9jdW1lbnRhdGlvbi4u LiIpCiAgICAgICAgIHRyeToKICAgICAgICAgICAgIGdlbmVyYXRvci5yZWJhc2VfaW5zdGFsbGVk X2RvY3MoKQotICAgICAgICBleGNlcHQgRXhjZXB0aW9uLGU6Ci0gICAgICAgICAgICBwcmludCAi UmViYXNlIGRpZCBub3QgaGFwcGVuLCBsaWtlbHkgbm8gZG9jdW1lbnRhdGlvbiBpcyBwcmVzZW50 LiIKKyAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbjoKKyAgICAgICAgICAgIHByaW50KCJSZWJhc2Ug ZGlkIG5vdCBoYXBwZW4sIGxpa2VseSBubyBkb2N1bWVudGF0aW9uIGlzIHByZXNlbnQuIikKIAog c3lzLmV4aXQoc2F3X3dlYmtpdDFfd2FybmluZ3Mgb3Igc2F3X3dlYmtpdDJfd2FybmluZ3MpCmRp ZmYgLS1naXQgYS9Ub29scy9ndGsvZ3RrZG9jLnB5IGIvVG9vbHMvZ3RrL2d0a2RvYy5weQppbmRl eCA3ZjdmMGFkMzEzODA5NjAwY2IzMzljYjQ3OGYzNTI3NzVkZDYzNTJjLi4wY2JjY2YxZjdiYjVm MDc3NmJkZTM1NWUzNjRhYThiYmJjZjE5MWMwIDEwMDY0NAotLS0gYS9Ub29scy9ndGsvZ3RrZG9j LnB5CisrKyBiL1Rvb2xzL2d0ay9ndGtkb2MucHkKQEAgLTEwNyw3ICsxMDcsNyBAQCBjbGFzcyBH VEtEb2Mob2JqZWN0KToKIAogICAgICAgICBzZWxmLmxvZ2dlciA9IGxvZ2dpbmcuZ2V0TG9nZ2Vy KCdndGtkb2MnKQogCi0gICAgICAgIGZvciBrZXksIHZhbHVlIGluIGFyZ3MuaXRlcml0ZW1zKCk6 CisgICAgICAgIGZvciBrZXksIHZhbHVlIGluIGl0ZXIoYXJncy5pdGVtcygpKToKICAgICAgICAg ICAgIHNldGF0dHIoc2VsZiwga2V5LCB2YWx1ZSkKIAogICAgICAgICBkZWYgcmFpc2VfZXJyb3Jf aWZfbm90X3NwZWNpZmllZChrZXkpOgpAQCAtMTg1LDcgKzE4NSw3IEBAIGNsYXNzIEdUS0RvYyhv YmplY3QpOgogICAgICAgICBwcm9jZXNzID0gc3VicHJvY2Vzcy5Qb3BlbihhcmdzLCBlbnY9ZW52 LCBjd2Q9Y3dkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGRvdXQ9c3Vi cHJvY2Vzcy5QSVBFLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGRlcnI9 c3VicHJvY2Vzcy5QSVBFKQotICAgICAgICBzdGRvdXQsIHN0ZGVyciA9IHByb2Nlc3MuY29tbXVu aWNhdGUoKQorICAgICAgICBzdGRvdXQsIHN0ZGVyciA9IFtiLmRlY29kZSgidXRmLTgiKSBmb3Ig YiBpbiBwcm9jZXNzLmNvbW11bmljYXRlKCldCiAKICAgICAgICAgaWYgcHJpbnRfb3V0cHV0Ogog ICAgICAgICAgICAgaWYgc3Rkb3V0Ogo=