98323 2012-10-03 16:36:33 -0700 run-webkit-tests tests on win32 after r127302 2012-10-03 19:53:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth eric levin ojan webkit.review.bot oldest_to_newest 734177 0 dpranke 2012-10-03 16:36:33 -0700 run-webkit-tests tests on win32 after r127302 734180 1 166990 dpranke 2012-10-03 16:38:13 -0700 Created attachment 166990 Patch 734185 2 166990 eric 2012-10-03 16:39:33 -0700 Comment on attachment 166990 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=166990&action=review > Tools/Scripts/webkitpy/common/checkout/scm/svn.py:94 > + exit_code = executive.run_command(svn_info_args, cwd=path, return_exit_code=True, shell=(sys.platform == 'win32')) shell is the devil. Causes all sorts of oddness. Can we solve this w/o shell? 734193 3 dpranke 2012-10-03 16:43:08 -0700 Using the default chromium install, we point to an svn.bat in depot_tools; without shell=True, calling "svn info" won't work. An alternative would be to make cls.executable a method and probe to figure out if we should use svn.exe or svn.bat. 734199 4 eric 2012-10-03 16:44:53 -0700 Don't we already have hacks for svn.bat? http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/host.py#L82 734201 5 dpranke 2012-10-03 16:46:33 -0700 Good question. I thought we had something like that but it must not be working. I will dig in and find out why not. 734226 6 dpranke 2012-10-03 17:07:11 -0700 okay, turns out we don't actually call _initialize_scm() unless we're running on a bot; this was done to avoid the hit of calling out to svn if we didn't really need the revisions. Unfortunately, the code in json_result_generator doesn't know about that, and doesn't trap the error or call initialize_scm. It's easy enough to call initialize_scm() again, but it's harder (if not impossible) to figure out if we need to or not at that layer of the code without doing some refactoring. 734229 7 dpranke 2012-10-03 17:07:35 -0700 I'll post a patch that fixes the crash for now and add a FIXME: to mention the slowdown and possible refactoring. 734235 8 167003 dpranke 2012-10-03 17:14:22 -0700 Created attachment 167003 Patch 734242 9 167003 eric 2012-10-03 17:22:49 -0700 Comment on attachment 167003 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=167003&action=review > Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:391 > + self._port.host._initialize_scm() > scm = SCMDetector(self._filesystem, self._executive).detect_scm_system(in_directory) > if scm: > return scm.svn_revision(in_directory) Um... Why can't it just use self._port.host.scm now then? Why re-detect? 734244 10 dpranke 2012-10-03 17:23:55 -0700 (In reply to comment #9) > (From update of attachment 167003 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=167003&action=review > > > Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:391 > > + self._port.host._initialize_scm() > > scm = SCMDetector(self._filesystem, self._executive).detect_scm_system(in_directory) > > if scm: > > return scm.svn_revision(in_directory) > > Um... Why can't it just use self._port.host.scm now then? Why re-detect? The directory matters, since we look once for the webkit checkout and once for the chromium checkout (and they might actually be different). 734247 11 167003 eric 2012-10-03 17:29:16 -0700 Comment on attachment 167003 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=167003&action=review >>> Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:391 >>> return scm.svn_revision(in_directory) >> >> Um... Why can't it just use self._port.host.scm now then? Why re-detect? > > The directory matters, since we look once for the webkit checkout and once for the chromium checkout (and they might actually be different). I see. We should probably add an explaination of why we call _initialize_scm() here. Also, don't we have a non-private API for causing initialize_scm to fire? Could we just grab scm()? Or if we're going to call private functions on host, why not just call _engage_awesome_windows_hacks directly? 734253 12 dpranke 2012-10-03 17:33:16 -0700 (In reply to comment #11) > (From update of attachment 167003 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=167003&action=review > > >>> Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:391 > >>> return scm.svn_revision(in_directory) > >> > >> Um... Why can't it just use self._port.host.scm now then? Why re-detect? > > > > The directory matters, since we look once for the webkit checkout and once for the chromium checkout (and they might actually be different). > > I see. We should probably add an explaination of why we call _initialize_scm() here. Will do. Also, don't we have a non-private API for causing initialize_scm to fire? Could we just grab scm()? Or if we're going to call private functions on host, why not just call _engage_awesome_windows_hacks directly? grabbing scm() directly won't call initialize_scm(). We should either make that happen, or make initialize_scm() public IMO. 734301 13 167018 dpranke 2012-10-03 19:00:11 -0700 Created attachment 167018 make initialize_scm() public 734302 14 167018 eric 2012-10-03 19:02:01 -0700 Comment on attachment 167018 make initialize_scm() public View in context: https://bugs.webkit.org/attachment.cgi?id=167018&action=review > Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:389 > + # We can't reuse an existing scm object because we need to look at the specific directories. Rather, because the specific directories we're interested in may come from a different checkout. 734315 15 dpranke 2012-10-03 19:24:18 -0700 (In reply to comment #14) > (From update of attachment 167018 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=167018&action=review > > > Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:389 > > + # We can't reuse an existing scm object because we need to look at the specific directories. > > Rather, because the specific directories we're interested in may come from a different checkout. That is clearer, thanks! 734323 16 dpranke 2012-10-03 19:53:05 -0700 Committed r130356: <http://trac.webkit.org/changeset/130356> 166990 2012-10-03 16:38:13 -0700 2012-10-03 17:14:20 -0700 Patch bug-98323-20121003163724.patch text/plain 4461 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwMzE0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTMxY2RhMDQ4Y2FiNDc5YTcxYTQ0OGNiN2RlNDBjNzgw ZWU1NDY3My4uNzMxZmVmYjc3ZGEyMjIzMzIxMjY5ODA3ZjFkYzRkNTk2NjQ0ZmMxYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDEyLTEwLTAzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIHJ1bi13ZWJraXQtdGVzdHMgdGVzdHMgb24gd2luMzIgYWZ0ZXIgcjEyNzMwMgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTgzMjMKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMb29rcyBsaWtlIHdo ZW4gd2UgY29udmVydGVkIHRoZSBqc29uLWJ1aWxkaW5nIGxvZ2ljIHRvIHVzZSBzY20KKyAgICAg ICAgdG8gdHJ5IGFuZCBnZXQgdGhlIHN2biByZXZpc2lvbiwgd2UgbWlzc2VkIGEgd2luMzItaXNt LiBXaXRob3V0CisgICAgICAgIHRoaXMsIGlmIHN2biBpcyBub3QgaW4geW91ciBQQVRILCBydW5f Y29tbWFuZCByYWlzZXMgYQorICAgICAgICBXaW5kb3dzRXJyb3IuCisKKyAgICAgICAgVGhpcyBw YXRjaCBmaXhlcyB0aGF0LCBidXQgd2UgbWlnaHQgd2FudCBhIG1vcmUgcm9idXN0IHNvbHV0aW9u CisgICAgICAgIGluIHN2bi5weSB0byBoYW5kbGUgc3ZuIGJlaW5nIG1pc3NpbmcuCisKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5OgorICAgICAg ICAoU1ZOLmluX3dvcmtpbmdfZGlyZWN0b3J5KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5OgorICAgICAgICAoRXhlY3V0aXZlLnJ1bl9jb21t YW5kKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZl X21vY2sucHk6CisgICAgICAgIChNb2NrRXhlY3V0aXZlLnJ1bl9jb21tYW5kKToKKyAgICAgICAg KE1vY2tFeGVjdXRpdmUyLnJ1bl9jb21tYW5kKToKKwogMjAxMi0xMC0wMyAgQW5kZXJzIENhcmxz c29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIEV4Y2VwdGlvbiB0aHJvd24gd2hl biBydW5uaW5nIGFjY2Vzc2liaWxpdHkvY29udGFpbmVyLW5vZGUtZGVsZXRlLWNhdXNlcy1jcmFz aC5odG1sIHRlc3QKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No ZWNrb3V0L3NjbS9zdm4ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291 dC9zY20vc3ZuLnB5CmluZGV4IDI1YjdlM2I0NzMwNWJjMDI5NWZlMmYzYzcyNmM5NjkzMDllNThh NTEuLmYxMTc1NjM4ODUzOGFiNmMxZDk3YTdiYTkyYjJkMmYyYWQ4ZmI5MWUgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weQpAQCAtOTEs NyArOTEsNyBAQCBjbGFzcyBTVk4oU0NNLCBTVk5SZXBvc2l0b3J5KToKIAogICAgICAgICBleGVj dXRpdmUgPSBleGVjdXRpdmUgb3IgRXhlY3V0aXZlKCkKICAgICAgICAgc3ZuX2luZm9fYXJncyA9 IFtjbHMuZXhlY3V0YWJsZV9uYW1lLCAnaW5mbyddCi0gICAgICAgIGV4aXRfY29kZSA9IGV4ZWN1 dGl2ZS5ydW5fY29tbWFuZChzdm5faW5mb19hcmdzLCBjd2Q9cGF0aCwgcmV0dXJuX2V4aXRfY29k ZT1UcnVlKQorICAgICAgICBleGl0X2NvZGUgPSBleGVjdXRpdmUucnVuX2NvbW1hbmQoc3ZuX2lu Zm9fYXJncywgY3dkPXBhdGgsIHJldHVybl9leGl0X2NvZGU9VHJ1ZSwgc2hlbGw9KHN5cy5wbGF0 Zm9ybSA9PSAnd2luMzInKSkKICAgICAgICAgcmV0dXJuIChleGl0X2NvZGUgPT0gMCkKIAogICAg IGRlZiBmaW5kX3V1aWQoc2VsZiwgcGF0aCk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weQppbmRleCBmMWE0MDEyNjg0MDg0NmY1MDU1Mjhk MjM4MGU0MWE5NTFmYjJhYjM4Li4yNzAyMGZhMzZmMjkzM2M5ZjczZjM3ZDkyN2JlZGUxYjg2YTM1 OTVlIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhl Y3V0aXZlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVj dXRpdmUucHkKQEAgLTM4Myw3ICszODMsOCBAQCBjbGFzcyBFeGVjdXRpdmUob2JqZWN0KToKICAg ICAgICAgICAgICAgICAgICAgZXJyb3JfaGFuZGxlcj1Ob25lLAogICAgICAgICAgICAgICAgICAg ICByZXR1cm5fZXhpdF9jb2RlPUZhbHNlLAogICAgICAgICAgICAgICAgICAgICByZXR1cm5fc3Rk ZXJyPVRydWUsCi0gICAgICAgICAgICAgICAgICAgIGRlY29kZV9vdXRwdXQ9VHJ1ZSk6CisgICAg ICAgICAgICAgICAgICAgIGRlY29kZV9vdXRwdXQ9VHJ1ZSwKKyAgICAgICAgICAgICAgICAgICAg c2hlbGw9RmFsc2UpOgogICAgICAgICAiIiJQb3BlbiB3cmFwcGVyIGZvciBjb252ZW5pZW5jZSBh bmQgdG8gd29yayBhcm91bmQgcHl0aG9uIGJ1Z3MuIiIiCiAgICAgICAgIGFzc2VydChpc2luc3Rh bmNlKGFyZ3MsIGxpc3QpIG9yIGlzaW5zdGFuY2UoYXJncywgdHVwbGUpKQogICAgICAgICBzdGFy dF90aW1lID0gdGltZS50aW1lKCkKQEAgLTM5OSw3ICs0MDAsOCBAQCBjbGFzcyBFeGVjdXRpdmUo b2JqZWN0KToKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RkZXJyPXN0ZGVyciwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY3dkPWN3ZCwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZW52PWVudiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2xvc2VfZmRz PXNlbGYuX3Nob3VsZF9jbG9zZV9mZHMoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y2xvc2VfZmRzPXNlbGYuX3Nob3VsZF9jbG9zZV9mZHMoKSwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgc2hlbGw9c2hlbGwpCiAgICAgICAgIG91dHB1dCA9IHByb2Nlc3MuY29tbXVuaWNh dGUoc3RyaW5nX3RvX2NvbW11bmljYXRlKVswXQogCiAgICAgICAgICMgcnVuX2NvbW1hbmQgYXV0 b21hdGljYWxseSBkZWNvZGVzIHRvIHVuaWNvZGUoKSB1bmxlc3MgZXhwbGljaXRseSB0b2xkIG5v dCB0by4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9l eGVjdXRpdmVfbW9jay5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9l eGVjdXRpdmVfbW9jay5weQppbmRleCBjY2UyMWIyMzMzNWE0NTk4NjI2NTdmZGZmMGYyOGVhYzVh NzhjMWZhLi5kNDU3ZWYwZjBkNDk3YTE5OGFiMjNiMzNjYWNmOWRjNzk3YzQ4ZmIzIDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlX21vY2su cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZV9t b2NrLnB5CkBAIC05MSw3ICs5MSw4IEBAIGNsYXNzIE1vY2tFeGVjdXRpdmUob2JqZWN0KToKICAg ICAgICAgICAgICAgICAgICAgcmV0dXJuX2V4aXRfY29kZT1GYWxzZSwKICAgICAgICAgICAgICAg ICAgICAgcmV0dXJuX3N0ZGVycj1UcnVlLAogICAgICAgICAgICAgICAgICAgICBkZWNvZGVfb3V0 cHV0PUZhbHNlLAotICAgICAgICAgICAgICAgICAgICBlbnY9Tm9uZSk6CisgICAgICAgICAgICAg ICAgICAgIGVudj1Ob25lLAorICAgICAgICAgICAgICAgICAgICBzaGVsbD1GYWxzZSk6CiAgICAg ICAgIGFzc2VydChpc2luc3RhbmNlKGFyZ3MsIGxpc3QpIG9yIGlzaW5zdGFuY2UoYXJncywgdHVw bGUpKQogICAgICAgICBpZiBzZWxmLl9zaG91bGRfbG9nOgogICAgICAgICAgICAgZW52X3N0cmlu ZyA9ICIiCkBAIC0xNTgsNyArMTU5LDggQEAgY2xhc3MgTW9ja0V4ZWN1dGl2ZTIob2JqZWN0KToK ICAgICAgICAgICAgICAgICAgICAgcmV0dXJuX2V4aXRfY29kZT1GYWxzZSwKICAgICAgICAgICAg ICAgICAgICAgcmV0dXJuX3N0ZGVycj1UcnVlLAogICAgICAgICAgICAgICAgICAgICBkZWNvZGVf b3V0cHV0PUZhbHNlLAotICAgICAgICAgICAgICAgICAgICBlbnY9Tm9uZSk6CisgICAgICAgICAg ICAgICAgICAgIGVudj1Ob25lLAorICAgICAgICAgICAgICAgICAgICBzaGVsbD1GYWxzZSk6CiAg ICAgICAgIGFzc2VydChpc2luc3RhbmNlKGFyZ3MsIGxpc3QpIG9yIGlzaW5zdGFuY2UoYXJncywg dHVwbGUpKQogICAgICAgICBpZiBzZWxmLl9leGNlcHRpb246CiAgICAgICAgICAgICByYWlzZSBz ZWxmLl9leGNlcHRpb24K 167003 2012-10-03 17:14:22 -0700 2012-10-03 19:00:09 -0700 Patch bug-98323-20121003171333.patch text/plain 2388 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwMzE0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTMxY2RhMDQ4Y2FiNDc5YTcxYTQ0OGNiN2RlNDBjNzgw ZWU1NDY3My4uMzRiZGRjZDIwNjNkNDJmNDE5MjUzZDFjMTYyMmZiYWI0YTYxODRjMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEyLTEwLTAzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIHJ1bi13ZWJraXQtdGVzdHMgdGVzdHMgb24gd2luMzIgYWZ0ZXIgcjEyNzMwMgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTgzMjMKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMb29rcyBsaWtlIHdo ZW4gd2UgY29udmVydGVkIHRoZSBqc29uLWJ1aWxkaW5nIGxvZ2ljIHRvIHVzZSBzY20KKyAgICAg ICAgdG8gdHJ5IGFuZCBnZXQgdGhlIHN2biByZXZpc2lvbiwgd2UgbWlzc2VkIGEgd2luMzItaXNt IGFuZAorICAgICAgICBkaWRuJ3QgY2hlY2sgdG8gbWFrZSBzdXJlIGhhZCBpbml0aWFsaXplZCB0 aGUgc2NtIHN1YnN5c3RlbS4KKworICAgICAgICAqIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fcmVzdWx0c19nZW5lcmF0b3IucHk6CisKIDIw MTItMTAtMDMgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAg ICBFeGNlcHRpb24gdGhyb3duIHdoZW4gcnVubmluZyBhY2Nlc3NpYmlsaXR5L2NvbnRhaW5lci1u b2RlLWRlbGV0ZS1jYXVzZXMtY3Jhc2guaHRtbCB0ZXN0CmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX3Jlc3VsdHNfZ2Vu ZXJhdG9yLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3Bh Y2thZ2UvanNvbl9yZXN1bHRzX2dlbmVyYXRvci5weQppbmRleCBjN2Q3YzNlYjdiYTMzMzE5OGU4 M2YyMjIwNDMyYWIzNjY1OWEwYmU0Li5mYmNkNDVmMzZhZDE0Yzk3MjhiZTg5ZGM0N2Y5ODcxYTk5 NWZkNGMyIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9s YXlvdXRfcGFja2FnZS9qc29uX3Jlc3VsdHNfZ2VuZXJhdG9yLnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fcmVzdWx0c19nZW5l cmF0b3IucHkKQEAgLTI4MSw3ICsyODEsOCBAQCBjbGFzcyBKU09OUmVzdWx0c0dlbmVyYXRvckJh c2Uob2JqZWN0KToKIAogICAgICAgICByZXN1bHRzX2Zvcl9idWlsZGVyID0gcmVzdWx0c19qc29u W2J1aWxkZXJfbmFtZV0KIAotICAgICAgICBzZWxmLl9pbnNlcnRfZ2VuZXJpY19tZXRhZGF0YShy ZXN1bHRzX2Zvcl9idWlsZGVyKQorICAgICAgICBpZiBidWlsZGVyX25hbWU6CisgICAgICAgICAg ICBzZWxmLl9pbnNlcnRfZ2VuZXJpY19tZXRhZGF0YShyZXN1bHRzX2Zvcl9idWlsZGVyKQogCiAg ICAgICAgIHNlbGYuX2luc2VydF9mYWlsdXJlX3N1bW1hcmllcyhyZXN1bHRzX2Zvcl9idWlsZGVy KQogCkBAIC0zNzcsMTUgKzM3OCwxNCBAQCBjbGFzcyBKU09OUmVzdWx0c0dlbmVyYXRvckJhc2Uo b2JqZWN0KToKIAogICAgICAgICByZXR1cm4gc2VsZi5fX2NsYXNzX18uUEFTU19SRVNVTFQKIAot ICAgICMgRklYTUU6IENhbGxlcnMgc2hvdWxkIHVzZSBzY20ucHkgaW5zdGVhZC4KLSAgICAjIEZJ WE1FOiBJZGVudGlmeSBhbmQgZml4IHRoZSBydW4tdGltZSBlcnJvcnMgdGhhdCB3ZXJlIG9ic2Vy dmVkIG9uIFdpbmRvd3MKLSAgICAjIGNocm9taXVtIGJ1aWxkYm90IHdoZW4gd2UgaGFkIHVwZGF0 ZWQgdGhpcyBjb2RlIHRvIHVzZSBzY20ucHkgb25jZSBiZWZvcmUuCiAgICAgZGVmIF9nZXRfc3Zu X3JldmlzaW9uKHNlbGYsIGluX2RpcmVjdG9yeSk6CiAgICAgICAgICIiIlJldHVybnMgdGhlIHN2 biByZXZpc2lvbiBmb3IgdGhlIGdpdmVuIGRpcmVjdG9yeS4KIAogICAgICAgICBBcmdzOgogICAg ICAgICAgIGluX2RpcmVjdG9yeTogVGhlIGRpcmVjdG9yeSB3aGVyZSBzdm4gaXMgdG8gYmUgcnVu LgogICAgICAgICAiIiIKKworICAgICAgICBzZWxmLl9wb3J0Lmhvc3QuX2luaXRpYWxpemVfc2Nt KCkKICAgICAgICAgc2NtID0gU0NNRGV0ZWN0b3Ioc2VsZi5fZmlsZXN5c3RlbSwgc2VsZi5fZXhl Y3V0aXZlKS5kZXRlY3Rfc2NtX3N5c3RlbShpbl9kaXJlY3RvcnkpCiAgICAgICAgIGlmIHNjbToK ICAgICAgICAgICAgIHJldHVybiBzY20uc3ZuX3JldmlzaW9uKGluX2RpcmVjdG9yeSkK 167018 2012-10-03 19:00:11 -0700 2012-10-03 19:02:01 -0700 make initialize_scm() public bug-98323-20121003185922.patch text/plain 10122 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwMzUyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODAxZjc4MjcxNzUwN2RmZGNjMWRkODU1NTMzNTBkNzM5 N2M2ZjdiMy4uMzRkY2ZkOTAzZmY1OGZmMmYzZTA4YmFjYjM5YWRhZGY0ZThjMjE4YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQz IEBACisyMDEyLTEwLTAzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIHJ1bi13ZWJraXQtdGVzdHMgdGVzdHMgb24gd2luMzIgYWZ0ZXIgcjEyNzMwMgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTgzMjMKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBydW4td2Via2l0LXRl c3RzIHRlc3RzIG9uIHdpbjMyIGFmdGVyIHIxMjczMDIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk4MzIzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTG9va3MgbGlrZSB3aGVuIHdlIGNvbnZlcnRlZCB0aGUg anNvbi1idWlsZGluZyBsb2dpYyB0byB1c2Ugc2NtCisgICAgICAgIHRvIHRyeSBhbmQgZ2V0IHRo ZSBzdm4gcmV2aXNpb24sIHdlIG1pc3NlZCBhIHdpbjMyLWlzbSBhbmQKKyAgICAgICAgZGlkbid0 IGNoZWNrIHRvIG1ha2Ugc3VyZSBoYWQgaW5pdGlhbGl6ZWQgdGhlIHNjbSBzdWJzeXN0ZW0uCisK KyAgICAgICAgVGhpcyBjaGFuZ2UgZml4ZXMgdGhhdCBhbmQgcmVuYW1lcyBfaW5pdGlhbGl6ZV9z Y20gdG8gYmUgYSBwdWJsaWMgbWV0aG9kLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9j b21tb24vaG9zdC5weToKKyAgICAgICAgKEhvc3QuaW5pdGlhbGl6ZV9zY20pOgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2hvc3RfbW9jay5weToKKyAgICAgICAgKE1vY2tIb3N0 Ll9faW5pdF9fKToKKyAgICAgICAgKE1vY2tIb3N0LmluaXRpYWxpemVfc2NtKToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5Ogor ICAgICAgICAoc3VtbWFyaXplX3Jlc3VsdHMpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fcmVzdWx0c19nZW5lcmF0b3IucHk6Cisg ICAgICAgIChKU09OUmVzdWx0c0dlbmVyYXRvckJhc2UuZ2V0X2pzb24pOgorICAgICAgICAoSlNP TlJlc3VsdHNHZW5lcmF0b3JCYXNlLl9nZXRfcmVzdWx0X2NoYXIpOgorICAgICAgICAoSlNPTlJl c3VsdHNHZW5lcmF0b3JCYXNlLl9nZXRfc3ZuX3JldmlzaW9uKToKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lci5weToKKyAgICAgICAg KFBlcmZUZXN0c1J1bm5lci5fX2luaXRfXyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9z dHlsZS9jaGVja2Vycy90ZXN0X2V4cGVjdGF0aW9ucy5weToKKyAgICAgICAgKFRlc3RFeHBlY3Rh dGlvbnNDaGVja2VyLl9faW5pdF9fKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxl L21haW4ucHk6CisgICAgICAgIChDaGVja1dlYktpdFN0eWxlLm1haW4pOgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvdG9vbC9tYWluLnB5OgorICAgICAgICAoV2ViS2l0UGF0Y2guaGFuZGxl X2dsb2JhbF9vcHRpb25zKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc2VydmVy cy9yZWJhc2VsaW5lc2VydmVyLnB5OgorICAgICAgICAoZ2V0X3Rlc3RfYmFzZWxpbmVzKToKKwog MjAxMi0xMC0wMyAgQWRyaWFuIFBlcmV6IGRlIENhc3RybyAgPGFwZXJlekBpZ2FsaWEuY29tPgog CiAgICAgICAgIFtHVEtdIE1ha2UgaW5zcGVjdG9yIGRpcmVjdGx5IHVzZWFibGUgaW4gR3RrTGF1 bmNoZXIvTWluaUJyb3dzZXIKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL2hvc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9ob3N0LnB5CmluZGV4 IDUzODg5NjU3YjA0NTgwNWYwODhkYjM4YjIyMGVmNGRmZjE4NDE0MzEuLjdkZDVhZDAyNDUwY2Zl ZTk5NTgzZThlNTFhNzllZDkyMjMxNzk5NmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL2hvc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v aG9zdC5weQpAQCAtMTI1LDcgKzEyNSw3IEBAIGNsYXNzIEhvc3QoU3lzdGVtSG9zdCk6CiAgICAg ICAgICAgICBleGNlcHQgT1NFcnJvciwgZToKICAgICAgICAgICAgICAgICBfbG9nLmRlYnVnKCdG YWlsZWQgdG8gZW5nYWdlIGdpdC5iYXQgV2luZG93cyBoYWNrLicpCiAKLSAgICBkZWYgX2luaXRp YWxpemVfc2NtKHNlbGYsIHBhdGNoX2RpcmVjdG9yaWVzPU5vbmUpOgorICAgIGRlZiBpbml0aWFs aXplX3NjbShzZWxmLCBwYXRjaF9kaXJlY3Rvcmllcz1Ob25lKToKICAgICAgICAgaWYgc3lzLnBs YXRmb3JtID09ICJ3aW4zMiI6CiAgICAgICAgICAgICBzZWxmLl9lbmdhZ2VfYXdlc29tZV93aW5k b3dzX2hhY2tzKCkKICAgICAgICAgZGV0ZWN0b3IgPSBTQ01EZXRlY3RvcihzZWxmLmZpbGVzeXN0 ZW0sIHNlbGYuZXhlY3V0aXZlKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vaG9zdF9tb2NrLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vaG9zdF9t b2NrLnB5CmluZGV4IGNhNGY3OGViM2JlZjhkN2EyOTFhNzJjNTgxMTk0NjVjOWE2N2UxZTkuLjhi NTA4YmY4Zjc5MmRkNDBmMjIxYzQ5NDE0ZjJjYjJiY2Q4NzUzNmMgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2hvc3RfbW9jay5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9ob3N0X21vY2sucHkKQEAgLTUwLDcgKzUwLDcgQEAgY2xhc3MgTW9j a0hvc3QoTW9ja1N5c3RlbUhvc3QpOgogICAgICAgICAjIEZJWE1FOiB3ZSBzaG91bGQgbmV2ZXIg aW5pdGlhbGl6ZSB0aGUgU0NNIGJ5IGRlZmF1bHQsIHNpbmNlIHRoZSByZWFsCiAgICAgICAgICMg b2JqZWN0IGRvZXNuJ3QgZWl0aGVyLiBUaGlzIGhhcyBjYXVzZWQgYXQgbGVhc3Qgb25lIGJ1ZyAo c2VlIGJ1ZyA4OTQ5OCkuCiAgICAgICAgIGlmIGluaXRpYWxpemVfc2NtX2J5X2RlZmF1bHQ6Ci0g ICAgICAgICAgICBzZWxmLl9pbml0aWFsaXplX3NjbSgpCisgICAgICAgICAgICBzZWxmLmluaXRp YWxpemVfc2NtKCkKICAgICAgICAgc2VsZi5idWdzID0gTW9ja0J1Z3ppbGxhKCkKICAgICAgICAg c2VsZi5idWlsZGJvdCA9IE1vY2tCdWlsZEJvdCgpCiAgICAgICAgIHNlbGYuX2Nocm9taXVtX2J1 aWxkYm90ID0gTW9ja0J1aWxkQm90KCkKQEAgLTYxLDcgKzYxLDcgQEAgY2xhc3MgTW9ja0hvc3Qo TW9ja1N5c3RlbUhvc3QpOgogCiAgICAgICAgIHNlbGYuX3dhdGNoX2xpc3QgPSBNb2NrV2F0Y2hM aXN0KCkKIAotICAgIGRlZiBfaW5pdGlhbGl6ZV9zY20oc2VsZiwgcGF0Y2hfZGlyZWN0b3JpZXM9 Tm9uZSk6CisgICAgZGVmIGluaXRpYWxpemVfc2NtKHNlbGYsIHBhdGNoX2RpcmVjdG9yaWVzPU5v bmUpOgogICAgICAgICBzZWxmLl9zY20gPSBNb2NrU0NNKGZpbGVzeXN0ZW09c2VsZi5maWxlc3lz dGVtLCBleGVjdXRpdmU9c2VsZi5leGVjdXRpdmUpCiAgICAgICAgICMgVmFyaW91cyBwaWVjZXMg b2YgY29kZSAod3JvbmdseSkgY2FsbCBmaWxlc3lzdGVtLmNoZGlyKGNoZWNrb3V0X3Jvb3QpLgog ICAgICAgICAjIE1ha2luZyB0aGUgY2hlY2tvdXRfcm9vdCBleGlzdCBpbiB0aGUgbW9jayBmaWxl c3lzdGVtIG1ha2VzIHRoYXQgY2hkaXIgbm90IHJhaXNlLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKaW5k ZXggZDA2ZWQ3MTUzNDk2MjA4ZWE3M2U2OWMwZmNhYzFjNDljNjNmZjNmZC4uYzBhNzBlNjE1MzBj YWQyMTI5YmM3NzUyNzQwNWRjYzA0OTVjZTNkYSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CkBAIC0y MzksOCArMjM5LDkgQEAgZGVmIHN1bW1hcml6ZV9yZXN1bHRzKHBvcnRfb2JqLCBleHBlY3RhdGlv bnMsIHJlc3VsdF9zdW1tYXJ5LCByZXRyeV9zdW1tYXJ5LCB0ZXMKICAgICB0cnk6CiAgICAgICAg ICMgV2Ugb25seSB1c2UgdGhlIHN2biByZXZpc2lvbiBmb3IgdXNpbmcgdHJhYyBsaW5rcyBpbiB0 aGUgcmVzdWx0cy5odG1sIGZpbGUsCiAgICAgICAgICMgRG9uJ3QgZG8gdGhpcyBieSBkZWZhdWx0 IHNpbmNlIGl0IHRha2VzID4xMDBtcy4KKyAgICAgICAgIyBGSVhNRTogRG8gd2UgcmVhbGx5IG5l ZWQgdG8gcG9wdWxhdGUgdGhpcyBib3RoIGhlcmUgYW5kIGluIHRoZSBqc29uX3Jlc3VsdHNfZ2Vu ZXJhdG9yPwogICAgICAgICBpZiB1c2VfdHJhY19saW5rc19pbl9yZXN1bHRzX2h0bWwocG9ydF9v YmopOgotICAgICAgICAgICAgcG9ydF9vYmouaG9zdC5faW5pdGlhbGl6ZV9zY20oKQorICAgICAg ICAgICAgcG9ydF9vYmouaG9zdC5pbml0aWFsaXplX3NjbSgpCiAgICAgICAgICAgICByZXN1bHRz WydyZXZpc2lvbiddID0gcG9ydF9vYmouaG9zdC5zY20oKS5oZWFkX3N2bl9yZXZpc2lvbigpCiAg ICAgZXhjZXB0IEV4Y2VwdGlvbiwgZToKICAgICAgICAgX2xvZy53YXJuKCJGYWlsZWQgdG8gZGV0 ZXJtaW5lIHN2biByZXZpc2lvbiBmb3IgY2hlY2tvdXQgKGN3ZDogJXMsIHdlYmtpdF9iYXNlOiAl cyksIGxlYXZpbmcgJ3JldmlzaW9uJyBrZXkgYmxhbmsgaW4gZnVsbF9yZXN1bHRzLmpzb24uXG4l cyIgJSAocG9ydF9vYmouX2ZpbGVzeXN0ZW0uZ2V0Y3dkKCksIHBvcnRfb2JqLnBhdGhfZnJvbV93 ZWJraXRfYmFzZSgpLCBlKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fcmVzdWx0c19nZW5lcmF0b3IucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX3Jlc3Vs dHNfZ2VuZXJhdG9yLnB5CmluZGV4IGM3ZDdjM2ViN2JhMzMzMTk4ZTgzZjIyMjA0MzJhYjM2NjU5 YTBiZTQuLmFiYmQ1ZTAzYmQ4ZmFlOGQ5NGI0OWFmNmJmNzVjN2UzMzUzMjgwZjUgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pz b25fcmVzdWx0c19nZW5lcmF0b3IucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9yZXN1bHRzX2dlbmVyYXRvci5weQpAQCAtMjgx LDcgKzI4MSw4IEBAIGNsYXNzIEpTT05SZXN1bHRzR2VuZXJhdG9yQmFzZShvYmplY3QpOgogCiAg ICAgICAgIHJlc3VsdHNfZm9yX2J1aWxkZXIgPSByZXN1bHRzX2pzb25bYnVpbGRlcl9uYW1lXQog Ci0gICAgICAgIHNlbGYuX2luc2VydF9nZW5lcmljX21ldGFkYXRhKHJlc3VsdHNfZm9yX2J1aWxk ZXIpCisgICAgICAgIGlmIGJ1aWxkZXJfbmFtZToKKyAgICAgICAgICAgIHNlbGYuX2luc2VydF9n ZW5lcmljX21ldGFkYXRhKHJlc3VsdHNfZm9yX2J1aWxkZXIpCiAKICAgICAgICAgc2VsZi5faW5z ZXJ0X2ZhaWx1cmVfc3VtbWFyaWVzKHJlc3VsdHNfZm9yX2J1aWxkZXIpCiAKQEAgLTM3NywxNSAr Mzc4LDE2IEBAIGNsYXNzIEpTT05SZXN1bHRzR2VuZXJhdG9yQmFzZShvYmplY3QpOgogCiAgICAg ICAgIHJldHVybiBzZWxmLl9fY2xhc3NfXy5QQVNTX1JFU1VMVAogCi0gICAgIyBGSVhNRTogQ2Fs bGVycyBzaG91bGQgdXNlIHNjbS5weSBpbnN0ZWFkLgotICAgICMgRklYTUU6IElkZW50aWZ5IGFu ZCBmaXggdGhlIHJ1bi10aW1lIGVycm9ycyB0aGF0IHdlcmUgb2JzZXJ2ZWQgb24gV2luZG93cwot ICAgICMgY2hyb21pdW0gYnVpbGRib3Qgd2hlbiB3ZSBoYWQgdXBkYXRlZCB0aGlzIGNvZGUgdG8g dXNlIHNjbS5weSBvbmNlIGJlZm9yZS4KICAgICBkZWYgX2dldF9zdm5fcmV2aXNpb24oc2VsZiwg aW5fZGlyZWN0b3J5KToKICAgICAgICAgIiIiUmV0dXJucyB0aGUgc3ZuIHJldmlzaW9uIGZvciB0 aGUgZ2l2ZW4gZGlyZWN0b3J5LgogCiAgICAgICAgIEFyZ3M6CiAgICAgICAgICAgaW5fZGlyZWN0 b3J5OiBUaGUgZGlyZWN0b3J5IHdoZXJlIHN2biBpcyB0byBiZSBydW4uCiAgICAgICAgICIiIgor CisgICAgICAgICMgRklYTUU6IFdlIGluaXRpYWxpemUgdGhpcyBoZXJlIGluIG9yZGVyIHRvIGVu Z2FnZSB0aGUgc3R1cGlkIHdpbmRvd3MgaGFja3MgOikuCisgICAgICAgICMgV2UgY2FuJ3QgcmV1 c2UgYW4gZXhpc3Rpbmcgc2NtIG9iamVjdCBiZWNhdXNlIHdlIG5lZWQgdG8gbG9vayBhdCB0aGUg c3BlY2lmaWMgZGlyZWN0b3JpZXMuCisgICAgICAgIHNlbGYuX3BvcnQuaG9zdC5pbml0aWFsaXpl X3NjbSgpCiAgICAgICAgIHNjbSA9IFNDTURldGVjdG9yKHNlbGYuX2ZpbGVzeXN0ZW0sIHNlbGYu X2V4ZWN1dGl2ZSkuZGV0ZWN0X3NjbV9zeXN0ZW0oaW5fZGlyZWN0b3J5KQogICAgICAgICBpZiBz Y206CiAgICAgICAgICAgICByZXR1cm4gc2NtLnN2bl9yZXZpc2lvbihpbl9kaXJlY3RvcnkpCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0 ZXN0c3J1bm5lci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMv cGVyZnRlc3RzcnVubmVyLnB5CmluZGV4IDYzYjVjOGU1YTg3MjAwMjc5YzE4OTA3MjM2NGFhNTQ4 ZDhhYzIyNTkuLjQyZTBkOTZlMTFhNjUyMDVkMThjMDY5OGMyOGNlMGY4YzYzYzFmMmMgMTAwNzU1 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3Rz cnVubmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMv cGVyZnRlc3RzcnVubmVyLnB5CkBAIC02Myw3ICs2Myw3IEBAIGNsYXNzIFBlcmZUZXN0c1J1bm5l cihvYmplY3QpOgogICAgICAgICBlbHNlOgogICAgICAgICAgICAgc2VsZi5faG9zdCA9IEhvc3Qo KQogICAgICAgICAgICAgc2VsZi5fcG9ydCA9IHNlbGYuX2hvc3QucG9ydF9mYWN0b3J5LmdldChz ZWxmLl9vcHRpb25zLnBsYXRmb3JtLCBzZWxmLl9vcHRpb25zKQotICAgICAgICBzZWxmLl9ob3N0 Ll9pbml0aWFsaXplX3NjbSgpCisgICAgICAgIHNlbGYuX2hvc3QuaW5pdGlhbGl6ZV9zY20oKQog ICAgICAgICBzZWxmLl93ZWJraXRfYmFzZV9kaXJfbGVuID0gbGVuKHNlbGYuX3BvcnQud2Via2l0 X2Jhc2UoKSkKICAgICAgICAgc2VsZi5fYmFzZV9wYXRoID0gc2VsZi5fcG9ydC5wZXJmX3Rlc3Rz X2RpcigpCiAgICAgICAgIHNlbGYuX3Jlc3VsdHMgPSB7fQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy90ZXN0X2V4cGVjdGF0aW9ucy5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvdGVzdF9leHBlY3RhdGlvbnMucHkKaW5k ZXggYWU4ZmVhZmRmNDk0ZGZkNzk4ZjRhNmU1NTViNWNmMTA3OTFjNDU1ZC4uMWNlNDBjZDM5ZTJi ZWVjZGEwYWQxOTk4NTVlYmFiMzVjZmIzNzVjMiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9zdHlsZS9jaGVja2Vycy90ZXN0X2V4cGVjdGF0aW9ucy5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rlc3RfZXhwZWN0YXRpb25zLnB5CkBAIC02 Nyw3ICs2Nyw3IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnNDaGVja2VyKG9iamVjdCk6CiAKICAg ICAgICAgIyBGSVhNRTogaG9zdCBzaG91bGQgYmUgYSByZXF1aXJlZCBwYXJhbWV0ZXIsIG5vdCBh biBvcHRpb25hbCBvbmUuCiAgICAgICAgIGhvc3QgPSBob3N0IG9yIEhvc3QoKQotICAgICAgICBo b3N0Ll9pbml0aWFsaXplX3NjbSgpCisgICAgICAgIGhvc3QuaW5pdGlhbGl6ZV9zY20oKQogCiAg ICAgICAgIHNlbGYuX3BvcnRfb2JqID0gc2VsZi5fZGV0ZXJtaW5lX3BvcnRfZnJvbV9leHBlY3Rh dGlvbnNfcGF0aChob3N0LCBmaWxlX3BhdGgpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvc3R5bGUvbWFpbi5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvbWFp bi5weQppbmRleCBlOTBkOThhNDIyMWUzZTEwNjAxZTc5MmE0YjEwNmZiNjNjYTk0ZjYyLi41NzQz NjhhM2VkYmI2ZmUyY2M3MjlkZjBkNTkwMDNjN2Y4OWFkYWUzIDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3N0eWxlL21haW4ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9tYWluLnB5CkBAIC0xMjQsNyArMTI0LDcgQEAgY2xhc3MgQ2hlY2tXZWJLaXRTdHls ZShvYmplY3QpOgogICAgICAgICBhcmdzID0gc3lzLmFyZ3ZbMTpdCiAKICAgICAgICAgaG9zdCA9 IEhvc3QoKQotICAgICAgICBob3N0Ll9pbml0aWFsaXplX3NjbSgpCisgICAgICAgIGhvc3QuaW5p dGlhbGl6ZV9zY20oKQogCiAgICAgICAgIHN0ZGVyciA9IHNlbGYuX2VuZ2FnZV9hd2Vzb21lX3N0 ZGVycl9oYWNrcygpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9t YWluLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL21haW4ucHkKaW5kZXggZDFmZGU3 NGI4MWZlOGYzMDZkY2JmMTg1NTNlNjA2ZmYwMDc3Yzg2Yi4uNjgzNDhhMDVhMzBmYTQzMGVlN2Zl MzhkMzE2MmQ2MmVlNDM5MTMyOCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL21haW4ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL21haW4ucHkKQEAg LTkxLDcgKzkxLDcgQEAgY2xhc3MgV2ViS2l0UGF0Y2goTXVsdGlDb21tYW5kVG9vbCwgSG9zdCk6 CiAKICAgICAjIEZJWE1FOiBUaGlzIG1heSBiZSB1bm5lY2Vzc2FyeSBzaW5jZSB3ZSBwYXNzIGds b2JhbCBvcHRpb25zIHRvIGFsbCBjb21tYW5kcyBkdXJpbmcgZXhlY3V0ZSgpIGFzIHdlbGwuCiAg ICAgZGVmIGhhbmRsZV9nbG9iYWxfb3B0aW9ucyhzZWxmLCBvcHRpb25zKToKLSAgICAgICAgc2Vs Zi5faW5pdGlhbGl6ZV9zY20ob3B0aW9ucy5wYXRjaF9kaXJlY3RvcmllcykKKyAgICAgICAgc2Vs Zi5pbml0aWFsaXplX3NjbShvcHRpb25zLnBhdGNoX2RpcmVjdG9yaWVzKQogICAgICAgICBpZiBv cHRpb25zLnN0YXR1c19ob3N0OgogICAgICAgICAgICAgc2VsZi5zdGF0dXNfc2VydmVyLnNldF9o b3N0KG9wdGlvbnMuc3RhdHVzX2hvc3QpCiAgICAgICAgIGlmIG9wdGlvbnMuYm90X2lkOgpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3NlcnZlcnMvcmViYXNlbGluZXNl cnZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zZXJ2ZXJzL3JlYmFzZWxpbmVz ZXJ2ZXIucHkKaW5kZXggMGU3NDU4NzI3YWRmNTk2ZmIzMDJmYWRlYjAzNjljMzYxZTQ4YzZkZS4u OWU5YzM3OWQ2YjA1NTg5NWUxMzAxNTg0ODE4N2VkOTlmNzEzMjkwNyAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS90b29sL3NlcnZlcnMvcmViYXNlbGluZXNlcnZlci5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc2VydmVycy9yZWJhc2VsaW5lc2VydmVyLnB5 CkBAIC0xNzgsNyArMTc4LDcgQEAgZGVmIGdldF90ZXN0X2Jhc2VsaW5lcyh0ZXN0X2ZpbGUsIHRl c3RfY29uZmlnKToKIAogICAgICMgRklYTUU6IFRoaXMgc2hvdWxkIGdldCB0aGUgSG9zdCBmcm9t IHRoZSB0ZXN0X2NvbmZpZyB0byBiZSBtb2NrYWJsZSEKICAgICBob3N0ID0gSG9zdCgpCi0gICAg aG9zdC5faW5pdGlhbGl6ZV9zY20oKQorICAgIGhvc3QuaW5pdGlhbGl6ZV9zY20oKQogICAgIGhv c3QuZmlsZXN5c3RlbSA9IHRlc3RfY29uZmlnLmZpbGVzeXN0ZW0KICAgICBhbGxfcGxhdGZvcm1z X3BvcnQgPSBBbGxQbGF0Zm9ybXNQb3J0KGhvc3QpCiAK