55811 2011-03-04 18:09:05 -0800 Fix webkit-patch on Win32 python 2011-06-18 13:03:41 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 61248 48614 49474 53822 55925 55927 61250 48517 1 paroga paroga abarth aroben dglazkov dpranke eric webkit.review.bot oldest_to_newest 362838 0 paroga 2011-03-04 18:09:05 -0800 Fix webkit-patch on Win32 python 362842 1 84838 paroga 2011-03-04 18:15:18 -0800 Created attachment 84838 Patch 363764 2 84838 eric 2011-03-07 19:06:55 -0800 Comment on attachment 84838 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=84838&action=review > Tools/Scripts/webkitpy/common/config/ports.py:43 > + # Win32 perl needs a slash here to determinate the correct module directories. > + return "Tools/Scripts/" + script_name Are you sure this is really what we want? I would suspect this is used in other places which might want a \ instead on windows. > Tools/Scripts/webkitpy/common/config/ports.py:92 > + command = [cls.perl_executable(), cls.script_path("build-webkit")] This is kinda sad. To encode the perl vs. python in the caller. I take it there is no way to run these under a shell in naked win32? > Tools/Scripts/webkitpy/tool/steps/preparechangelog.py:64 > + args = ["perl", self._tool.port().script_path("prepare-ChangeLog")] Why not perl_executable() here? Don't we expose both types of port objects on tool (I know, it's sad that we have 2 types!) > Tools/Scripts/webkitpy/tool/steps/preparechangelogfordepsroll.py:37 > + self._run_script("perl", "prepare-ChangeLog") Seems prepare-changeLog should just be one of the commands exposed on the Port object. 363813 3 84838 paroga 2011-03-07 21:53:46 -0800 Comment on attachment 84838 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=84838&action=review >> Tools/Scripts/webkitpy/common/config/ports.py:43 >> + return "Tools/Scripts/" + script_name > > Are you sure this is really what we want? I would suspect this is used in other places which might want a \ instead on windows. I don't like this too, but if i keep the backslash Win32 perl fail, because it can't find VCSUtils module. I'll try if passing the include directory via command line works. >> Tools/Scripts/webkitpy/common/config/ports.py:92 >> + command = [cls.perl_executable(), cls.script_path("build-webkit")] > > This is kinda sad. To encode the perl vs. python in the caller. I take it there is no way to run these under a shell in naked win32? Nope :-(, you find the same change in the previous "Win32 fixes". 363814 4 abarth 2011-03-07 21:58:14 -0800 Maybe it's not worth making webkit-patch work on Win32 Python? These changes seem bad. 363826 5 84838 dpranke 2011-03-07 22:37:37 -0800 Comment on attachment 84838 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=84838&action=review >>> Tools/Scripts/webkitpy/common/config/ports.py:43 >>> + return "Tools/Scripts/" + script_name >> >> Are you sure this is really what we want? I would suspect this is used in other places which might want a \ instead on windows. > > I don't like this too, but if i keep the backslash Win32 perl fail, because it can't find VCSUtils module. I'll try if passing the include directory via command line works. At the very least this should probably be protected by an if platform == 'win32' sort of thing. Although, ironically, the code will work on all the non-win32 platforms as is. >>> Tools/Scripts/webkitpy/common/config/ports.py:92 >>> + command = [cls.perl_executable(), cls.script_path("build-webkit")] >> >> This is kinda sad. To encode the perl vs. python in the caller. I take it there is no way to run these under a shell in naked win32? > > Nope :-(, you find the same change in the previous "Win32 fixes". I suggest that we revamp this in a way such that it could be overridden in a port-specific manner. Maybe you need a routine that just takes the basename of the script and returns a list of arguments. The default implementation could return list(script_path(X)) and the win32 version could return list(lookup_interpreter_for(X), script_path(X)). Or, it could even figure out the interpreter by opening the file and reading the first line ... 378395 6 87976 paroga 2011-04-02 08:56:15 -0700 Created attachment 87976 Patch 378538 7 87976 eric 2011-04-03 04:51:59 -0700 Comment on attachment 87976 Patch OK. Assuming it works. :) 423201 8 87976 webkit.review.bot 2011-06-18 13:03:36 -0700 Comment on attachment 87976 Patch Clearing flags on attachment: 87976 Committed r89201: <http://trac.webkit.org/changeset/89201> 423202 9 webkit.review.bot 2011-06-18 13:03:41 -0700 All reviewed patches have been landed. Closing bug. 84838 2011-03-04 18:15:18 -0800 2011-04-02 08:56:09 -0700 Patch bug-55811-20110305031515.patch text/plain 16322 paroga U3VidmVyc2lvbiBSZXZpc2lvbjogODAzOTgKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0OGM4MDEwMmM1ZTc3Mzk0NjE4OTRmM2Y5MWQ3NzA0MzRh ZmNmMWM5Li5jMTljODRlNDJhMDAyNDUyNmRjMDBiOWViYjhkZTFmMzc0N2U3ZDAwIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTEtMDMtMDQgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IHdlYmtp dC1wYXRjaCBvbiBXaW4zMiBweXRob24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTU1ODExCisKKyAgICAgICAgV2UgbmVlZCB0byBwYXNzIHRoZSBzY3Jp cHQgaW50ZXJwcmV0ZXIgYXMgZmlyc3QgYXJndW1lbnQKKyAgICAgICAgd2hlbiBzdGFydGluZyBh IG5ldyBwZXJsIG9yIHB5dGhvbiBzY3JpcHQgdmlhIHN1YnByb2Nlc3MuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20ucHk6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0c191bml0dGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3Rvb2wvc3RlcHMvYWJzdHJhY3RzdGVwLnB5OgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvdG9vbC9zdGVwcy9jaGVja3N0eWxlLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvdG9vbC9zdGVwcy9wcmVwYXJlY2hhbmdlbG9nLnB5OgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvdG9vbC9zdGVwcy9wcmVwYXJlY2hhbmdlbG9nZm9yZGVwc3JvbGwucHk6CisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3ByZXBhcmVjaGFuZ2Vsb2dmb3JyZXZl cnQucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3N0ZXBzX3VuaXR0 ZXN0LnB5OgorCiAyMDExLTAzLTA0ICBNYXJrIFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtvdi4KZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS5weQppbmRleCA3MGY2NWI1NzA2YTg0NTVlZjQ0 YmMzNDVlNzQ0MjVkN2E3MWExZGYyLi40ZDEyYjM3YzYwZGQzMzczY2MyYjRiNjY2NDY1NTMxOWIy NmZmNmEzIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291 dC9zY20ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2Nt LnB5CkBAIC02NjUsNyArNjY1LDcgQEAgY2xhc3MgR2l0KFNDTSk6CiAgICAgICAgIHJldHVybiBz ZWxmLnJ1bihbJ2dpdCcsICdsb2cnLCAnLS1wcmV0dHk9b25lbGluZScsICdIRUFELi4uJyArIHNl bGYucmVtb3RlX2JyYW5jaF9yZWYoKV0pLnNwbGl0bGluZXMoKQogCiAgICAgZGVmIHJlYmFzZV9p bl9wcm9ncmVzcyhzZWxmKToKLSAgICAgICAgcmV0dXJuIG9zLnBhdGguZXhpc3RzKG9zLnBhdGgu am9pbihzZWxmLmNoZWNrb3V0X3Jvb3QsICcuZ2l0L3JlYmFzZS1hcHBseScpKQorICAgICAgICBy ZXR1cm4gb3MucGF0aC5leGlzdHMob3MucGF0aC5qb2luKHNlbGYuY2hlY2tvdXRfcm9vdCwgJy5n aXQnLCAncmViYXNlLWFwcGx5JykpCiAKICAgICBkZWYgd29ya2luZ19kaXJlY3RvcnlfaXNfY2xl YW4oc2VsZik6CiAgICAgICAgICMgRklYTUU6IFRoaXMgc2hvdWxkIHByb2JhYmx5IHVzZSBjd2Q9 c2VsZi5jaGVja291dF9yb290CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9jb25maWcvcG9ydHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25m aWcvcG9ydHMucHkKaW5kZXggMTYzZDVlZjJkM2NlODQ3NThiYzU3ZmEzYWFmN2I4ZGQ1NGQ2NjNk My4uNTVmNzQ5ZTQ3ZDFmMGQ1ZmM2OTczZmFmODQyYWRhZmE5NTdkOTljYSAxMDA2NDQKLS0tIGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzLnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5weQpAQCAtMzksNyArMzksMTYg QEAgY2xhc3MgV2ViS2l0UG9ydChvYmplY3QpOgogICAgICMgV2UgbWlnaHQgbmVlZCB0byBwYXNz IHNjbSBpbnRvIHRoaXMgZnVuY3Rpb24gZm9yIHNjbS5jaGVja291dF9yb290CiAgICAgQGNsYXNz bWV0aG9kCiAgICAgZGVmIHNjcmlwdF9wYXRoKGNscywgc2NyaXB0X25hbWUpOgotICAgICAgICBy ZXR1cm4gb3MucGF0aC5qb2luKCJUb29scyIsICJTY3JpcHRzIiwgc2NyaXB0X25hbWUpCisgICAg ICAgICMgV2luMzIgcGVybCBuZWVkcyBhIHNsYXNoIGhlcmUgdG8gZGV0ZXJtaW5hdGUgdGhlIGNv cnJlY3QgbW9kdWxlIGRpcmVjdG9yaWVzLgorICAgICAgICByZXR1cm4gIlRvb2xzL1NjcmlwdHMv IiArIHNjcmlwdF9uYW1lCisKKyAgICBAc3RhdGljbWV0aG9kCisgICAgZGVmIHBlcmxfZXhlY3V0 YWJsZSgpOgorICAgICAgICByZXR1cm4gInBlcmwiCisKKyAgICBAc3RhdGljbWV0aG9kCisgICAg ZGVmIHB5dGhvbl9leGVjdXRhYmxlKCk6CisgICAgICAgIHJldHVybiAicHl0aG9uIgogCiAgICAg QHN0YXRpY21ldGhvZAogICAgIGRlZiBwb3J0KHBvcnRfbmFtZSk6CkBAIC03NiwxMSArODUsMTEg QEAgY2xhc3MgV2ViS2l0UG9ydChvYmplY3QpOgogCiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVm IHVwZGF0ZV93ZWJraXRfY29tbWFuZChjbHMpOgotICAgICAgICByZXR1cm4gW2Nscy5zY3JpcHRf cGF0aCgidXBkYXRlLXdlYmtpdCIpXQorICAgICAgICByZXR1cm4gW2Nscy5wZXJsX2V4ZWN1dGFi bGUoKSwgY2xzLnNjcmlwdF9wYXRoKCJ1cGRhdGUtd2Via2l0IildCiAKICAgICBAY2xhc3NtZXRo b2QKICAgICBkZWYgYnVpbGRfd2Via2l0X2NvbW1hbmQoY2xzLCBidWlsZF9zdHlsZT1Ob25lKToK LSAgICAgICAgY29tbWFuZCA9IFtjbHMuc2NyaXB0X3BhdGgoImJ1aWxkLXdlYmtpdCIpXQorICAg ICAgICBjb21tYW5kID0gW2Nscy5wZXJsX2V4ZWN1dGFibGUoKSwgY2xzLnNjcmlwdF9wYXRoKCJi dWlsZC13ZWJraXQiKV0KICAgICAgICAgaWYgYnVpbGRfc3R5bGUgPT0gImRlYnVnIjoKICAgICAg ICAgICAgIGNvbW1hbmQuYXBwZW5kKCItLWRlYnVnIikKICAgICAgICAgaWYgYnVpbGRfc3R5bGUg PT0gInJlbGVhc2UiOgpAQCAtODksMTkgKzk4LDE5IEBAIGNsYXNzIFdlYktpdFBvcnQob2JqZWN0 KToKIAogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBydW5famF2YXNjcmlwdGNvcmVfdGVzdHNf Y29tbWFuZChjbHMpOgotICAgICAgICByZXR1cm4gW2Nscy5zY3JpcHRfcGF0aCgicnVuLWphdmFz Y3JpcHRjb3JlLXRlc3RzIildCisgICAgICAgIHJldHVybiBbY2xzLnBlcmxfZXhlY3V0YWJsZSgp LCBjbHMuc2NyaXB0X3BhdGgoInJ1bi1qYXZhc2NyaXB0Y29yZS10ZXN0cyIpXQogCiAgICAgQGNs YXNzbWV0aG9kCiAgICAgZGVmIHJ1bl93ZWJraXRfdGVzdHNfY29tbWFuZChjbHMpOgotICAgICAg ICByZXR1cm4gW2Nscy5zY3JpcHRfcGF0aCgicnVuLXdlYmtpdC10ZXN0cyIpXQorICAgICAgICBy ZXR1cm4gW2Nscy5wZXJsX2V4ZWN1dGFibGUoKSwgY2xzLnNjcmlwdF9wYXRoKCJydW4td2Via2l0 LXRlc3RzIildCiAKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgcnVuX3B5dGhvbl91bml0dGVz dHNfY29tbWFuZChjbHMpOgotICAgICAgICByZXR1cm4gW2Nscy5zY3JpcHRfcGF0aCgidGVzdC13 ZWJraXRweSIpXQorICAgICAgICByZXR1cm4gW2Nscy5weXRob25fZXhlY3V0YWJsZSgpLCBjbHMu c2NyaXB0X3BhdGgoInRlc3Qtd2Via2l0cHkiKV0KIAogICAgIEBjbGFzc21ldGhvZAogICAgIGRl ZiBydW5fcGVybF91bml0dGVzdHNfY29tbWFuZChjbHMpOgotICAgICAgICByZXR1cm4gW2Nscy5z Y3JpcHRfcGF0aCgidGVzdC13ZWJraXRwZXJsIildCisgICAgICAgIHJldHVybiBbY2xzLnBlcmxf ZXhlY3V0YWJsZSgpLCBjbHMuc2NyaXB0X3BhdGgoInRlc3Qtd2Via2l0cGVybCIpXQogCiAgICAg QGNsYXNzbWV0aG9kCiAgICAgZGVmIGxheW91dF90ZXN0c19yZXN1bHRzX3BhdGgoY2xzKToKQEAg LTIyNyw2ICsyMzYsNyBAQCBjbGFzcyBDaHJvbWl1bVBvcnQoV2ViS2l0UG9ydCk6CiAgICAgQGNs YXNzbWV0aG9kCiAgICAgZGVmIHJ1bl93ZWJraXRfdGVzdHNfY29tbWFuZChjbHMpOgogICAgICAg ICByZXR1cm4gWworICAgICAgICAgICAgY2xzLnB5dGhvbl9leGVjdXRhYmxlKCksCiAgICAgICAg ICAgICBjbHMuc2NyaXB0X3BhdGgoIm5ldy1ydW4td2Via2l0LXRlc3RzIiksCiAgICAgICAgICAg ICAiLS1jaHJvbWl1bSIsCiAgICAgICAgICAgICAiLS1uby1waXhlbC10ZXN0cyIsCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHNfdW5pdHRlc3Qu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHNfdW5pdHRlc3Qu cHkKaW5kZXggYmEyNTVjMDJkNmUzMjM3MmNjOGZjMDQ2YjZjNzdlODExYTA2NTk2OS4uNGJhMDlj ZWVmZjc1ZjBhMzJmMDAzZThlYjQzYzA2NWZlNGRmNzYxYiAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0c191bml0dGVzdC5weQpAQCAtMzYs MTAgKzM2LDEwIEBAIGNsYXNzIFdlYktpdFBvcnRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAg ICBkZWYgdGVzdF9tYWNfcG9ydChzZWxmKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoTWFj UG9ydC5uYW1lKCksICJNYWMiKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhNYWNQb3J0LmZs YWcoKSwgIi0tcG9ydD1tYWMiKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhNYWNQb3J0LnJ1 bl93ZWJraXRfdGVzdHNfY29tbWFuZCgpLCBbV2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgicnVuLXdl YmtpdC10ZXN0cyIpXSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoTWFjUG9ydC5idWlsZF93 ZWJraXRfY29tbWFuZCgpLCBbV2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgiYnVpbGQtd2Via2l0Iild KQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhNYWNQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5k KGJ1aWxkX3N0eWxlPSJkZWJ1ZyIpLCBbV2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgiYnVpbGQtd2Vi a2l0IiksICItLWRlYnVnIl0pCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKE1hY1BvcnQuYnVp bGRfd2Via2l0X2NvbW1hbmQoYnVpbGRfc3R5bGU9InJlbGVhc2UiKSwgW1dlYktpdFBvcnQuc2Ny aXB0X3BhdGgoImJ1aWxkLXdlYmtpdCIpLCAiLS1yZWxlYXNlIl0pCisgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWxzKE1hY1BvcnQucnVuX3dlYmtpdF90ZXN0c19jb21tYW5kKCksIFtXZWJLaXRQb3J0 LnBlcmxfZXhlY3V0YWJsZSgpLCBXZWJLaXRQb3J0LnNjcmlwdF9wYXRoKCJydW4td2Via2l0LXRl c3RzIildKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhNYWNQb3J0LmJ1aWxkX3dlYmtpdF9j b21tYW5kKCksIFtXZWJLaXRQb3J0LnBlcmxfZXhlY3V0YWJsZSgpLCBXZWJLaXRQb3J0LnNjcmlw dF9wYXRoKCJidWlsZC13ZWJraXQiKV0pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKE1hY1Bv cnQuYnVpbGRfd2Via2l0X2NvbW1hbmQoYnVpbGRfc3R5bGU9ImRlYnVnIiksIFtXZWJLaXRQb3J0 LnBlcmxfZXhlY3V0YWJsZSgpLCBXZWJLaXRQb3J0LnNjcmlwdF9wYXRoKCJidWlsZC13ZWJraXQi KSwgIi0tZGVidWciXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoTWFjUG9ydC5idWlsZF93 ZWJraXRfY29tbWFuZChidWlsZF9zdHlsZT0icmVsZWFzZSIpLCBbV2ViS2l0UG9ydC5wZXJsX2V4 ZWN1dGFibGUoKSwgV2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgiYnVpbGQtd2Via2l0IiksICItLXJl bGVhc2UiXSkKIAogICAgICAgICBjbGFzcyBUZXN0SXNMZW9wYXJkKE1hY1BvcnQpOgogICAgICAg ICAgICAgQGNsYXNzbWV0aG9kCkBAIC01MCwyNyArNTAsMjcgQEAgY2xhc3MgV2ViS2l0UG9ydFRl c3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiB0ZXN0X2d0a19wb3J0KHNlbGYpOgogICAg ICAgICBzZWxmLmFzc2VydEVxdWFscyhHdGtQb3J0Lm5hbWUoKSwgIkd0ayIpCiAgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWxzKEd0a1BvcnQuZmxhZygpLCAiLS1wb3J0PWd0ayIpCi0gICAgICAgIHNl bGYuYXNzZXJ0RXF1YWxzKEd0a1BvcnQucnVuX3dlYmtpdF90ZXN0c19jb21tYW5kKCksIFtXZWJL aXRQb3J0LnNjcmlwdF9wYXRoKCJydW4td2Via2l0LXRlc3RzIiksICItLWd0ayJdKQotICAgICAg ICBzZWxmLmFzc2VydEVxdWFscyhHdGtQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKCksIFtXZWJL aXRQb3J0LnNjcmlwdF9wYXRoKCJidWlsZC13ZWJraXQiKSwgIi0tZ3RrIiwgV2ViS2l0UG9ydC5t YWtlQXJncygpXSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoR3RrUG9ydC5idWlsZF93ZWJr aXRfY29tbWFuZChidWlsZF9zdHlsZT0iZGVidWciKSwgW1dlYktpdFBvcnQuc2NyaXB0X3BhdGgo ImJ1aWxkLXdlYmtpdCIpLCAiLS1kZWJ1ZyIsICItLWd0ayIsIFdlYktpdFBvcnQubWFrZUFyZ3Mo KV0pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKEd0a1BvcnQucnVuX3dlYmtpdF90ZXN0c19j b21tYW5kKCksIFtXZWJLaXRQb3J0LnBlcmxfZXhlY3V0YWJsZSgpLCBXZWJLaXRQb3J0LnNjcmlw dF9wYXRoKCJydW4td2Via2l0LXRlc3RzIiksICItLWd0ayJdKQorICAgICAgICBzZWxmLmFzc2Vy dEVxdWFscyhHdGtQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKCksIFtXZWJLaXRQb3J0LnBlcmxf ZXhlY3V0YWJsZSgpLCBXZWJLaXRQb3J0LnNjcmlwdF9wYXRoKCJidWlsZC13ZWJraXQiKSwgIi0t Z3RrIiwgV2ViS2l0UG9ydC5tYWtlQXJncygpXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMo R3RrUG9ydC5idWlsZF93ZWJraXRfY29tbWFuZChidWlsZF9zdHlsZT0iZGVidWciKSwgW1dlYktp dFBvcnQucGVybF9leGVjdXRhYmxlKCksIFdlYktpdFBvcnQuc2NyaXB0X3BhdGgoImJ1aWxkLXdl YmtpdCIpLCAiLS1kZWJ1ZyIsICItLWd0ayIsIFdlYktpdFBvcnQubWFrZUFyZ3MoKV0pCiAKICAg ICBkZWYgdGVzdF9xdF9wb3J0KHNlbGYpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhRdFBv cnQubmFtZSgpLCAiUXQiKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhRdFBvcnQuZmxhZygp LCAiLS1wb3J0PXF0IikKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoUXRQb3J0LnJ1bl93ZWJr aXRfdGVzdHNfY29tbWFuZCgpLCBbV2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgicnVuLXdlYmtpdC10 ZXN0cyIpXSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoUXRQb3J0LmJ1aWxkX3dlYmtpdF9j b21tYW5kKCksIFtXZWJLaXRQb3J0LnNjcmlwdF9wYXRoKCJidWlsZC13ZWJraXQiKSwgIi0tcXQi LCBXZWJLaXRQb3J0Lm1ha2VBcmdzKCldKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhRdFBv cnQuYnVpbGRfd2Via2l0X2NvbW1hbmQoYnVpbGRfc3R5bGU9ImRlYnVnIiksIFtXZWJLaXRQb3J0 LnNjcmlwdF9wYXRoKCJidWlsZC13ZWJraXQiKSwgIi0tZGVidWciLCAiLS1xdCIsIFdlYktpdFBv cnQubWFrZUFyZ3MoKV0pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKFF0UG9ydC5ydW5fd2Vi a2l0X3Rlc3RzX2NvbW1hbmQoKSwgW1dlYktpdFBvcnQucGVybF9leGVjdXRhYmxlKCksIFdlYktp dFBvcnQuc2NyaXB0X3BhdGgoInJ1bi13ZWJraXQtdGVzdHMiKV0pCisgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWxzKFF0UG9ydC5idWlsZF93ZWJraXRfY29tbWFuZCgpLCBbV2ViS2l0UG9ydC5wZXJs X2V4ZWN1dGFibGUoKSwgV2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgiYnVpbGQtd2Via2l0IiksICIt LXF0IiwgV2ViS2l0UG9ydC5tYWtlQXJncygpXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMo UXRQb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPSJkZWJ1ZyIpLCBbV2ViS2l0 UG9ydC5wZXJsX2V4ZWN1dGFibGUoKSwgV2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgiYnVpbGQtd2Vi a2l0IiksICItLWRlYnVnIiwgIi0tcXQiLCBXZWJLaXRQb3J0Lm1ha2VBcmdzKCldKQogCiAgICAg ZGVmIHRlc3RfY2hyb21pdW1fcG9ydChzZWxmKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMo Q2hyb21pdW1Qb3J0Lm5hbWUoKSwgIkNocm9taXVtIikKICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bHMoQ2hyb21pdW1Qb3J0LmZsYWcoKSwgIi0tcG9ydD1jaHJvbWl1bSIpCi0gICAgICAgIHNlbGYu YXNzZXJ0RXF1YWxzKENocm9taXVtUG9ydC5ydW5fd2Via2l0X3Rlc3RzX2NvbW1hbmQoKSwgW1dl YktpdFBvcnQuc2NyaXB0X3BhdGgoIm5ldy1ydW4td2Via2l0LXRlc3RzIiksICItLWNocm9taXVt IiwgIi0tbm8tcGl4ZWwtdGVzdHMiXSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoQ2hyb21p dW1Qb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKCksIFtXZWJLaXRQb3J0LnNjcmlwdF9wYXRoKCJi dWlsZC13ZWJraXQiKSwgIi0tY2hyb21pdW0iLCAiLS11cGRhdGUtY2hyb21pdW0iXSkKLSAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbHMoQ2hyb21pdW1Qb3J0LmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1 aWxkX3N0eWxlPSJkZWJ1ZyIpLCBbV2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgiYnVpbGQtd2Via2l0 IiksICItLWRlYnVnIiwgIi0tY2hyb21pdW0iLCAiLS11cGRhdGUtY2hyb21pdW0iXSkKLSAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbHMoQ2hyb21pdW1Qb3J0LnVwZGF0ZV93ZWJraXRfY29tbWFuZCgp LCBbV2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgidXBkYXRlLXdlYmtpdCIpLCAiLS1jaHJvbWl1bSJd KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhDaHJvbWl1bVBvcnQucnVuX3dlYmtpdF90ZXN0 c19jb21tYW5kKCksIFtXZWJLaXRQb3J0LnB5dGhvbl9leGVjdXRhYmxlKCksIFdlYktpdFBvcnQu c2NyaXB0X3BhdGgoIm5ldy1ydW4td2Via2l0LXRlc3RzIiksICItLWNocm9taXVtIiwgIi0tbm8t cGl4ZWwtdGVzdHMiXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoQ2hyb21pdW1Qb3J0LmJ1 aWxkX3dlYmtpdF9jb21tYW5kKCksIFtXZWJLaXRQb3J0LnBlcmxfZXhlY3V0YWJsZSgpLCBXZWJL aXRQb3J0LnNjcmlwdF9wYXRoKCJidWlsZC13ZWJraXQiKSwgIi0tY2hyb21pdW0iLCAiLS11cGRh dGUtY2hyb21pdW0iXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoQ2hyb21pdW1Qb3J0LmJ1 aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPSJkZWJ1ZyIpLCBbV2ViS2l0UG9ydC5wZXJs X2V4ZWN1dGFibGUoKSwgV2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgiYnVpbGQtd2Via2l0IiksICIt LWRlYnVnIiwgIi0tY2hyb21pdW0iLCAiLS11cGRhdGUtY2hyb21pdW0iXSkKKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbHMoQ2hyb21pdW1Qb3J0LnVwZGF0ZV93ZWJraXRfY29tbWFuZCgpLCBbV2Vi S2l0UG9ydC5wZXJsX2V4ZWN1dGFibGUoKSwgV2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgidXBkYXRl LXdlYmtpdCIpLCAiLS1jaHJvbWl1bSJdKQogCiAgICAgZGVmIHRlc3RfY2hyb21pdW1feHZmYl9w b3J0KHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhDaHJvbWl1bVhWRkJQb3J0LnJ1 bl93ZWJraXRfdGVzdHNfY29tbWFuZCgpLCBbInh2ZmItcnVuIiwgIlRvb2xzL1NjcmlwdHMvbmV3 LXJ1bi13ZWJraXQtdGVzdHMiLCAiLS1jaHJvbWl1bSIsICItLW5vLXBpeGVsLXRlc3RzIl0pCisg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKENocm9taXVtWFZGQlBvcnQucnVuX3dlYmtpdF90ZXN0 c19jb21tYW5kKCksIFsieHZmYi1ydW4iLCBXZWJLaXRQb3J0LnB5dGhvbl9leGVjdXRhYmxlKCks IFdlYktpdFBvcnQuc2NyaXB0X3BhdGgoIm5ldy1ydW4td2Via2l0LXRlc3RzIiksICItLWNocm9t aXVtIiwgIi0tbm8tcGl4ZWwtdGVzdHMiXSkKIAogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoK ICAgICB1bml0dGVzdC5tYWluKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9zdGVwcy9hYnN0cmFjdHN0ZXAucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv c3RlcHMvYWJzdHJhY3RzdGVwLnB5CmluZGV4IDFjOTNkNWI5ZjdkMGUzYmQzMzFjNTEwYTBmMjRj ZTdmZDljYWM1YjkuLmU0YTk3Y2VmMTIyYzQyN2RiZTYxMDNhNmMxMGIyZWE1ZjA0ZmU4MTggMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9hYnN0cmFjdHN0ZXAu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL2Fic3RyYWN0c3RlcC5w eQpAQCAtMzgsOSArMzgsOSBAQCBjbGFzcyBBYnN0cmFjdFN0ZXAob2JqZWN0KToKICAgICAgICAg c2VsZi5fb3B0aW9ucyA9IG9wdGlvbnMKIAogICAgICMgRklYTUU6IFRoaXMgc2hvdWxkIHVzZSB0 b29sLnBvcnQoKQotICAgIGRlZiBfcnVuX3NjcmlwdChzZWxmLCBzY3JpcHRfbmFtZSwgYXJncz1O b25lLCBxdWlldD1GYWxzZSwgcG9ydD1XZWJLaXRQb3J0KToKKyAgICBkZWYgX3J1bl9zY3JpcHQo c2VsZiwgc2NyaXB0X2V4ZWN1dGFibGUsIHNjcmlwdF9uYW1lLCBhcmdzPU5vbmUsIHF1aWV0PUZh bHNlLCBwb3J0PVdlYktpdFBvcnQpOgogICAgICAgICBsb2coIlJ1bm5pbmcgJXMiICUgc2NyaXB0 X25hbWUpCi0gICAgICAgIGNvbW1hbmQgPSBbcG9ydC5zY3JpcHRfcGF0aChzY3JpcHRfbmFtZSld CisgICAgICAgIGNvbW1hbmQgPSBbc2NyaXB0X2V4ZWN1dGFibGUsIHBvcnQuc2NyaXB0X3BhdGgo c2NyaXB0X25hbWUpXQogICAgICAgICBpZiBhcmdzOgogICAgICAgICAgICAgY29tbWFuZC5leHRl bmQoYXJncykKICAgICAgICAgc2VsZi5fdG9vbC5leGVjdXRpdmUucnVuX2FuZF90aHJvd19pZl9m YWlsKGNvbW1hbmQsIHF1aWV0KQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL3N0ZXBzL2NoZWNrc3R5bGUucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3Rl cHMvY2hlY2tzdHlsZS5weQppbmRleCBhZjY2YzUwZGJhMGNmNzhmMjFiYjY2MThiM2ZkNWU3YjYy OWQyMDIwLi5jMDNkZGRkZjNjMDJhMzc2ZjUxNWEwMTUwMDRiZTU5NGJiYTBlZDI0IDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvY2hlY2tzdHlsZS5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvY2hlY2tzdHlsZS5weQpAQCAtMjcs NiArMjcsNyBAQAogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBP U1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCiBpbXBvcnQgb3MKK2ltcG9ydCBzeXMKIAogZnJv bSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBpbXBvcnQgU2NyaXB0RXJyb3IKIGZy b20gd2Via2l0cHkudG9vbC5zdGVwcy5hYnN0cmFjdHN0ZXAgaW1wb3J0IEFic3RyYWN0U3RlcApA QCAtNTYsNyArNTcsNyBAQCBjbGFzcyBDaGVja1N0eWxlKEFic3RyYWN0U3RlcCk6CiAgICAgICAg IGFyZ3MuZXh0ZW5kKHNlbGYuX2NoYW5nZWRfZmlsZXMoc3RhdGUpKQogCiAgICAgICAgIHRyeToK LSAgICAgICAgICAgIHNlbGYuX3J1bl9zY3JpcHQoImNoZWNrLXdlYmtpdC1zdHlsZSIsIGFyZ3Mp CisgICAgICAgICAgICBzZWxmLl9ydW5fc2NyaXB0KHN5cy5leGVjdXRhYmxlLCAiY2hlY2std2Vi a2l0LXN0eWxlIiwgYXJncykKICAgICAgICAgZXhjZXB0IFNjcmlwdEVycm9yLCBlOgogICAgICAg ICAgICAgaWYgc2VsZi5fb3B0aW9ucy5ub25faW50ZXJhY3RpdmU6CiAgICAgICAgICAgICAgICAg IyBXZSBuZWVkIHRvIHJlLXJhaXNlIHRoZSBleGNlcHRpb24gaGVyZSB0byBoYXZlIHRoZQpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3ByZXBhcmVjaGFuZ2Vs b2cucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvcHJlcGFyZWNoYW5nZWxv Zy5weQppbmRleCAxN2U5OTZjNmQ3MDU3OTM4ZDI4NGFjNzNmMzBmMDJkNjFlNTFmYzc0Li5iY2Zk NTk0MzEyYjczN2RmN2ZkNzEzNTNhNTg4ZTk3NDdlNjYwMjBlIDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvcHJlcGFyZWNoYW5nZWxvZy5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvcHJlcGFyZWNoYW5nZWxvZy5weQpAQCAtNjEs NyArNjEsNyBAQCBjbGFzcyBQcmVwYXJlQ2hhbmdlTG9nKEFic3RyYWN0U3RlcCk6CiAgICAgICAg ICAgICBzZWxmLl9lbnN1cmVfYnVnX3VybChzdGF0ZSkKICAgICAgICAgICAgIHJldHVybgogICAg ICAgICBvcy5jaGRpcihzZWxmLl90b29sLnNjbSgpLmNoZWNrb3V0X3Jvb3QpCi0gICAgICAgIGFy Z3MgPSBbc2VsZi5fdG9vbC5wb3J0KCkuc2NyaXB0X3BhdGgoInByZXBhcmUtQ2hhbmdlTG9nIild CisgICAgICAgIGFyZ3MgPSBbInBlcmwiLCBzZWxmLl90b29sLnBvcnQoKS5zY3JpcHRfcGF0aCgi cHJlcGFyZS1DaGFuZ2VMb2ciKV0KICAgICAgICAgaWYgc3RhdGUuZ2V0KCJidWdfaWQiKToKICAg ICAgICAgICAgIGFyZ3MuYXBwZW5kKCItLWJ1Zz0lcyIgJSBzdGF0ZVsiYnVnX2lkIl0pCiAgICAg ICAgICAgICBhcmdzLmFwcGVuZCgiLS1kZXNjcmlwdGlvbj0lcyIgJSBzZWxmLl90b29sLmJ1Z3Mu ZmV0Y2hfYnVnKHN0YXRlWyJidWdfaWQiXSkudGl0bGUoKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9wcmVwYXJlY2hhbmdlbG9nZm9yZGVwc3JvbGwucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvcHJlcGFyZWNoYW5nZWxvZ2ZvcmRl cHNyb2xsLnB5CmluZGV4IDM5YzlhOWFiNTNkMjg2MDRjZWJiZDkyY2U0YWY5ZThjZmZiMGE5Mjgu LjBhN2UwZGI5MTUzOGJlYjFmMjU3MjBjZTFlYjY5MTVlNjJhN2M5OTcgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9wcmVwYXJlY2hhbmdlbG9nZm9yZGVwc3Jv bGwucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3ByZXBhcmVjaGFu Z2Vsb2dmb3JkZXBzcm9sbC5weQpAQCAtMzQsNyArMzQsNyBAQCBmcm9tIHdlYmtpdHB5LnRvb2wu c3RlcHMuYWJzdHJhY3RzdGVwIGltcG9ydCBBYnN0cmFjdFN0ZXAKIAogY2xhc3MgUHJlcGFyZUNo YW5nZUxvZ0ZvckRFUFNSb2xsKEFic3RyYWN0U3RlcCk6CiAgICAgZGVmIHJ1bihzZWxmLCBzdGF0 ZSk6Ci0gICAgICAgIHNlbGYuX3J1bl9zY3JpcHQoInByZXBhcmUtQ2hhbmdlTG9nIikKKyAgICAg ICAgc2VsZi5fcnVuX3NjcmlwdCgicGVybCIsICJwcmVwYXJlLUNoYW5nZUxvZyIpCiAgICAgICAg IGNoYW5nZWxvZ19wYXRocyA9IHNlbGYuX3Rvb2wuY2hlY2tvdXQoKS5tb2RpZmllZF9jaGFuZ2Vs b2dzKGdpdF9jb21taXQ9Tm9uZSkKICAgICAgICAgZm9yIGNoYW5nZWxvZ19wYXRoIGluIGNoYW5n ZWxvZ19wYXRoczoKICAgICAgICAgICAgIENoYW5nZUxvZyhjaGFuZ2Vsb2dfcGF0aCkudXBkYXRl X3dpdGhfdW5yZXZpZXdlZF9tZXNzYWdlKCJSb2xsZWQgREVQUy5cblxuIikKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9wcmVwYXJlY2hhbmdlbG9nZm9ycmV2 ZXJ0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3ByZXBhcmVjaGFuZ2Vs b2dmb3JyZXZlcnQucHkKaW5kZXggZGNkNGI5MzkzYzIyZjY3NWM1MDVmZWNmNmQyNjhkYmZjNTQ3 N2Q3Yy4uOGJkOTEzZjEyNjIxOTE4ZjBmNThhNzE4MDdlNTU3ZDQzNGY5Mjg5NiAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3ByZXBhcmVjaGFuZ2Vsb2dmb3Jy ZXZlcnQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3ByZXBhcmVj aGFuZ2Vsb2dmb3JyZXZlcnQucHkKQEAgLTUwLDcgKzUwLDcgQEAgY2xhc3MgUHJlcGFyZUNoYW5n ZUxvZ0ZvclJldmVydChBYnN0cmFjdFN0ZXApOgogCiAgICAgZGVmIHJ1bihzZWxmLCBzdGF0ZSk6 CiAgICAgICAgICMgVGhpcyBjb3VsZCBtb3ZlIHRvIHByZXBhcmUtQ2hhbmdlTG9nIGJ5IGFkZGlu ZyBhIC0tcmV2ZXJ0PSBvcHRpb24uCi0gICAgICAgIHNlbGYuX3J1bl9zY3JpcHQoInByZXBhcmUt Q2hhbmdlTG9nIikKKyAgICAgICAgc2VsZi5fcnVuX3NjcmlwdCgicGVybCIsICJwcmVwYXJlLUNo YW5nZUxvZyIpCiAgICAgICAgIGNoYW5nZWxvZ19wYXRocyA9IHNlbGYuX3Rvb2wuY2hlY2tvdXQo KS5tb2RpZmllZF9jaGFuZ2Vsb2dzKGdpdF9jb21taXQ9Tm9uZSkKICAgICAgICAgYnVnX3VybCA9 IHNlbGYuX3Rvb2wuYnVncy5idWdfdXJsX2Zvcl9idWdfaWQoc3RhdGVbImJ1Z19pZCJdKSBpZiBz dGF0ZVsiYnVnX2lkIl0gZWxzZSBOb25lCiAgICAgICAgIG1lc3NhZ2UgPSBzZWxmLl9tZXNzYWdl X2Zvcl9yZXZlcnQoc3RhdGVbInJldmlzaW9uX2xpc3QiXSwgc3RhdGVbInJlYXNvbiJdLCBidWdf dXJsKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3N0ZXBz X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3N0ZXBzX3Vu aXR0ZXN0LnB5CmluZGV4IDc4M2FlMjljZTc0YjdiMGNkYTdlOGE4OWYwNzAzNzBmNTVlOTAxZTUu LmVmYzZjYmVkNDBkYWY3ZWFmOWUwODdjY2IxY2NiM2NjMDkyMzAyZGUgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9zdGVwc191bml0dGVzdC5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvc3RlcHNfdW5pdHRlc3QucHkKQEAgLTgx LDEyICs4MSwxMiBAQCBjbGFzcyBTdGVwc1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAg ICB0b29sLnBvcnQgPSBsYW1iZGE6IG1vY2tfcG9ydAogICAgICAgICBzdGVwID0gUnVuVGVzdHMo dG9vbCwgbW9ja19vcHRpb25zKQogICAgICAgICBleHBlY3RlZF9zdGRlcnIgPSAiIiJSdW5uaW5n IFB5dGhvbiB1bml0IHRlc3RzCi1NT0NLIHJ1bl9hbmRfdGhyb3dfaWZfZmFpbDogWydUb29scy9T Y3JpcHRzL3Rlc3Qtd2Via2l0cHknXQorTU9DSyBydW5fYW5kX3Rocm93X2lmX2ZhaWw6IFsncHl0 aG9uJywgJ1Rvb2xzL1NjcmlwdHMvdGVzdC13ZWJraXRweSddCiBSdW5uaW5nIFBlcmwgdW5pdCB0 ZXN0cwotTU9DSyBydW5fYW5kX3Rocm93X2lmX2ZhaWw6IFsnVG9vbHMvU2NyaXB0cy90ZXN0LXdl YmtpdHBlcmwnXQorTU9DSyBydW5fYW5kX3Rocm93X2lmX2ZhaWw6IFsncGVybCcsICdUb29scy9T Y3JpcHRzL3Rlc3Qtd2Via2l0cGVybCddCiBSdW5uaW5nIEphdmFTY3JpcHRDb3JlIHRlc3RzCi1N T0NLIHJ1bl9hbmRfdGhyb3dfaWZfZmFpbDogWydUb29scy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0 Y29yZS10ZXN0cyddCitNT0NLIHJ1bl9hbmRfdGhyb3dfaWZfZmFpbDogWydwZXJsJywgJ1Rvb2xz L1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzJ10KIFJ1bm5pbmcgcnVuLXdlYmtpdC10 ZXN0cwotTU9DSyBydW5fYW5kX3Rocm93X2lmX2ZhaWw6IFsnVG9vbHMvU2NyaXB0cy9ydW4td2Vi a2l0LXRlc3RzJywgJy0tbm8tbmV3LXRlc3QtcmVzdWx0cycsICctLW5vLWxhdW5jaC1zYWZhcmkn LCAnLS1leGl0LWFmdGVyLW4tZmFpbHVyZXM9MScsICctLXdhaXQtZm9yLWh0dHBkJywgJy0taWdu b3JlLXRlc3RzJywgJ2NvbXBvc2l0aW5nLG1lZGlhJywgJy0tcXVpZXQnXQorTU9DSyBydW5fYW5k X3Rocm93X2lmX2ZhaWw6IFsncGVybCcsICdUb29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMn LCAnLS1uby1uZXctdGVzdC1yZXN1bHRzJywgJy0tbm8tbGF1bmNoLXNhZmFyaScsICctLWV4aXQt YWZ0ZXItbi1mYWlsdXJlcz0xJywgJy0td2FpdC1mb3ItaHR0cGQnLCAnLS1pZ25vcmUtdGVzdHMn LCAnY29tcG9zaXRpbmcsbWVkaWEnLCAnLS1xdWlldCddCiAiIiIKICAgICAgICAgT3V0cHV0Q2Fw dHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHN0ZXAucnVuLCBbe31dLCBleHBlY3RlZF9zdGRl cnI9ZXhwZWN0ZWRfc3RkZXJyKQo= 87976 2011-04-02 08:56:15 -0700 2011-06-18 13:03:36 -0700 Patch bug-55811-20110402175612.patch text/plain 1373 paroga U3VidmVyc2lvbiBSZXZpc2lvbjogODI3NzAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2ODkxZWRiMmIzNWYyMTJlZWQyYTViYjUxZjczOThmMTQ4 NjRjMTZiLi42MzJhYzc3Y2ZhMDZmNGY5MWU1MTU1NmE0MzI0MjRiODJlYjM1ODQwIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcg QEAKIDIwMTEtMDQtMDIgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CiAK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRG9uJ3QgZXhp dCB3ZWJraXQtcGF0Y2ggd2hlbiBydW5uaW5nIG9uIFdpbjMyIHB5dGhvbgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTU4MTEKKworICAgICAgICBNb3N0 IG9mIHRoZSBiYXNpYyBhY3Rpb25zIHdvcmsgaW4gdGhlIG1lYW50aW1lLAorICAgICAgICBzbyBs ZXQgcGVvcGxlIHBsYXkgd2l0aCBpbiBvbiBXaW4zMiBub3cuCisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdC1wYXRjaDoKKworMjAxMS0wNC0wMiAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FA d2Via2l0Lm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KIAogICAgICAg ICBFbXVsYXRlIHNoZWJhbmcgb24gV2luMzIKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0LXBhdGNoIGIvVG9vbHMvU2NyaXB0cy93ZWJraXQtcGF0Y2gKaW5kZXggMWViODQ3NmQ5MWIy Nzc5YjZhNzhhMTk1MGEzY2U4ZDUxZGI0N2Y5My4uOWU2MmZlYTg1NGYwYjE0NGEwYjJlM2E4YTIw NzMzZmJlNjQ0ZDJiOSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXQtcGF0Y2gKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXQtcGF0Y2gKQEAgLTUyLDExICs1Miw2IEBAIGRlZiBtYWlu KCk6CiAgICAgY29uZmlndXJlX2xvZ2dpbmcobG9nZ2luZ19sZXZlbD1sb2dnaW5nX2xldmVsKQog CiAgICAgdmVyc2lvbmluZy5jaGVja192ZXJzaW9uKCkKLSAgICAKLSAgICBpZiBzeXMucGxhdGZv cm0gPT0gIndpbjMyIjoKLSAgICAgICAgX2xvZy5mYXRhbCgid2Via2l0LXBhdGNoIGlzIG9ubHkg c3VwcG9ydGVkIHVuZGVyIEN5Z3dpbiBQeXRob24sICIKLSAgICAgICAgICAgICAgICAgICAibm90 IFdpbjMyIFB5dGhvbiIpCi0gICAgICAgIHN5cy5leGl0KDEpCiAKICAgICAjIEltcG9ydCB3ZWJr aXQtcGF0Y2ggY29kZSBvbmx5IGFmdGVyIHZlcnNpb24tY2hlY2tpbmcgc28gdGhhdAogICAgICMg c2NyaXB0IGRvZXNuJ3QgZXJyb3Igb3V0IGJlZm9yZSBoYXZpbmcgYSBjaGFuY2UgdG8gcmVwb3J0 IHRoZQo=