89135 2012-06-14 15:44:32 -0700 webkitpy: remove DummyOptions and clean up the code in Port.get_option() and Port.set_option_default() 2012-06-15 13:25:46 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 89183 87413 1 dpranke dpranke abarth eric levin ojan rniwa tony webkit.review.bot oldest_to_newest 649558 0 dpranke 2012-06-14 15:44:32 -0700 webkitpy: remove DummyOptions and clean up the code in Port.get_option() and Port.set_option_default() 649562 1 147667 dpranke 2012-06-14 15:45:30 -0700 Created attachment 147667 Patch 649567 2 rniwa 2012-06-14 15:47:47 -0700 Yay! I love deleting code. 649610 3 dpranke 2012-06-14 16:18:21 -0700 Committed r120370: <http://trac.webkit.org/changeset/120370> 649980 4 webkit.review.bot 2012-06-15 00:48:32 -0700 Re-opened since this is blocked by 89183 650449 5 147885 dpranke 2012-06-15 13:18:39 -0700 Created attachment 147885 Patch 650452 6 dpranke 2012-06-15 13:25:46 -0700 Committed r120488: <http://trac.webkit.org/changeset/120488> 147667 2012-06-14 15:45:30 -0700 2012-06-15 13:18:35 -0700 Patch bug-89135-20120614154529.patch text/plain 7883 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMzU4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDEwZGIxMGFiZGUyYzIyMjZhNWUyN2UzYzNhMjQ5YzY0 MzNiMmFmZi4uODg5MjBiYjI3YjM3ZTQ3MTkxZDQwZGEzNDgzNjVlMTliMzcwZWM0YyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDEyLTA2LTE0ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIHdlYmtpdHB5OiByZW1vdmUgRHVtbXlPcHRpb25zIGFuZCBjbGVhbiB1cCB0aGUgY29k ZSBpbiBQb3J0LmdldF9vcHRpb24oKSBhbmQgUG9ydC5zZXRfb3B0aW9uX2RlZmF1bHQoKQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkxMzUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGlz IGp1c3Qgc29tZSBtaW5vciBjbGVhbnVwIGFuZCBzaW1wbGlmaWNhdGlvbi4gVGhlcmUKKyAgICAg ICAgc2hvdWxkIGJlIG5vIGZ1bmN0aW9uYWwgY2hhbmdlcyBoZXJlLgorCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5OgorICAgICAgICAoUG9ydC5f X2luaXRfXyk6CisgICAgICAgIChQb3J0LmdldF9vcHRpb24pOgorICAgICAgICAoUG9ydC5zZXRf b3B0aW9uX2RlZmF1bHQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvY2hyb21pdW1fd2luX3VuaXR0ZXN0LnB5OgorICAgICAgICAoQ2hyb21pdW1XaW5UZXN0 LnRlc3Rfc2V0dXBfZW52aXJvbl9mb3Jfc2VydmVyX3JlZ2lzdGVyX2N5Z3dpbik6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy90ZXN0X2V4cGVjdGF0aW9ucy5weToK KyAgICAgICAgKFRlc3RFeHBlY3RhdGlvbnNDaGVja2VyLl9kZXRlcm1pbmVfcG9ydF9mcm9tX2V4 cGVjdGF0aW9uc19wYXRoKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbW9ja3Rv b2wucHk6CisgICAgICAgIChNb2NrT3B0aW9ucy5lbnN1cmVfdmFsdWUpOgorCiAyMDEyLTA2LTE0 ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBV bnJldmlld2VkLCByb2xsaW5nIG91dCByMTIwMzUyLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CmluZGV4IGNmMjk2MGQwOTAxMjljMmYxM2Yz YWYzOTVmNjQzOGQyN2ZmODExMjkuLjYyZmJkY2VlZDYxODcyNGEzMTYwNDM1M2U4ZGM5MDk5NzU0 OWNmOTUgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvYmFzZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2Jhc2UucHkKQEAgLTM0LDYgKzM0LDcgQEAgaW1wb3J0IGNnaQogaW1wb3J0IGRpZmZsaWIKIGlt cG9ydCBlcnJubwogaW1wb3J0IG9zCitpbXBvcnQgb3B0cGFyc2UKIGltcG9ydCByZQogCiB0cnk6 CkBAIC02MSwxOSArNjIsNiBAQCBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5zZXJ2ZXJzIGlt cG9ydCB3ZWJzb2NrZXRfc2VydmVyCiBfbG9nID0gbG9ndXRpbHMuZ2V0X2xvZ2dlcihfX2ZpbGVf XykKIAogCi1jbGFzcyBEdW1teU9wdGlvbnMob2JqZWN0KToKLSAgICAiIiJGYWtlIGltcGxlbWVu dGF0aW9uIG9mIG9wdHBhcnNlLlZhbHVlcy4gQ2xvbmVkIGZyb20gd2Via2l0cHkudG9vbC5tb2Nr dG9vbC5Nb2NrT3B0aW9ucy4iIiIKLQotICAgIGRlZiBfX2luaXRfXyhzZWxmLCAqYXJncywgKipr d2FyZ3MpOgotICAgICAgICAjIFRoZSBjYWxsZXIgY2FuIHNldCBvcHRpb24gdmFsdWVzIHVzaW5n IGtleXdvcmQgYXJndW1lbnRzLiBXZSBkb24ndAotICAgICAgICAjIHNldCBhbnkgdmFsdWVzIGJ5 IGRlZmF1bHQgYmVjYXVzZSB3ZSBkb24ndCBrbm93IGhvdyB0aGlzCi0gICAgICAgICMgb2JqZWN0 IHdpbGwgYmUgdXNlZC4gR2VuZXJhbGx5IHNwZWFraW5nIHVuaXQgdGVzdHMgc2hvdWxkCi0gICAg ICAgICMgc3ViY2xhc3MgdGhpcyBvciBwcm92aWRlciB3cmFwcGVyIGZ1bmN0aW9ucyB0aGF0IHNl dCBhIGNvbW1vbgotICAgICAgICAjIHNldCBvZiBvcHRpb25zLgotICAgICAgICBmb3Iga2V5LCB2 YWx1ZSBpbiBrd2FyZ3MuaXRlbXMoKToKLSAgICAgICAgICAgIHNlbGYuX19kaWN0X19ba2V5XSA9 IHZhbHVlCi0KLQogIyBGSVhNRTogVGhpcyBjbGFzcyBzaG91bGQgbWVyZ2Ugd2l0aCBXZWJLaXRQ b3J0IG5vdyB0aGF0IENocm9taXVtIGJlaGF2ZXMgbW9zdGx5IGxpa2Ugb3RoZXIgd2Via2l0IHBv cnRzLgogY2xhc3MgUG9ydChvYmplY3QpOgogICAgICIiIkFic3RyYWN0IGNsYXNzIGZvciBQb3J0 LXNwZWNpZmljIGhvb2tzIGZvciB0aGUgbGF5b3V0X3Rlc3QgcGFja2FnZS4iIiIKQEAgLTExMSw3 ICs5OSw3IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAgICAgIyBGSVhNRTogSWRlYWxseSB3 ZSdkIGhhdmUgYSBwYWNrYWdlLXdpZGUgd2F5IHRvIGdldCBhCiAgICAgICAgICMgd2VsbC1mb3Jt ZWQgb3B0aW9ucyBvYmplY3QgdGhhdCBoYWQgYWxsIG9mIHRoZSBuZWNlc3NhcnkKICAgICAgICAg IyBvcHRpb25zIGRlZmluZWQgb24gaXQuCi0gICAgICAgIHNlbGYuX29wdGlvbnMgPSBvcHRpb25z IG9yIER1bW15T3B0aW9ucygpCisgICAgICAgIHNlbGYuX29wdGlvbnMgPSBvcHRpb25zIG9yIG9w dHBhcnNlLlZhbHVlcygpCiAKICAgICAgICAgc2VsZi5ob3N0ID0gaG9zdAogICAgICAgICBzZWxm Ll9leGVjdXRpdmUgPSBob3N0LmV4ZWN1dGl2ZQpAQCAtNjc4LDE4ICs2NjYsMTAgQEAgY2xhc3Mg UG9ydChvYmplY3QpOgogICAgICAgICByZXR1cm4gc2VsZi5fYXJjaGl0ZWN0dXJlCiAKICAgICBk ZWYgZ2V0X29wdGlvbihzZWxmLCBuYW1lLCBkZWZhdWx0X3ZhbHVlPU5vbmUpOgotICAgICAgICAj IEZJWE1FOiBFdmVudHVhbGx5IHdlIHNob3VsZCBub3QgaGF2ZSB0byBkbyBhIHRlc3QgZm9yCi0g ICAgICAgICMgaGFzYXR0cigpLCBhbmQgd2Ugc2hvdWxkIGJlIGFibGUgdG8ganVzdCBkbwotICAg ICAgICAjIHNlbGYub3B0aW9ucy52YWx1ZS4gU2VlIGFkZGl0aW9uYWwgRklYTUUgaW4gdGhlIGNv bnN0cnVjdG9yLgotICAgICAgICBpZiBoYXNhdHRyKHNlbGYuX29wdGlvbnMsIG5hbWUpOgotICAg ICAgICAgICAgcmV0dXJuIGdldGF0dHIoc2VsZi5fb3B0aW9ucywgbmFtZSkKLSAgICAgICAgcmV0 dXJuIGRlZmF1bHRfdmFsdWUKKyAgICAgICAgcmV0dXJuIGdldGF0dHIoc2VsZi5fb3B0aW9ucywg bmFtZSwgZGVmYXVsdF92YWx1ZSkKIAogICAgIGRlZiBzZXRfb3B0aW9uX2RlZmF1bHQoc2VsZiwg bmFtZSwgZGVmYXVsdF92YWx1ZSk6Ci0gICAgICAgICMgRklYTUU6IENhbGxlcnMgY291bGQgYWxz byB1c2Ugb3B0cGFyc2VfcGFyc2VyLlZhbHVlcy5lbnN1cmVfdmFsdWUsCi0gICAgICAgICMgc2lu Y2UgdGhpcyBzaG91bGQgYWx3YXlzIGJlIGEgb3B0cGFyc2VfcGFyc2VyLlZhbHVlcyBvYmplY3Qu Ci0gICAgICAgIGlmIG5vdCBoYXNhdHRyKHNlbGYuX29wdGlvbnMsIG5hbWUpIG9yIGdldGF0dHIo c2VsZi5fb3B0aW9ucywgbmFtZSkgaXMgTm9uZToKLSAgICAgICAgICAgIHJldHVybiBzZXRhdHRy KHNlbGYuX29wdGlvbnMsIG5hbWUsIGRlZmF1bHRfdmFsdWUpCisgICAgICAgIHJldHVybiBzZWxm Ll9vcHRpb25zLmVuc3VyZV92YWx1ZShuYW1lLCBkZWZhdWx0X3ZhbHVlKQogCiAgICAgZGVmIHBh dGhfZnJvbV93ZWJraXRfYmFzZShzZWxmLCAqY29tcHMpOgogICAgICAgICAiIiJSZXR1cm5zIHRo ZSBmdWxsIHBhdGggdG8gcGF0aCBtYWRlIGJ5IGpvaW5pbmcgdGhlIHRvcCBvZiB0aGUKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1f d2luX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9jaHJvbWl1bV93aW5fdW5pdHRlc3QucHkKaW5kZXggY2MxNDgzODU0YTkyZjJlNzg4MjEwZGJh MjU0OTEzZDZlNGEyOWEzMy4uNzU5YmM3ZTFkYzM0OWE3YjQxOTUwNDYyM2RiMDVjMGNkMDU1NjU0 NCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9j aHJvbWl1bV93aW5fdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93aW5fdW5pdHRlc3QucHkKQEAgLTM4LDExICszOCw2IEBA IGZyb20gd2Via2l0cHkudG9vbC5tb2NrdG9vbCBpbXBvcnQgTW9ja09wdGlvbnMKIAogCiBjbGFz cyBDaHJvbWl1bVdpblRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgotICAgIGNsYXNz IFJlZ2lzdGVyQ3lnd2luT3B0aW9uKG9iamVjdCk6Ci0gICAgICAgIGRlZiBfX2luaXRfXyhzZWxm KToKLSAgICAgICAgICAgIHNlbGYucmVnaXN0ZXJfY3lnd2luID0gVHJ1ZQotICAgICAgICAgICAg c2VsZi5yZXN1bHRzX2RpcmVjdG9yeSA9ICcvJwotCiAgICAgcG9ydF9uYW1lID0gJ2Nocm9taXVt LXdpbicKICAgICBwb3J0X21ha2VyID0gY2hyb21pdW1fd2luLkNocm9taXVtV2luUG9ydAogICAg IG9zX25hbWUgPSAnd2luJwpAQCAtNjcsNyArNjIsNyBAQCBjbGFzcyBDaHJvbWl1bVdpblRlc3Qo cG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhl bnZbJ0NZR1dJTl9QQVRIJ10sICcvbW9jay1jaGVja291dC9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3RoaXJkX3BhcnR5L2N5Z3dpbi9iaW4nKQogCiAgICAgZGVmIHRlc3Rfc2V0dXBfZW52aXJvbl9m b3Jfc2VydmVyX3JlZ2lzdGVyX2N5Z3dpbihzZWxmKToKLSAgICAgICAgcG9ydCA9IHNlbGYubWFr ZV9wb3J0KG9wdGlvbnM9Q2hyb21pdW1XaW5UZXN0LlJlZ2lzdGVyQ3lnd2luT3B0aW9uKCkpCisg ICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydChvcHRpb25zPU1vY2tPcHRpb25zKHJlZ2lzdGVy X2N5Z3dpbj1UcnVlLCByZXN1bHRzX2RpcmVjdG9yeT0nLycpKQogICAgICAgICBwb3J0Ll9leGVj dXRpdmUgPSBNb2NrRXhlY3V0aXZlKHNob3VsZF9sb2c9VHJ1ZSkKICAgICAgICAgZXhwZWN0ZWRf c3RkZXJyID0gIk1PQ0sgcnVuX2NvbW1hbmQ6IFsnL21vY2stY2hlY2tvdXQvU291cmNlL1dlYktp dC9jaHJvbWl1bS90aGlyZF9wYXJ0eS9jeWd3aW4vc2V0dXBfbW91bnQuYmF0J10sIGN3ZD1Ob25l XG4iCiAgICAgICAgIG91dHB1dCA9IG91dHB1dGNhcHR1cmUuT3V0cHV0Q2FwdHVyZSgpCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rlc3RfZXhwZWN0 YXRpb25zLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy90ZXN0X2V4 cGVjdGF0aW9ucy5weQppbmRleCBmNTQxOWU5ZWNiYmU3ZDMwNWZhZDE2MDNlNTM2YWYzNmMwMmU4 NTk0Li5jOTVjNDEyMGY2MzRiMGY4NTQwMjNhZGZiMTg5NjM5MzZiMDQ5OTdmIDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rlc3RfZXhwZWN0YXRpb25z LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvdGVzdF9leHBl Y3RhdGlvbnMucHkKQEAgLTI5LDYgKzI5LDcgQEAKICIiIkNoZWNrcyBXZWJLaXQgc3R5bGUgZm9y IHRlc3RfZXhwZWN0YXRpb25zIGZpbGVzLiIiIgogCiBpbXBvcnQgbG9nZ2luZworaW1wb3J0IG9w dHBhcnNlCiBpbXBvcnQgb3MKIGltcG9ydCByZQogaW1wb3J0IHN5cwpAQCAtMzYsNyArMzcsNiBA QCBpbXBvcnQgc3lzCiBmcm9tIGNvbW1vbiBpbXBvcnQgVGFiQ2hlY2tlcgogZnJvbSB3ZWJraXRw eS5jb21tb24uaG9zdCBpbXBvcnQgSG9zdAogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9k ZWxzLnRlc3RfZXhwZWN0YXRpb25zIGltcG9ydCBUZXN0RXhwZWN0YXRpb25QYXJzZXIKLWZyb20g d2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQuYmFzZSBpbXBvcnQgRHVtbXlPcHRpb25zCiAKIAog X2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQpAQCAtNDksNyArNDksNyBAQCBjbGFz cyBUZXN0RXhwZWN0YXRpb25zQ2hlY2tlcihvYmplY3QpOgogCiAgICAgZGVmIF9kZXRlcm1pbmVf cG9ydF9mcm9tX2V4cGVjdGF0aW9uc19wYXRoKHNlbGYsIGhvc3QsIGV4cGVjdGF0aW9uc19wYXRo KToKICAgICAgICAgIyBQYXNzIGEgY29uZmlndXJhdGlvbiB0byBhdm9pZCBjYWxsaW5nIGRlZmF1 bHRfY29uZmlndXJhdGlvbigpIHdoZW4gaW5pdGlhbGl6aW5nIHRoZSBwb3J0ICh0YWtlcyAwLjUg c2Vjb25kcyBvbiBhIE1hYyBQcm8hKS4KLSAgICAgICAgb3B0aW9ucyA9IER1bW15T3B0aW9ucyhj b25maWd1cmF0aW9uPSdSZWxlYXNlJykKKyAgICAgICAgb3B0aW9ucyA9IG9wdHBhcnNlLlZhbHVl cyh7J2NvbmZpZ3VyYXRpb24nOiAnUmVsZWFzZSd9KQogICAgICAgICBmb3IgcG9ydF9uYW1lIGlu IGhvc3QucG9ydF9mYWN0b3J5LmFsbF9wb3J0X25hbWVzKCk6CiAgICAgICAgICAgICBwb3J0ID0g aG9zdC5wb3J0X2ZhY3RvcnkuZ2V0KHBvcnRfbmFtZSwgb3B0aW9ucz1vcHRpb25zKQogICAgICAg ICAgICAgaWYgcG9ydC5wYXRoX3RvX3Rlc3RfZXhwZWN0YXRpb25zX2ZpbGUoKS5yZXBsYWNlKHBv cnQucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCkgKyBob3N0LmZpbGVzeXN0ZW0uc2VwLCAnJykgPT0g ZXhwZWN0YXRpb25zX3BhdGg6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvbW9ja3Rvb2wucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbW9ja3Rvb2wucHkK aW5kZXggNTVmZGU2NGFkZWM2NzhhNDM0NTBlNGU5NmIxYTBiNGVlNDRmZjI1ZC4uMjFlZTkxZmM5 ZGI5ODI3NzM0ZDJlNjExMDgzYzBjNWZjMDUxNjk2ZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL21vY2t0b29sLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9tb2NrdG9vbC5weQpAQCAtMzYsOCArMzYsNyBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5u ZXQuaXJjLmlyY19tb2NrIGltcG9ydCBNb2NrSVJDCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5jb25m aWcucG9ydHNfbW9jayBpbXBvcnQgTW9ja1BvcnQKIAogCi0jIEZJWE1FOiBUaGlzIHNob3VsZCBi ZSBtb3ZlZCBzb21ld2hlcmUgaW4gY29tbW9uIGFuZCByZW5hbWVkCi0jIHNvbWV0aGluZyB3aXRo b3V0IE1vY2sgaW4gdGhlIG5hbWUuCisjIEZJWE1FOiBXZSBzaG91bGQganVzdCByZXBsYWNlIHRo aXMgd2l0aCBvcHRwYXJzZS5WYWx1ZXMoZGVmYXVsdD1rd2FyZ3MpCiBjbGFzcyBNb2NrT3B0aW9u cyhvYmplY3QpOgogICAgICIiIk1vY2sgaW1wbGVtZW50YXRpb24gb2Ygb3B0cGFyc2UuVmFsdWVz LiIiIgogCkBAIC01Myw2ICs1MiwxMSBAQCBjbGFzcyBNb2NrT3B0aW9ucyhvYmplY3QpOgogICAg ICAgICBzZWxmLl9fZGljdF9fLnVwZGF0ZSgqKmt3YXJncykKICAgICAgICAgcmV0dXJuIHNlbGYK IAorICAgIGRlZiBlbnN1cmVfdmFsdWUoc2VsZiwga2V5LCB2YWx1ZSk6CisgICAgICAgIGlmIGdl dGF0dHIoc2VsZiwga2V5LCBOb25lKSA9PSBOb25lOgorICAgICAgICAgICAgc2VsZi5fX2RpY3Rf X1trZXldID0gdmFsdWUKKyAgICAgICAgcmV0dXJuIHNlbGYuX19kaWN0X19ba2V5XQorCiAKICMg RklYTUU6IFRoaXMgc2hvdWxkIGJlIHJlbmFtZWQgTW9ja1dlYktpdFBhdGNoLgogY2xhc3MgTW9j a1Rvb2woTW9ja0hvc3QpOgo= 147885 2012-06-15 13:18:39 -0700 2012-06-15 13:21:20 -0700 Patch bug-89135-20120615131838.patch text/plain 10388 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwNDgyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMmY2YWFmOWI0MWQ1NmY4M2ZhOTVmZDJlODEyZTU3ODEz MzEzNDc0ZC4uNDM3MjdkMDJhYzhkZWUxNDcwMTZiMTBlMWRmMmQ3ZmY5MTY0ZDk3MCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDEyLTA2LTE1ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIHdlYmtpdHB5OiByZW1vdmUgRHVtbXlPcHRpb25zIGFuZCBjbGVhbiB1cCB0aGUgY29k ZSBpbiBQb3J0LmdldF9vcHRpb24oKSBhbmQgUG9ydC5zZXRfb3B0aW9uX2RlZmF1bHQoKQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkxMzUKKworICAg ICAgICBSZS1sYW5kIGNoYW5nZSBpbiByMTIwMzcwIHdpdGggZml4IGluCisgICAgICAgIFBvcnRG YWN0b3J5LmdldF9mcm9tX2J1aWxkZXJfbmFtZSgpIHRoYXQgY2hhbmdlcyBCdWlsZGVyT3B0aW9u cworICAgICAgICB0byBhbiBhY3R1YWwgb3B0cGFyc2UuVmFsdWVzIG9iamVjdC4KKworICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weToKKyAgICAgICAg KFBvcnQuX19pbml0X18pOgorICAgICAgICAoUG9ydC5nZXRfb3B0aW9uKToKKyAgICAgICAgKFBv cnQuc2V0X29wdGlvbl9kZWZhdWx0KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Nocm9taXVtX3dpbl91bml0dGVzdC5weToKKyAgICAgICAgKENocm9taXVt V2luVGVzdC50ZXN0X3NldHVwX2Vudmlyb25fZm9yX3NlcnZlcl9yZWdpc3Rlcl9jeWd3aW4pOgor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZmFjdG9yeS5weToK KyAgICAgICAgKF9idWlsZGVyX29wdGlvbnMpOgorICAgICAgICAoUG9ydEZhY3RvcnkuZ2V0X2Zy b21fYnVpbGRlcl9uYW1lKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2ZhY3RvcnlfdW5pdHRlc3QucHk6CisgICAgICAgIChGYWN0b3J5VGVzdC50ZXN0X2dl dF9mcm9tX2J1aWxkZXJfbmFtZSk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9j aGVja2Vycy90ZXN0X2V4cGVjdGF0aW9ucy5weToKKyAgICAgICAgKFRlc3RFeHBlY3RhdGlvbnND aGVja2VyLl9kZXRlcm1pbmVfcG9ydF9mcm9tX2V4cGVjdGF0aW9uc19wYXRoKToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbW9ja3Rvb2wucHk6CisgICAgICAgIChNb2NrT3B0aW9u cy5lbnN1cmVfdmFsdWUpOgorCiAyMDEyLTA2LTE1ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5 QHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBzdHlsZSBmaXggYWZ0ZXIgcjEyMDM1 MS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv YmFzZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5w eQppbmRleCBjZjI5NjBkMDkwMTI5YzJmMTNmM2FmMzk1ZjY0MzhkMjdmZjgxMTI5Li42MmZiZGNl ZWQ2MTg3MjRhMzE2MDQzNTNlOGRjOTA5OTc1NDljZjk1IDEwMDc1NQotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CkBAIC0zNCw2ICszNCw3IEBAIGlt cG9ydCBjZ2kKIGltcG9ydCBkaWZmbGliCiBpbXBvcnQgZXJybm8KIGltcG9ydCBvcworaW1wb3J0 IG9wdHBhcnNlCiBpbXBvcnQgcmUKIAogdHJ5OgpAQCAtNjEsMTkgKzYyLDYgQEAgZnJvbSB3ZWJr aXRweS5sYXlvdXRfdGVzdHMuc2VydmVycyBpbXBvcnQgd2Vic29ja2V0X3NlcnZlcgogX2xvZyA9 IGxvZ3V0aWxzLmdldF9sb2dnZXIoX19maWxlX18pCiAKIAotY2xhc3MgRHVtbXlPcHRpb25zKG9i amVjdCk6Ci0gICAgIiIiRmFrZSBpbXBsZW1lbnRhdGlvbiBvZiBvcHRwYXJzZS5WYWx1ZXMuIENs b25lZCBmcm9tIHdlYmtpdHB5LnRvb2wubW9ja3Rvb2wuTW9ja09wdGlvbnMuIiIiCi0KLSAgICBk ZWYgX19pbml0X18oc2VsZiwgKmFyZ3MsICoqa3dhcmdzKToKLSAgICAgICAgIyBUaGUgY2FsbGVy IGNhbiBzZXQgb3B0aW9uIHZhbHVlcyB1c2luZyBrZXl3b3JkIGFyZ3VtZW50cy4gV2UgZG9uJ3QK LSAgICAgICAgIyBzZXQgYW55IHZhbHVlcyBieSBkZWZhdWx0IGJlY2F1c2Ugd2UgZG9uJ3Qga25v dyBob3cgdGhpcwotICAgICAgICAjIG9iamVjdCB3aWxsIGJlIHVzZWQuIEdlbmVyYWxseSBzcGVh a2luZyB1bml0IHRlc3RzIHNob3VsZAotICAgICAgICAjIHN1YmNsYXNzIHRoaXMgb3IgcHJvdmlk ZXIgd3JhcHBlciBmdW5jdGlvbnMgdGhhdCBzZXQgYSBjb21tb24KLSAgICAgICAgIyBzZXQgb2Yg b3B0aW9ucy4KLSAgICAgICAgZm9yIGtleSwgdmFsdWUgaW4ga3dhcmdzLml0ZW1zKCk6Ci0gICAg ICAgICAgICBzZWxmLl9fZGljdF9fW2tleV0gPSB2YWx1ZQotCi0KICMgRklYTUU6IFRoaXMgY2xh c3Mgc2hvdWxkIG1lcmdlIHdpdGggV2ViS2l0UG9ydCBub3cgdGhhdCBDaHJvbWl1bSBiZWhhdmVz IG1vc3RseSBsaWtlIG90aGVyIHdlYmtpdCBwb3J0cy4KIGNsYXNzIFBvcnQob2JqZWN0KToKICAg ICAiIiJBYnN0cmFjdCBjbGFzcyBmb3IgUG9ydC1zcGVjaWZpYyBob29rcyBmb3IgdGhlIGxheW91 dF90ZXN0IHBhY2thZ2UuIiIiCkBAIC0xMTEsNyArOTksNyBAQCBjbGFzcyBQb3J0KG9iamVjdCk6 CiAgICAgICAgICMgRklYTUU6IElkZWFsbHkgd2UnZCBoYXZlIGEgcGFja2FnZS13aWRlIHdheSB0 byBnZXQgYQogICAgICAgICAjIHdlbGwtZm9ybWVkIG9wdGlvbnMgb2JqZWN0IHRoYXQgaGFkIGFs bCBvZiB0aGUgbmVjZXNzYXJ5CiAgICAgICAgICMgb3B0aW9ucyBkZWZpbmVkIG9uIGl0LgotICAg ICAgICBzZWxmLl9vcHRpb25zID0gb3B0aW9ucyBvciBEdW1teU9wdGlvbnMoKQorICAgICAgICBz ZWxmLl9vcHRpb25zID0gb3B0aW9ucyBvciBvcHRwYXJzZS5WYWx1ZXMoKQogCiAgICAgICAgIHNl bGYuaG9zdCA9IGhvc3QKICAgICAgICAgc2VsZi5fZXhlY3V0aXZlID0gaG9zdC5leGVjdXRpdmUK QEAgLTY3OCwxOCArNjY2LDEwIEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAgICAgcmV0dXJu IHNlbGYuX2FyY2hpdGVjdHVyZQogCiAgICAgZGVmIGdldF9vcHRpb24oc2VsZiwgbmFtZSwgZGVm YXVsdF92YWx1ZT1Ob25lKToKLSAgICAgICAgIyBGSVhNRTogRXZlbnR1YWxseSB3ZSBzaG91bGQg bm90IGhhdmUgdG8gZG8gYSB0ZXN0IGZvcgotICAgICAgICAjIGhhc2F0dHIoKSwgYW5kIHdlIHNo b3VsZCBiZSBhYmxlIHRvIGp1c3QgZG8KLSAgICAgICAgIyBzZWxmLm9wdGlvbnMudmFsdWUuIFNl ZSBhZGRpdGlvbmFsIEZJWE1FIGluIHRoZSBjb25zdHJ1Y3Rvci4KLSAgICAgICAgaWYgaGFzYXR0 cihzZWxmLl9vcHRpb25zLCBuYW1lKToKLSAgICAgICAgICAgIHJldHVybiBnZXRhdHRyKHNlbGYu X29wdGlvbnMsIG5hbWUpCi0gICAgICAgIHJldHVybiBkZWZhdWx0X3ZhbHVlCisgICAgICAgIHJl dHVybiBnZXRhdHRyKHNlbGYuX29wdGlvbnMsIG5hbWUsIGRlZmF1bHRfdmFsdWUpCiAKICAgICBk ZWYgc2V0X29wdGlvbl9kZWZhdWx0KHNlbGYsIG5hbWUsIGRlZmF1bHRfdmFsdWUpOgotICAgICAg ICAjIEZJWE1FOiBDYWxsZXJzIGNvdWxkIGFsc28gdXNlIG9wdHBhcnNlX3BhcnNlci5WYWx1ZXMu ZW5zdXJlX3ZhbHVlLAotICAgICAgICAjIHNpbmNlIHRoaXMgc2hvdWxkIGFsd2F5cyBiZSBhIG9w dHBhcnNlX3BhcnNlci5WYWx1ZXMgb2JqZWN0LgotICAgICAgICBpZiBub3QgaGFzYXR0cihzZWxm Ll9vcHRpb25zLCBuYW1lKSBvciBnZXRhdHRyKHNlbGYuX29wdGlvbnMsIG5hbWUpIGlzIE5vbmU6 Ci0gICAgICAgICAgICByZXR1cm4gc2V0YXR0cihzZWxmLl9vcHRpb25zLCBuYW1lLCBkZWZhdWx0 X3ZhbHVlKQorICAgICAgICByZXR1cm4gc2VsZi5fb3B0aW9ucy5lbnN1cmVfdmFsdWUobmFtZSwg ZGVmYXVsdF92YWx1ZSkKIAogICAgIGRlZiBwYXRoX2Zyb21fd2Via2l0X2Jhc2Uoc2VsZiwgKmNv bXBzKToKICAgICAgICAgIiIiUmV0dXJucyB0aGUgZnVsbCBwYXRoIHRvIHBhdGggbWFkZSBieSBq b2luaW5nIHRoZSB0b3Agb2YgdGhlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3dpbl91bml0dGVzdC5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luX3VuaXR0ZXN0LnB5Cmlu ZGV4IGNjMTQ4Mzg1NGE5MmYyZTc4ODIxMGRiYTI1NDkxM2Q2ZTRhMjlhMzMuLjc1OWJjN2UxZGMz NDlhN2I0MTk1MDQ2MjNkYjA1YzBjZDA1NTY1NDQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luX3VuaXR0ZXN0LnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luX3Vu aXR0ZXN0LnB5CkBAIC0zOCwxMSArMzgsNiBAQCBmcm9tIHdlYmtpdHB5LnRvb2wubW9ja3Rvb2wg aW1wb3J0IE1vY2tPcHRpb25zCiAKIAogY2xhc3MgQ2hyb21pdW1XaW5UZXN0KHBvcnRfdGVzdGNh c2UuUG9ydFRlc3RDYXNlKToKLSAgICBjbGFzcyBSZWdpc3RlckN5Z3dpbk9wdGlvbihvYmplY3Qp OgotICAgICAgICBkZWYgX19pbml0X18oc2VsZik6Ci0gICAgICAgICAgICBzZWxmLnJlZ2lzdGVy X2N5Z3dpbiA9IFRydWUKLSAgICAgICAgICAgIHNlbGYucmVzdWx0c19kaXJlY3RvcnkgPSAnLycK LQogICAgIHBvcnRfbmFtZSA9ICdjaHJvbWl1bS13aW4nCiAgICAgcG9ydF9tYWtlciA9IGNocm9t aXVtX3dpbi5DaHJvbWl1bVdpblBvcnQKICAgICBvc19uYW1lID0gJ3dpbicKQEAgLTY3LDcgKzYy LDcgQEAgY2xhc3MgQ2hyb21pdW1XaW5UZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFRlc3RDYXNlKToK ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoZW52WydDWUdXSU5fUEFUSCddLCAnL21vY2stY2hl Y2tvdXQvU291cmNlL1dlYktpdC9jaHJvbWl1bS90aGlyZF9wYXJ0eS9jeWd3aW4vYmluJykKIAog ICAgIGRlZiB0ZXN0X3NldHVwX2Vudmlyb25fZm9yX3NlcnZlcl9yZWdpc3Rlcl9jeWd3aW4oc2Vs Zik6Ci0gICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydChvcHRpb25zPUNocm9taXVtV2luVGVz dC5SZWdpc3RlckN5Z3dpbk9wdGlvbigpKQorICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQo b3B0aW9ucz1Nb2NrT3B0aW9ucyhyZWdpc3Rlcl9jeWd3aW49VHJ1ZSwgcmVzdWx0c19kaXJlY3Rv cnk9Jy8nKSkKICAgICAgICAgcG9ydC5fZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2ZShzaG91bGRf bG9nPVRydWUpCiAgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJNT0NLIHJ1bl9jb21tYW5kOiBb Jy9tb2NrLWNoZWNrb3V0L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGhpcmRfcGFydHkvY3lnd2lu L3NldHVwX21vdW50LmJhdCddLCBjd2Q9Tm9uZVxuIgogICAgICAgICBvdXRwdXQgPSBvdXRwdXRj YXB0dXJlLk91dHB1dENhcHR1cmUoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0b3J5LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9mYWN0b3J5LnB5CmluZGV4IDk2MzAxNDNjZjY2MmMzMWE5OTlmNGRk YzA5YzQwNGQyMDMzYmY5MjEuLjg4MWE4MGJlYzE0ODFlNmVmMmU2NTE3YTcyYjNjOTQ2NjNiNGRk MmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv ZmFjdG9yeS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2ZhY3RvcnkucHkKQEAgLTU4LDEwICs1OCwxMCBAQCBkZWYgcG9ydF9vcHRpb25zKCoqaGVscF9z dHJpbmdzKToKICAgICAgICAgICAgIGhlbHA9J3VzZSAzMi1iaXQgYmluYXJpZXMgYnkgZGVmYXVs dCAoeDg2IGluc3RlYWQgb2YgeDg2XzY0KScpXQogCiAKLWNsYXNzIEJ1aWxkZXJPcHRpb25zKG9i amVjdCk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIGJ1aWxkZXJfbmFtZSk6Ci0gICAgICAgIHNl bGYuY29uZmlndXJhdGlvbiA9ICJEZWJ1ZyIgaWYgcmUuc2VhcmNoKHIiW2R8RF0oZWJ1fGIpZyIs IGJ1aWxkZXJfbmFtZSkgZWxzZSAiUmVsZWFzZSIKLSAgICAgICAgc2VsZi5idWlsZGVyX25hbWUg PSBidWlsZGVyX25hbWUKK2RlZiBfYnVpbGRlcl9vcHRpb25zKGJ1aWxkZXJfbmFtZSk6CisgICAg Y29uZmlndXJhdGlvbiA9ICJEZWJ1ZyIgaWYgcmUuc2VhcmNoKHIiW2R8RF0oZWJ1fGIpZyIsIGJ1 aWxkZXJfbmFtZSkgZWxzZSAiUmVsZWFzZSIKKyAgICBidWlsZGVyX25hbWUgPSBidWlsZGVyX25h bWUKKyAgICByZXR1cm4gb3B0cGFyc2UuVmFsdWVzKHsnYnVpbGRlcl9uYW1lJzogYnVpbGRlcl9u YW1lLCAnY29uZmlndXJhdGlvbic6IGNvbmZpZ3VyYXRpb259KQogCiAKIGNsYXNzIFBvcnRGYWN0 b3J5KG9iamVjdCk6CkBAIC0xMjksNiArMTI5LDYgQEAgY2xhc3MgUG9ydEZhY3Rvcnkob2JqZWN0 KToKICAgICBkZWYgZ2V0X2Zyb21fYnVpbGRlcl9uYW1lKHNlbGYsIGJ1aWxkZXJfbmFtZSk6CiAg ICAgICAgIHBvcnRfbmFtZSA9IGJ1aWxkZXJzLnBvcnRfbmFtZV9mb3JfYnVpbGRlcl9uYW1lKGJ1 aWxkZXJfbmFtZSkKICAgICAgICAgYXNzZXJ0KHBvcnRfbmFtZSkgICMgTmVlZCB0byB1cGRhdGUg cG9ydF9uYW1lX2Zvcl9idWlsZGVyX25hbWUKLSAgICAgICAgcG9ydCA9IHNlbGYuZ2V0KHBvcnRf bmFtZSwgQnVpbGRlck9wdGlvbnMoYnVpbGRlcl9uYW1lKSkKKyAgICAgICAgcG9ydCA9IHNlbGYu Z2V0KHBvcnRfbmFtZSwgX2J1aWxkZXJfb3B0aW9ucyhidWlsZGVyX25hbWUpKQogICAgICAgICBh c3NlcnQocG9ydCkgICMgTmVlZCB0byB1cGRhdGUgcG9ydF9uYW1lX2Zvcl9idWlsZGVyX25hbWUK ICAgICAgICAgcmV0dXJuIHBvcnQKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvZmFjdG9yeV91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZmFjdG9yeV91bml0dGVzdC5weQppbmRleCA5ZmMyMDU4 MmZhOTcyYTRmOWNjZWNlMGMwZDU1ZjU2NDVkN2VkNTRmLi43MDAzOTllMjg3ODc1MGY4MjMxMTRl NDU1NWNiOGNjOTY4MDkxODAxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2ZhY3RvcnlfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0b3J5X3VuaXR0ZXN0LnB5CkBAIC0xMjAsNiAr MTIwLDEwIEBAIGNsYXNzIEZhY3RvcnlUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYg dGVzdF91bmtub3duX2RlZmF1bHQoc2VsZik6CiAgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKE5v dEltcGxlbWVudGVkRXJyb3IsIGZhY3RvcnkuUG9ydEZhY3RvcnkoTW9ja1N5c3RlbUhvc3Qob3Nf bmFtZT0ndm1zJykpLmdldCkKIAorICAgIGRlZiB0ZXN0X2dldF9mcm9tX2J1aWxkZXJfbmFtZShz ZWxmKToKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoZmFjdG9yeS5Qb3J0RmFjdG9yeShNb2Nr U3lzdGVtSG9zdCgpKS5nZXRfZnJvbV9idWlsZGVyX25hbWUoJ1dlYmtpdCBNYWMxMC43JykubmFt ZSgpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAnY2hyb21pdW0tbWFjLWxpb24nKQorCiAK IGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6CiAgICAgdW5pdHRlc3QubWFpbigpCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rlc3RfZXhwZWN0YXRp b25zLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy90ZXN0X2V4cGVj dGF0aW9ucy5weQppbmRleCBmNTQxOWU5ZWNiYmU3ZDMwNWZhZDE2MDNlNTM2YWYzNmMwMmU4NTk0 Li5jOTVjNDEyMGY2MzRiMGY4NTQwMjNhZGZiMTg5NjM5MzZiMDQ5OTdmIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rlc3RfZXhwZWN0YXRpb25zLnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvdGVzdF9leHBlY3Rh dGlvbnMucHkKQEAgLTI5LDYgKzI5LDcgQEAKICIiIkNoZWNrcyBXZWJLaXQgc3R5bGUgZm9yIHRl c3RfZXhwZWN0YXRpb25zIGZpbGVzLiIiIgogCiBpbXBvcnQgbG9nZ2luZworaW1wb3J0IG9wdHBh cnNlCiBpbXBvcnQgb3MKIGltcG9ydCByZQogaW1wb3J0IHN5cwpAQCAtMzYsNyArMzcsNiBAQCBp bXBvcnQgc3lzCiBmcm9tIGNvbW1vbiBpbXBvcnQgVGFiQ2hlY2tlcgogZnJvbSB3ZWJraXRweS5j b21tb24uaG9zdCBpbXBvcnQgSG9zdAogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxz LnRlc3RfZXhwZWN0YXRpb25zIGltcG9ydCBUZXN0RXhwZWN0YXRpb25QYXJzZXIKLWZyb20gd2Vi a2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQuYmFzZSBpbXBvcnQgRHVtbXlPcHRpb25zCiAKIAogX2xv ZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQpAQCAtNDksNyArNDksNyBAQCBjbGFzcyBU ZXN0RXhwZWN0YXRpb25zQ2hlY2tlcihvYmplY3QpOgogCiAgICAgZGVmIF9kZXRlcm1pbmVfcG9y dF9mcm9tX2V4cGVjdGF0aW9uc19wYXRoKHNlbGYsIGhvc3QsIGV4cGVjdGF0aW9uc19wYXRoKToK ICAgICAgICAgIyBQYXNzIGEgY29uZmlndXJhdGlvbiB0byBhdm9pZCBjYWxsaW5nIGRlZmF1bHRf Y29uZmlndXJhdGlvbigpIHdoZW4gaW5pdGlhbGl6aW5nIHRoZSBwb3J0ICh0YWtlcyAwLjUgc2Vj b25kcyBvbiBhIE1hYyBQcm8hKS4KLSAgICAgICAgb3B0aW9ucyA9IER1bW15T3B0aW9ucyhjb25m aWd1cmF0aW9uPSdSZWxlYXNlJykKKyAgICAgICAgb3B0aW9ucyA9IG9wdHBhcnNlLlZhbHVlcyh7 J2NvbmZpZ3VyYXRpb24nOiAnUmVsZWFzZSd9KQogICAgICAgICBmb3IgcG9ydF9uYW1lIGluIGhv c3QucG9ydF9mYWN0b3J5LmFsbF9wb3J0X25hbWVzKCk6CiAgICAgICAgICAgICBwb3J0ID0gaG9z dC5wb3J0X2ZhY3RvcnkuZ2V0KHBvcnRfbmFtZSwgb3B0aW9ucz1vcHRpb25zKQogICAgICAgICAg ICAgaWYgcG9ydC5wYXRoX3RvX3Rlc3RfZXhwZWN0YXRpb25zX2ZpbGUoKS5yZXBsYWNlKHBvcnQu cGF0aF9mcm9tX3dlYmtpdF9iYXNlKCkgKyBob3N0LmZpbGVzeXN0ZW0uc2VwLCAnJykgPT0gZXhw ZWN0YXRpb25zX3BhdGg6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv bW9ja3Rvb2wucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbW9ja3Rvb2wucHkKaW5k ZXggNTVmZGU2NGFkZWM2NzhhNDM0NTBlNGU5NmIxYTBiNGVlNDRmZjI1ZC4uMjFlZTkxZmM5ZGI5 ODI3NzM0ZDJlNjExMDgzYzBjNWZjMDUxNjk2ZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS90b29sL21vY2t0b29sLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9v bC9tb2NrdG9vbC5weQpAQCAtMzYsOCArMzYsNyBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5uZXQu aXJjLmlyY19tb2NrIGltcG9ydCBNb2NrSVJDCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5jb25maWcu cG9ydHNfbW9jayBpbXBvcnQgTW9ja1BvcnQKIAogCi0jIEZJWE1FOiBUaGlzIHNob3VsZCBiZSBt b3ZlZCBzb21ld2hlcmUgaW4gY29tbW9uIGFuZCByZW5hbWVkCi0jIHNvbWV0aGluZyB3aXRob3V0 IE1vY2sgaW4gdGhlIG5hbWUuCisjIEZJWE1FOiBXZSBzaG91bGQganVzdCByZXBsYWNlIHRoaXMg d2l0aCBvcHRwYXJzZS5WYWx1ZXMoZGVmYXVsdD1rd2FyZ3MpCiBjbGFzcyBNb2NrT3B0aW9ucyhv YmplY3QpOgogICAgICIiIk1vY2sgaW1wbGVtZW50YXRpb24gb2Ygb3B0cGFyc2UuVmFsdWVzLiIi IgogCkBAIC01Myw2ICs1MiwxMSBAQCBjbGFzcyBNb2NrT3B0aW9ucyhvYmplY3QpOgogICAgICAg ICBzZWxmLl9fZGljdF9fLnVwZGF0ZSgqKmt3YXJncykKICAgICAgICAgcmV0dXJuIHNlbGYKIAor ICAgIGRlZiBlbnN1cmVfdmFsdWUoc2VsZiwga2V5LCB2YWx1ZSk6CisgICAgICAgIGlmIGdldGF0 dHIoc2VsZiwga2V5LCBOb25lKSA9PSBOb25lOgorICAgICAgICAgICAgc2VsZi5fX2RpY3RfX1tr ZXldID0gdmFsdWUKKyAgICAgICAgcmV0dXJuIHNlbGYuX19kaWN0X19ba2V5XQorCiAKICMgRklY TUU6IFRoaXMgc2hvdWxkIGJlIHJlbmFtZWQgTW9ja1dlYktpdFBhdGNoLgogY2xhc3MgTW9ja1Rv b2woTW9ja0hvc3QpOgo=