114386 2013-04-10 14:54:16 -0700 [webkitpy] SVNTest fails four tests when using subversion client 1.7 or later 2013-04-11 00:02:17 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 114410 1 glenn glenn benjamin commit-queue dpranke eric rniwa oldest_to_newest 873259 0 glenn 2013-04-10 14:54:16 -0700 If the local repository is git based rather than svn based, then the following 4 tests fail when running test-webkitpy --all as follows. In each case, an attempt is being made to invoke 'svn' directly. % test-webkitpy --all Suppressing most webkitpy logging while running unit tests. [128/1584] webkitpy.common.checkout.scm.scm_unittest.SVNTest.test_add_recursively erred: Traceback (most recent call last): File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py", line 825, in test_add_recursively self._shared_test_add_recursively() File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py", line 466, in _shared_test_add_recursively self.scm.add("added_dir/added_file") File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/checkout/scm/scm.py", line 134, in add self.add_list([path], return_exit_code) File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/checkout/scm/svn.py", line 187, in add_list return self._run_svn(["add"] + paths, return_exit_code=return_exit_code) File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/checkout/scm/svn.py", line 137, in _run_svn return self.run([self.executable_name] + args, **kwargs) File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/checkout/scm/scm.py", line 78, in run decode_output=decode_output) File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/system/executive.py", line 432, in run_command (error_handler or self.default_error_handler)(script_error) File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/system/executive.py", line 350, in default_error_handler raise error ScriptError: Failed to run "['svn', 'add', 'added_dir/added_file']" exit_code: 1 [143/1584] webkitpy.common.checkout.scm.scm_unittest.SVNTest.test_delete_recursively erred: Traceback (most recent call last): File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py", line 839, in test_delete_recursively self._shared_test_delete_recursively() File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py", line 472, in _shared_test_delete_recursively self.scm.add("added_dir/added_file") File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/checkout/scm/scm.py", line 134, in add self.add_list([path], return_exit_code) File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/checkout/scm/svn.py", line 187, in add_list return self._run_svn(["add"] + paths, return_exit_code=return_exit_code) File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/checkout/scm/svn.py", line 137, in _run_svn return self.run([self.executable_name] + args, **kwargs) File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/checkout/scm/scm.py", line 78, in run decode_output=decode_output) File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/system/executive.py", line 432, in run_command (error_handler or self.default_error_handler)(script_error) File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/system/executive.py", line 350, in default_error_handler raise error ScriptError: Failed to run "['svn', 'add', 'added_dir/added_file']" exit_code: 1 [144/1584] webkitpy.common.checkout.scm.scm_unittest.SVNTest.test_delete_recursively_or_not erred: Traceback (most recent call last): File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py", line 842, in test_delete_recursively_or_not self._shared_test_delete_recursively_or_not() File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py", line 481, in _shared_test_delete_recursively_or_not self.scm.add("added_dir/added_file") File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/checkout/scm/scm.py", line 134, in add self.add_list([path], return_exit_code) File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/checkout/scm/svn.py", line 187, in add_list return self._run_svn(["add"] + paths, return_exit_code=return_exit_code) File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/checkout/scm/svn.py", line 137, in _run_svn return self.run([self.executable_name] + args, **kwargs) File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/checkout/scm/scm.py", line 78, in run decode_output=decode_output) File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/system/executive.py", line 432, in run_command (error_handler or self.default_error_handler)(script_error) File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/system/executive.py", line 350, in default_error_handler raise error ScriptError: Failed to run "['svn', 'add', 'added_dir/added_file']" exit_code: 1 [495/1584] webkitpy.common.checkout.scm.scm_unittest.SVNTest.test_svn_lock failed: Traceback (most recent call last): File "/Users/glenn/work/webkit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py", line 897, in test_svn_lock self.assertRaises(ScriptError, run_command, ['svn', 'update']) AssertionError: ScriptError not raised Ran 1584 tests in 39.856s FAILED (failures=1, errors=3) 873280 1 glenn 2013-04-10 15:46:19 -0700 Further investigation shows this isn't an issue with git-svn vs svn. 873430 2 glenn 2013-04-10 19:32:13 -0700 Turns out these fails are caused by changes introduced by svn client version 1.7: * .svn/lock no longer used * svn add needs --parents option to add intermediate directories, and returns exit code 1 if a dir/file has already been added 873431 3 197465 glenn 2013-04-10 19:36:02 -0700 Created attachment 197465 Patch 873432 4 197465 rniwa 2013-04-10 19:40:01 -0700 Comment on attachment 197465 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=197465&action=review > Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py:894 > + if self.scm.svn_version() > "1.6": Why don't we convert the svn version to float otherwise, we'll be doing a string comparison. Also, it's probably better to do >= 1.7 instead. > Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py:895 > + # .svn/lock isn't used with svn client 1.7 and later I would say "subversion client" or "svn", not "svn client". > Tools/Scripts/webkitpy/common/checkout/scm/svn.py:187 > + if self.svn_version() < "1.7": Ditto about casting it to float first. > Tools/Scripts/webkitpy/common/checkout/scm/svn.py:198 > + if return_exit_code: > + return exit_code > + if exit_code and exit_code != 1: > + raise ScriptError(script_args=svn_add_args, exit_code=exit_code) We might need to return 0 when the exit code is 1 and return_exit_code is set True for the compatibility. 873437 5 glenn 2013-04-10 20:01:22 -0700 (In reply to comment #4) > (From update of attachment 197465 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=197465&action=review > > > Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py:894 > > + if self.scm.svn_version() > "1.6": > > Why don't we convert the svn version to float otherwise, we'll be doing a string comparison. > Also, it's probably better to do >= 1.7 instead. The problem is that the version string is normally three parts, e.g., "1.7.8" is returned from my current version. Also there was existing code that did a string comparison: see SVN._status_regexp(). > > > Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py:895 > > + # .svn/lock isn't used with svn client 1.7 and later > > I would say "subversion client" or "svn", not "svn client". OK, i can change that comment before committing. > > > Tools/Scripts/webkitpy/common/checkout/scm/svn.py:187 > > + if self.svn_version() < "1.7": > > Ditto about casting it to float first. See above. > > > Tools/Scripts/webkitpy/common/checkout/scm/svn.py:198 > > + if return_exit_code: > > + return exit_code > > + if exit_code and exit_code != 1: > > + raise ScriptError(script_args=svn_add_args, exit_code=exit_code) > > We might need to return 0 when the exit code is 1 and return_exit_code is set True for the compatibility. * SCM.add() calls add_list but returns no value regardless of what return_exit_code is passed. * MockSCM.add() does the same thing * BaselineOptimizer._move_baselines ignores the return value from add_list * AbstractParallelRebaselineCommand._rebaseline also ignores So no caller of add_list is actually using the return value, thus I see no compat issue. 873453 6 glenn 2013-04-10 20:15:36 -0700 (In reply to comment #5) > (In reply to comment #4) > > (From update of attachment 197465 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=197465&action=review > > > > > Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py:894 > > > + if self.scm.svn_version() > "1.6": > > > > Why don't we convert the svn version to float otherwise, we'll be doing a string comparison. > > Also, it's probably better to do >= 1.7 instead. > > The problem is that the version string is normally three parts, e.g., "1.7.8" is returned from my current version. Also there was existing code that did a string comparison: see SVN._status_regexp(). As for using >= "1.7", you are right; i will also change that prior to commit; i.e., "1.6.1" is lexically greater than "1.6" but I don't want the test skipped in that case. 873508 7 197498 glenn 2013-04-10 20:19:56 -0700 Created attachment 197498 Patch 873525 8 rniwa 2013-04-10 21:01:26 -0700 (In reply to comment #5) > (In reply to comment #4) > > * SCM.add() calls add_list but returns no value regardless of what return_exit_code is passed. > * MockSCM.add() does the same thing > * BaselineOptimizer._move_baselines ignores the return value from add_list > * AbstractParallelRebaselineCommand._rebaseline also ignores > > So no caller of add_list is actually using the return value, thus I see no compat issue. Why don't we get rid of return_exit_code in that case? Sounds like this argument is completely useless. 873527 9 glenn 2013-04-10 21:39:13 -0700 (In reply to comment #8) > (In reply to comment #5) > > (In reply to comment #4) > > > > * SCM.add() calls add_list but returns no value regardless of what return_exit_code is passed. > > * MockSCM.add() does the same thing > > * BaselineOptimizer._move_baselines ignores the return value from add_list > > * AbstractParallelRebaselineCommand._rebaseline also ignores > > > > So no caller of add_list is actually using the return value, thus I see no compat issue. > > Why don't we get rid of return_exit_code in that case? Sounds like this argument is completely useless. I could do that, but it is unrelated to the bug fix. I don't like to make opportunistic changes that are unrelated to a fix. 873528 10 glenn 2013-04-10 21:41:02 -0700 (In reply to comment #9) > (In reply to comment #8) > > (In reply to comment #5) > > > (In reply to comment #4) > > > > > > * SCM.add() calls add_list but returns no value regardless of what return_exit_code is passed. > > > * MockSCM.add() does the same thing > > > * BaselineOptimizer._move_baselines ignores the return value from add_list > > > * AbstractParallelRebaselineCommand._rebaseline also ignores > > > > > > So no caller of add_list is actually using the return value, thus I see no compat issue. > > > > Why don't we get rid of return_exit_code in that case? Sounds like this argument is completely useless. > > I could do that, but it is unrelated to the bug fix. I don't like to make opportunistic changes that are unrelated to a fix. Also, it is effectively part of the base SCM class API that is implemented by both git.py and svn.py. 873531 11 rniwa 2013-04-10 21:53:39 -0700 (In reply to comment #10) > (In reply to comment #9) > > (In reply to comment #8) > > > (In reply to comment #5) > > > > (In reply to comment #4) > > > > > > > > * SCM.add() calls add_list but returns no value regardless of what return_exit_code is passed. > > > > * MockSCM.add() does the same thing > > > > * BaselineOptimizer._move_baselines ignores the return value from add_list > > > > * AbstractParallelRebaselineCommand._rebaseline also ignores > > > > > > > > So no caller of add_list is actually using the return value, thus I see no compat issue. > > > > > > Why don't we get rid of return_exit_code in that case? Sounds like this argument is completely useless. > > > > I could do that, but it is unrelated to the bug fix. I don't like to make opportunistic changes that are unrelated to a fix. > > Also, it is effectively part of the base SCM class API that is implemented by both git.py and svn.py. But we're adding a code that nobody uses in practice. That seems like a bad idea. 873532 12 197498 rniwa 2013-04-10 21:54:07 -0700 Comment on attachment 197498 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=197498&action=review On my second thought, we shouldn't be adding code that nobody really uses. r-. > Tools/Scripts/webkitpy/common/checkout/scm/svn.py:196 > + if return_exit_code: > + return exit_code Please mention, in the change log, it's okay to return 1 in some cases. 873533 13 glenn 2013-04-10 21:57:28 -0700 (In reply to comment #11) > (In reply to comment #10) > > (In reply to comment #9) > > > (In reply to comment #8) > > > > (In reply to comment #5) > > > > > (In reply to comment #4) > > > > > > > > > > * SCM.add() calls add_list but returns no value regardless of what return_exit_code is passed. > > > > > * MockSCM.add() does the same thing > > > > > * BaselineOptimizer._move_baselines ignores the return value from add_list > > > > > * AbstractParallelRebaselineCommand._rebaseline also ignores > > > > > > > > > > So no caller of add_list is actually using the return value, thus I see no compat issue. > > > > > > > > Why don't we get rid of return_exit_code in that case? Sounds like this argument is completely useless. > > > > > > I could do that, but it is unrelated to the bug fix. I don't like to make opportunistic changes that are unrelated to a fix. > > > > Also, it is effectively part of the base SCM class API that is implemented by both git.py and svn.py. > > But we're adding a code that nobody uses in practice. That seems like a bad idea. I don't understand this comment. The return_exit_code parameter was there. I did nothing to change it. I merely ensured that the semantics of the change would work consistently with that pre-existing API, whether it was used or not. 873535 14 rniwa 2013-04-10 21:59:27 -0700 (In reply to comment #13) > I don't understand this comment. The return_exit_code parameter was there. I did nothing to change it. I merely ensured that the semantics of the change would work consistently with that pre-existing API, whether it was used or not. In WebKit, we don't normally fix code that's never used. If we find out that some feature or API is never used, we try to delete that part of the API as soon as possible. 873538 15 glenn 2013-04-10 22:03:16 -0700 (In reply to comment #12) > (From update of attachment 197498 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=197498&action=review > > On my second thought, we shouldn't be adding code that nobody really uses. r-. I don't understand this comment. We aren't adding code that nobody really uses. We are maintaining an existing API's semantics without changing it. Someone else put the argument there in the first place. I can't say if it was used in the past and that usage was removed or if they anticipated its use in the future. Simplifying or changing the API is out of scope of the fix, and should not be merged into this patch IMO. If you want me to do a follow on patch that changes this API, I can do that, but I don't want to merge it with this patch since it is unrelated. > > > Tools/Scripts/webkitpy/common/checkout/scm/svn.py:196 > > + if return_exit_code: > > + return exit_code > > Please mention, in the change log, it's okay to return 1 in some cases. OK. 873539 16 rniwa 2013-04-10 22:04:30 -0700 (In reply to comment #15) > > Simplifying or changing the API is out of scope of the fix, and should not be merged into this patch IMO. If you want me to do a follow on patch that changes this API, I can do that, but I don't want to merge it with this patch since it is unrelated. Then please remove the argument first. 873544 17 glenn 2013-04-10 22:05:56 -0700 (In reply to comment #14) > (In reply to comment #13) > > I don't understand this comment. The return_exit_code parameter was there. I did nothing to change it. I merely ensured that the semantics of the change would work consistently with that pre-existing API, whether it was used or not. > > In WebKit, we don't normally fix code that's never used. If we find out that some feature or API is never used, we try to delete that part of the API as soon as possible. I don't understand this comment. I'm not fixing code that's never used. I'm fixing three failed tests that fail because this code doesn't take into account subversion 1.7 semantics. As I said in my prior comment, I'd be happy to do another, follow-on patch that changes the API, but I don't want to merge it with this patch/bug since it serves an entirely different purpose. 873568 18 197509 glenn 2013-04-10 23:08:22 -0700 Created attachment 197509 Patch 873572 19 197509 benjamin 2013-04-10 23:17:50 -0700 Comment on attachment 197509 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=197509&action=review > Tools/ChangeLog:7 > + I think you should have a word about why the test were failing on 1.7 and later. > Tools/Scripts/webkitpy/common/checkout/scm/svn.py:194 > + if exit_code and exit_code != 1: Maybe just my coding style but to avoid magic numbers I would do: added_tracked_file_exit_code = 1 if exit_code and exit_code != added_tracked_file_exit_code: 873577 20 197512 glenn 2013-04-10 23:32:02 -0700 Created attachment 197512 Patch for landing 873585 21 197512 commit-queue 2013-04-11 00:02:12 -0700 Comment on attachment 197512 Patch for landing Clearing flags on attachment: 197512 Committed r148177: <http://trac.webkit.org/changeset/148177> 873586 22 commit-queue 2013-04-11 00:02:17 -0700 All reviewed patches have been landed. Closing bug. 197465 2013-04-10 19:36:02 -0700 2013-04-10 20:19:49 -0700 Patch bug-114386-20130410203543.patch text/plain 3276 glenn U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4MTM5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTc4ZTRmYTNhZjgyMTk5NjViODQ1N2FiNzQ4OTIzNjRm OTA0OTQ4ZS4uZGQ5MjYyZTQ3MmI5YzcxNjRlMTc0MDg5OTM2MDkzMGZiOTE0ZGNhNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDEzLTA0LTEwICBHbGVubiBBZGFtcyAgPGdsZW5uQHNreW5hdi5jb20+CisKKyAgICAg ICAgW3dlYmtpdHB5XSBTVk5UZXN0IGZhaWxzIGZvdXIgdGVzdHMgd2hlbiB1c2luZyBzdm4gY2xp ZW50IDEuNyBvciBsYXRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTE0Mzg2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0 ZXN0LnB5OgorICAgICAgICAodGVzdF9zdm5fbG9jayk6IFNraXAgaWYgc3ZuIGNsaWVudCB2ZXJz aW9uIDEuNyBvciBsYXRlci4gVGhlIGZpbGUgLnN2bi9sb2NrIGlzIG5vdCB1c2VkIHdpdGggMS43 LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHk6 CisgICAgICAgIChTVk4uYWRkX2xpc3QpOiBBZGQgLS1wYXJlbnRzIG9wdGlvbiBhbmQgc3BlY2lh bCBleGl0IGNvZGUgaGFuZGxpbmcgaWYgc3ZuIGNsaWVudCB2ZXJzaW9uIDEuNyBvciBsYXRlci4K KwogMjAxMy0wNC0xMCAgT2phbiBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IENoYW5nZSBhbGwgaW5zdGFuY2VzIG9mIHRlc3QtcmVzdWx0cy5hcHBzcG90LmNvbSB0byB3ZWJr aXQtdGVzdC1yZXN1bHRzLmFwcHNwb3QuY29tCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5weQppbmRleCAyMTVl ZGQxN2EwN2EyYThhZDBjNTBjZWVlMjkyYWY1YmIwYzg3OGEyLi4xMGJiM2ZhNGI5NmUwZWIwYmI5 YWMxZTZmNmExOWQ5MzlkN2U0ZmQ0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHkKQEAgLTg5MSw2ICs4 OTEsOSBAQCBFTkQKICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShvcy5wYXRoLmV4aXN0cyhzZWxm LmJvZ3VzX2RpcikpCiAKICAgICBkZWYgdGVzdF9zdm5fbG9jayhzZWxmKToKKyAgICAgICAgaWYg c2VsZi5zY20uc3ZuX3ZlcnNpb24oKSA+ICIxLjYiOgorICAgICAgICAgICAgIyAuc3ZuL2xvY2sg aXNuJ3QgdXNlZCB3aXRoIHN2biBjbGllbnQgMS43IGFuZCBsYXRlcgorICAgICAgICAgICAgcmV0 dXJuCiAgICAgICAgIHN2bl9yb290X2xvY2tfcGF0aCA9ICIuc3ZuL2xvY2siCiAgICAgICAgIHdy aXRlX2ludG9fZmlsZV9hdF9wYXRoKHN2bl9yb290X2xvY2tfcGF0aCwgIiIsICJ1dGYtOCIpCiAg ICAgICAgICMgd2Via2l0LXBhdGNoIHVzZXMgYSBDaGVja291dCBvYmplY3QgYW5kIHJ1bnMgdXBk YXRlLXdlYmtpdCwganVzdCB1c2Ugc3ZuIHVwZGF0ZSBoZXJlLgpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkKaW5kZXggODY0NmE1Y2VjZmY0 ZDM4N2ZkNmExODEzODYwNGRjZWIyYWJjNjc0ZC4uMTM2MjExZTdkNGFhMzUwZTE2MjQ3ZWZiZjdl OGZhODM3NWQwMWM1OCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v Y2hlY2tvdXQvc2NtL3N2bi5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vc3ZuLnB5CkBAIC0xODQsNyArMTg0LDE5IEBAIGNsYXNzIFNWTihTQ00sIFNW TlJlcG9zaXRvcnkpOgogICAgIGRlZiBhZGRfbGlzdChzZWxmLCBwYXRocywgcmV0dXJuX2V4aXRf Y29kZT1GYWxzZSk6CiAgICAgICAgIGZvciBwYXRoIGluIHBhdGhzOgogICAgICAgICAgICAgc2Vs Zi5fYWRkX3BhcmVudF9kaXJlY3Rvcmllcyhvcy5wYXRoLmRpcm5hbWUob3MucGF0aC5hYnNwYXRo KHBhdGgpKSkKLSAgICAgICAgcmV0dXJuIHNlbGYuX3J1bl9zdm4oWyJhZGQiXSArIHBhdGhzLCBy ZXR1cm5fZXhpdF9jb2RlPXJldHVybl9leGl0X2NvZGUpCisgICAgICAgIGlmIHNlbGYuc3ZuX3Zl cnNpb24oKSA8ICIxLjciOgorICAgICAgICAgICAgcmV0dXJuIHNlbGYuX3J1bl9zdm4oWyJhZGQi XSArIHBhdGhzLCByZXR1cm5fZXhpdF9jb2RlPXJldHVybl9leGl0X2NvZGUpCisgICAgICAgICMg Rm9yIHN2biBjbGllbnQgMS43IGFuZCBsYXRlciwgbmVlZCB0byBhZGQgJy0tcGFyZW50cycgb3B0 aW9uIHRvIGVuc3VyZSBpbnRlcm1lZGlhdGUgZGlyZWN0b3JpZXMKKyAgICAgICAgIyBhcmUgYWRk ZWQ7IGluIGFkZGl0aW9uLCAxLjcgcmV0dXJucyBhbiBleGl0IGNvZGUgb2YgMSBmcm9tIHN2biBh ZGQgaWYgb25lIG9yIG1vcmUgb2YgdGhlIHJlcXVlc3RlZAorICAgICAgICAjIGFkZHMgYXJlIGFs cmVhZHkgdW5kZXIgdmVyc2lvbiBjb250cm9sLCBpbmNsdWRpbmcgaW50ZXJtZWRpYXRlIGRpcmVj dG9yaWVzIHN1YmplY3QgdG8gYWRkaXRpb24KKyAgICAgICAgIyBkdWUgdG8gLS1wYXJlbnRzCisg ICAgICAgIHN2bl9hZGRfYXJncyA9IFsnc3ZuJywgJ2FkZCcsICctLXBhcmVudHMnXSArIHBhdGhz CisgICAgICAgIGV4aXRfY29kZSA9IHNlbGYucnVuKHN2bl9hZGRfYXJncywgcmV0dXJuX2V4aXRf Y29kZT1UcnVlKQorICAgICAgICBpZiByZXR1cm5fZXhpdF9jb2RlOgorICAgICAgICAgICAgcmV0 dXJuIGV4aXRfY29kZQorICAgICAgICBpZiBleGl0X2NvZGUgYW5kIGV4aXRfY29kZSAhPSAxOgor ICAgICAgICAgICAgcmFpc2UgU2NyaXB0RXJyb3Ioc2NyaXB0X2FyZ3M9c3ZuX2FkZF9hcmdzLCBl eGl0X2NvZGU9ZXhpdF9jb2RlKQorICAgICAgICByZXR1cm4gTm9uZQogCiAgICAgZGVmIF9kZWxl dGVfcGFyZW50X2RpcmVjdG9yaWVzKHNlbGYsIHBhdGgpOgogICAgICAgICBpZiBub3Qgc2VsZi5p bl93b3JraW5nX2RpcmVjdG9yeShwYXRoKToK 197498 2013-04-10 20:19:56 -0700 2013-04-10 23:08:18 -0700 Patch bug-114386-20130410211933.patch text/plain 3312 glenn U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4MTM5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTc4ZTRmYTNhZjgyMTk5NjViODQ1N2FiNzQ4OTIzNjRm OTA0OTQ4ZS4uNmFmZDA4NWJlMDExZTEzMWE0M2E2ZTVhZGQ4MmM4ZmY0ZWEzZjBmZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDEzLTA0LTEwICBHbGVubiBBZGFtcyAgPGdsZW5uQHNreW5hdi5jb20+CisKKyAgICAg ICAgW3dlYmtpdHB5XSBTVk5UZXN0IGZhaWxzIGZvdXIgdGVzdHMgd2hlbiB1c2luZyBzdWJ2ZXJz aW9uIGNsaWVudCAxLjcgb3IgbGF0ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExNDM4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3Nj bV91bml0dGVzdC5weToKKyAgICAgICAgKHRlc3Rfc3ZuX2xvY2spOiBTa2lwIGlmIHN1YnZlcnNp b24gY2xpZW50IHZlcnNpb24gMS43IG9yIGxhdGVyLiBUaGUgZmlsZSAuc3ZuL2xvY2sgaXMgbm90 IHVzZWQgd2l0aCAxLjcuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv dXQvc2NtL3N2bi5weToKKyAgICAgICAgKFNWTi5hZGRfbGlzdCk6IEFkZCAtLXBhcmVudHMgb3B0 aW9uIGFuZCBzcGVjaWFsIGV4aXQgY29kZSBoYW5kbGluZyBpZiBzdWJ2ZXJzaW9uIGNsaWVudCB2 ZXJzaW9uIDEuNyBvciBsYXRlci4KKwogMjAxMy0wNC0xMCAgT2phbiBWYWZhaSAgPG9qYW5AY2hy b21pdW0ub3JnPgogCiAgICAgICAgIENoYW5nZSBhbGwgaW5zdGFuY2VzIG9mIHRlc3QtcmVzdWx0 cy5hcHBzcG90LmNvbSB0byB3ZWJraXQtdGVzdC1yZXN1bHRzLmFwcHNwb3QuY29tCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0 ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91 bml0dGVzdC5weQppbmRleCAyMTVlZGQxN2EwN2EyYThhZDBjNTBjZWVlMjkyYWY1YmIwYzg3OGEy Li45NjY0NWNmOTJmNmFlMDI4MzJkYTI2MDY3YTIyNDJiNmVkYjJkYTI0IDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5p dHRlc3QucHkKQEAgLTg5MSw2ICs4OTEsOSBAQCBFTkQKICAgICAgICAgc2VsZi5hc3NlcnRGYWxz ZShvcy5wYXRoLmV4aXN0cyhzZWxmLmJvZ3VzX2RpcikpCiAKICAgICBkZWYgdGVzdF9zdm5fbG9j ayhzZWxmKToKKyAgICAgICAgaWYgc2VsZi5zY20uc3ZuX3ZlcnNpb24oKSA+PSAiMS43IjoKKyAg ICAgICAgICAgICMgLnN2bi9sb2NrIGlzbid0IHVzZWQgd2l0aCBzdWJ2ZXJzaW9uIGNsaWVudCAx LjcgYW5kIGxhdGVyCisgICAgICAgICAgICByZXR1cm4KICAgICAgICAgc3ZuX3Jvb3RfbG9ja19w YXRoID0gIi5zdm4vbG9jayIKICAgICAgICAgd3JpdGVfaW50b19maWxlX2F0X3BhdGgoc3ZuX3Jv b3RfbG9ja19wYXRoLCAiIiwgInV0Zi04IikKICAgICAgICAgIyB3ZWJraXQtcGF0Y2ggdXNlcyBh IENoZWNrb3V0IG9iamVjdCBhbmQgcnVucyB1cGRhdGUtd2Via2l0LCBqdXN0IHVzZSBzdm4gdXBk YXRlIGhlcmUuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVj a291dC9zY20vc3ZuLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQv c2NtL3N2bi5weQppbmRleCA4NjQ2YTVjZWNmZjRkMzg3ZmQ2YTE4MTM4NjA0ZGNlYjJhYmM2NzRk Li42MjcxMTEyYjg3ZWNhYThiZmZhYWVlNDY1NDU2Nzc1ZThmZDM3MWYzIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkKQEAgLTE4NCw3 ICsxODQsMTkgQEAgY2xhc3MgU1ZOKFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgZGVmIGFkZF9s aXN0KHNlbGYsIHBhdGhzLCByZXR1cm5fZXhpdF9jb2RlPUZhbHNlKToKICAgICAgICAgZm9yIHBh dGggaW4gcGF0aHM6CiAgICAgICAgICAgICBzZWxmLl9hZGRfcGFyZW50X2RpcmVjdG9yaWVzKG9z LnBhdGguZGlybmFtZShvcy5wYXRoLmFic3BhdGgocGF0aCkpKQotICAgICAgICByZXR1cm4gc2Vs Zi5fcnVuX3N2bihbImFkZCJdICsgcGF0aHMsIHJldHVybl9leGl0X2NvZGU9cmV0dXJuX2V4aXRf Y29kZSkKKyAgICAgICAgaWYgc2VsZi5zdm5fdmVyc2lvbigpIDwgIjEuNyI6CisgICAgICAgICAg ICByZXR1cm4gc2VsZi5fcnVuX3N2bihbImFkZCJdICsgcGF0aHMsIHJldHVybl9leGl0X2NvZGU9 cmV0dXJuX2V4aXRfY29kZSkKKyAgICAgICAgIyBGb3Igc3VidmVyc2lvbiBjbGllbnQgMS43IGFu ZCBsYXRlciwgbmVlZCB0byBhZGQgJy0tcGFyZW50cycgb3B0aW9uIHRvIGVuc3VyZSBpbnRlcm1l ZGlhdGUgZGlyZWN0b3JpZXMKKyAgICAgICAgIyBhcmUgYWRkZWQ7IGluIGFkZGl0aW9uLCAxLjcg cmV0dXJucyBhbiBleGl0IGNvZGUgb2YgMSBmcm9tIHN2biBhZGQgaWYgb25lIG9yIG1vcmUgb2Yg dGhlIHJlcXVlc3RlZAorICAgICAgICAjIGFkZHMgYXJlIGFscmVhZHkgdW5kZXIgdmVyc2lvbiBj b250cm9sLCBpbmNsdWRpbmcgaW50ZXJtZWRpYXRlIGRpcmVjdG9yaWVzIHN1YmplY3QgdG8gYWRk aXRpb24KKyAgICAgICAgIyBkdWUgdG8gLS1wYXJlbnRzCisgICAgICAgIHN2bl9hZGRfYXJncyA9 IFsnc3ZuJywgJ2FkZCcsICctLXBhcmVudHMnXSArIHBhdGhzCisgICAgICAgIGV4aXRfY29kZSA9 IHNlbGYucnVuKHN2bl9hZGRfYXJncywgcmV0dXJuX2V4aXRfY29kZT1UcnVlKQorICAgICAgICBp ZiByZXR1cm5fZXhpdF9jb2RlOgorICAgICAgICAgICAgcmV0dXJuIGV4aXRfY29kZQorICAgICAg ICBpZiBleGl0X2NvZGUgYW5kIGV4aXRfY29kZSAhPSAxOgorICAgICAgICAgICAgcmFpc2UgU2Ny aXB0RXJyb3Ioc2NyaXB0X2FyZ3M9c3ZuX2FkZF9hcmdzLCBleGl0X2NvZGU9ZXhpdF9jb2RlKQor ICAgICAgICByZXR1cm4gTm9uZQogCiAgICAgZGVmIF9kZWxldGVfcGFyZW50X2RpcmVjdG9yaWVz KHNlbGYsIHBhdGgpOgogICAgICAgICBpZiBub3Qgc2VsZi5pbl93b3JraW5nX2RpcmVjdG9yeShw YXRoKToK 197509 2013-04-10 23:08:22 -0700 2013-04-10 23:31:58 -0700 Patch bug-114386-20130411000802.patch text/plain 4211 glenn U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4MTczCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmI5ZjYxMDYwNGFlNDVmNmUxOTQ0ZGUxZGNlNzI4NGY3 YzhlNDExZC4uMGY0NzhkODhmYzJkZjZlOWMwZmU4ZDkzYTI5M2YzYmFmYzYzMmY5YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3 IEBACiAyMDEzLTA0LTEwICBHbGVubiBBZGFtcyAgPGdsZW5uQHNreW5hdi5jb20+CiAKKyAgICAg ICAgW3dlYmtpdHB5XSBTVk5UZXN0IGZhaWxzIGZvdXIgdGVzdHMgd2hlbiB1c2luZyBzdWJ2ZXJz aW9uIGNsaWVudCAxLjcgb3IgbGF0ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExNDM4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3Nj bV91bml0dGVzdC5weToKKyAgICAgICAgKHRlc3Rfc3ZuX2xvY2spOiBTa2lwIGJvZHkgb2YgdGVz dCBpZiBzdWJ2ZXJzaW9uIGNsaWVudCAxLjcgb3IgbGF0ZXIuCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weToKKyAgICAgICAgKFNWTi5hZGRfbGlz dCk6IFVzZSAtLXBhcmVudHMgb3B0aW9uIGFuZCBoYW5kbGUgZXhpdCBjb2RlIDEgaWYgc3VidmVy c2lvbiBjbGllbnQgMS43IG9yIGxhdGVyLgorCisyMDEzLTA0LTEwICBHbGVubiBBZGFtcyAgPGds ZW5uQHNreW5hdi5jb20+CisKICAgICAgICAgW3dlYmtpdHB5XSBSZW1vdmUgdW51c2VkIHJldHVy bl9leGl0X2NvZGUgYXJndW1lbnQgYW5kIHJldHVybmVkIHZhbHVlcyBmcm9tIFNDTS57YWRkLGFk ZF9saXN0fQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTE0NDEwCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNr b3V0L3NjbS9zY21fdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5CmluZGV4IDIxNWVkZDE3YTA3YTJhOGFkMGM1MGNl ZWUyOTJhZjViYjBjODc4YTIuLjE1NDMyZjBlOGY1YzRlNGEwNzExMDE5MzE5MmQzYzhjYzliZjRj MTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3Nj bS9zY21fdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hl Y2tvdXQvc2NtL3NjbV91bml0dGVzdC5weQpAQCAtODkxLDEzICs4OTEsMTcgQEAgRU5ECiAgICAg ICAgIHNlbGYuYXNzZXJ0RmFsc2Uob3MucGF0aC5leGlzdHMoc2VsZi5ib2d1c19kaXIpKQogCiAg ICAgZGVmIHRlc3Rfc3ZuX2xvY2soc2VsZik6Ci0gICAgICAgIHN2bl9yb290X2xvY2tfcGF0aCA9 ICIuc3ZuL2xvY2siCi0gICAgICAgIHdyaXRlX2ludG9fZmlsZV9hdF9wYXRoKHN2bl9yb290X2xv Y2tfcGF0aCwgIiIsICJ1dGYtOCIpCi0gICAgICAgICMgd2Via2l0LXBhdGNoIHVzZXMgYSBDaGVj a291dCBvYmplY3QgYW5kIHJ1bnMgdXBkYXRlLXdlYmtpdCwganVzdCB1c2Ugc3ZuIHVwZGF0ZSBo ZXJlLgotICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhTY3JpcHRFcnJvciwgcnVuX2NvbW1hbmQs IFsnc3ZuJywgJ3VwZGF0ZSddKQotICAgICAgICBzZWxmLnNjbS5kaXNjYXJkX3dvcmtpbmdfZGly ZWN0b3J5X2NoYW5nZXMoKQotICAgICAgICBzZWxmLmFzc2VydEZhbHNlKG9zLnBhdGguZXhpc3Rz KHN2bl9yb290X2xvY2tfcGF0aCkpCi0gICAgICAgIHJ1bl9jb21tYW5kKFsnc3ZuJywgJ3VwZGF0 ZSddKSAgIyBTaG91bGQgc3VjY2VlZCBhbmQgbm90IHJhaXNlLgorICAgICAgICBpZiBzZWxmLnNj bS5zdm5fdmVyc2lvbigpID49ICIxLjciOgorICAgICAgICAgICAgIyB0aGUgZm9sbG93aW5nIHRl Y2huaXF1ZSB3aXRoIC5zdm4vbG9jayB0aGVuIHN2biB1cGRhdGUgZG9lc24ndCB3b3JrIHdpdGgg c3VidmVyc2lvbiBjbGllbnQgMS43IG9yIGxhdGVyCisgICAgICAgICAgICBwYXNzCisgICAgICAg IGVsc2U6CisgICAgICAgICAgICBzdm5fcm9vdF9sb2NrX3BhdGggPSAiLnN2bi9sb2NrIgorICAg ICAgICAgICAgd3JpdGVfaW50b19maWxlX2F0X3BhdGgoc3ZuX3Jvb3RfbG9ja19wYXRoLCAiIiwg InV0Zi04IikKKyAgICAgICAgICAgICMgd2Via2l0LXBhdGNoIHVzZXMgYSBDaGVja291dCBvYmpl Y3QgYW5kIHJ1bnMgdXBkYXRlLXdlYmtpdCwganVzdCB1c2Ugc3ZuIHVwZGF0ZSBoZXJlLgorICAg ICAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoU2NyaXB0RXJyb3IsIHJ1bl9jb21tYW5kLCBbJ3N2 bicsICd1cGRhdGUnXSkKKyAgICAgICAgICAgIHNlbGYuc2NtLmRpc2NhcmRfd29ya2luZ19kaXJl Y3RvcnlfY2hhbmdlcygpCisgICAgICAgICAgICBzZWxmLmFzc2VydEZhbHNlKG9zLnBhdGguZXhp c3RzKHN2bl9yb290X2xvY2tfcGF0aCkpCisgICAgICAgICAgICBydW5fY29tbWFuZChbJ3N2bics ICd1cGRhdGUnXSkgICMgU2hvdWxkIHN1Y2NlZWQgYW5kIG5vdCByYWlzZS4KIAogICAgIGRlZiB0 ZXN0X2V4aXN0cyhzZWxmKToKICAgICAgICAgc2VsZi5fc2hhcmVkX3Rlc3RfZXhpc3RzKHNlbGYu c2NtLCBzZWxmLnNjbS5jb21taXRfd2l0aF9tZXNzYWdlKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkKaW5kZXggNmM4MTlmMDI5M2NiMWM5 OGEyMGY1MDg1MzU0MTlhNDliOGJkNDhhMi4uYzE0NmY1ZDMyNzBjZWZhZGYwYWEyY2FjYTRhZjdh YzQ5NTZmY2Y1MiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hl Y2tvdXQvc2NtL3N2bi5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVj a291dC9zY20vc3ZuLnB5CkBAIC0xODEsMTAgKzE4MSwyMCBAQCBjbGFzcyBTVk4oU0NNLCBTVk5S ZXBvc2l0b3J5KToKICAgICAgICAgICAgIHJldHVybgogICAgICAgICBzZWxmLmFkZChwYXRoKQog Ci0gICAgZGVmIGFkZF9saXN0KHNlbGYsIHBhdGhzLCByZXR1cm5fZXhpdF9jb2RlPUZhbHNlKToK KyAgICBkZWYgYWRkX2xpc3Qoc2VsZiwgcGF0aHMpOgogICAgICAgICBmb3IgcGF0aCBpbiBwYXRo czoKICAgICAgICAgICAgIHNlbGYuX2FkZF9wYXJlbnRfZGlyZWN0b3JpZXMob3MucGF0aC5kaXJu YW1lKG9zLnBhdGguYWJzcGF0aChwYXRoKSkpCi0gICAgICAgIHNlbGYuX3J1bl9zdm4oWyJhZGQi XSArIHBhdGhzKQorICAgICAgICBpZiBzZWxmLnN2bl92ZXJzaW9uKCkgPj0gIjEuNyI6CisgICAg ICAgICAgICAjIEZvciBzdWJ2ZXJzaW9uIGNsaWVudCAxLjcgYW5kIGxhdGVyLCBuZWVkIHRvIGFk ZCAnLS1wYXJlbnRzJyBvcHRpb24gdG8gZW5zdXJlIGludGVybWVkaWF0ZSBkaXJlY3Rvcmllcwor ICAgICAgICAgICAgIyBhcmUgYWRkZWQ7IGluIGFkZGl0aW9uLCAxLjcgcmV0dXJucyBhbiBleGl0 IGNvZGUgb2YgMSBmcm9tIHN2biBhZGQgaWYgb25lIG9yIG1vcmUgb2YgdGhlIHJlcXVlc3RlZAor ICAgICAgICAgICAgIyBhZGRzIGFyZSBhbHJlYWR5IHVuZGVyIHZlcnNpb24gY29udHJvbCwgaW5j bHVkaW5nIGludGVybWVkaWF0ZSBkaXJlY3RvcmllcyBzdWJqZWN0IHRvIGFkZGl0aW9uCisgICAg ICAgICAgICAjIGR1ZSB0byAtLXBhcmVudHMKKyAgICAgICAgICAgIHN2bl9hZGRfYXJncyA9IFsn c3ZuJywgJ2FkZCcsICctLXBhcmVudHMnXSArIHBhdGhzCisgICAgICAgICAgICBleGl0X2NvZGUg PSBzZWxmLnJ1bihzdm5fYWRkX2FyZ3MsIHJldHVybl9leGl0X2NvZGU9VHJ1ZSkKKyAgICAgICAg ICAgIGlmIGV4aXRfY29kZSBhbmQgZXhpdF9jb2RlICE9IDE6CisgICAgICAgICAgICAgICAgcmFp c2UgU2NyaXB0RXJyb3Ioc2NyaXB0X2FyZ3M9c3ZuX2FkZF9hcmdzLCBleGl0X2NvZGU9ZXhpdF9j b2RlKQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgc2VsZi5fcnVuX3N2bihbImFkZCJdICsg cGF0aHMpCiAKICAgICBkZWYgX2RlbGV0ZV9wYXJlbnRfZGlyZWN0b3JpZXMoc2VsZiwgcGF0aCk6 CiAgICAgICAgIGlmIG5vdCBzZWxmLmluX3dvcmtpbmdfZGlyZWN0b3J5KHBhdGgpOgo= 197512 2013-04-10 23:32:02 -0700 2013-04-11 00:02:12 -0700 Patch for landing bug-114386-20130411003142.patch text/plain 4574 glenn U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4MTczCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmI5ZjYxMDYwNGFlNDVmNmUxOTQ0ZGUxZGNlNzI4NGY3 YzhlNDExZC4uZWU1YWY5NmRiYmIwMjVjYzFhODNhYjViNmZhNWUyMWRjZDBiNjBiYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIy IEBACiAyMDEzLTA0LTEwICBHbGVubiBBZGFtcyAgPGdsZW5uQHNreW5hdi5jb20+CiAKKyAgICAg ICAgW3dlYmtpdHB5XSBTVk5UZXN0IGZhaWxzIGZvdXIgdGVzdHMgd2hlbiB1c2luZyBzdWJ2ZXJz aW9uIGNsaWVudCAxLjcgb3IgbGF0ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExNDM4NgorCisgICAgICAgIFJldmlld2VkIGJ5IEJlbmphbWluIFBv dWxhaW4uCisKKyAgICAgICAgU3VidmVyc2lvbiBjbGllbnQgMS43IHVzZXMgYSBuZXcgbG9ja2lu ZyBzY2hlbWUgdGhhdCBpbnZhbGlkYXRlcyB0aGUgdGVjaG5pcXVlIHVzZWQKKyAgICAgICAgaW4g dGVzdF9zdm5fbG9jaygpLCBzbyBza2lwIHRoYXQgdGVzdCBmb3IgMS43IChvciBsYXRlcikgdW50 aWwgYSBuZXcgdGVjaG5pcXVlCisgICAgICAgIGNhbiBiZSBpbXBsZW1lbnRlZC4gRnVydGhlciwg MS43IGNoYW5nZWQgc3ZuIGFkZCB0byBub3QgYWRkIGludGVybWVkaWF0ZSBkaXJlY3Rvcmllcwor ICAgICAgICBieSBkZWZhdWx0IGFuZCB0byByZXR1cm4gZXhpdCBjb2RlIDEgaWYgYSBmaWxlL2Rp ciBoYWQgYWxyZWFkeSBiZWVuIGFkZGVkLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9j b21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5weToKKyAgICAgICAgKHRlc3Rfc3ZuX2xv Y2spOiBTa2lwIGJvZHkgb2YgdGVzdCBpZiBzdWJ2ZXJzaW9uIGNsaWVudCAxLjcgb3IgbGF0ZXIu CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weToK KyAgICAgICAgKFNWTi5hZGRfbGlzdCk6IFVzZSAtLXBhcmVudHMgb3B0aW9uIGFuZCBoYW5kbGUg ZXhpdCBjb2RlIDEgaWYgc3VidmVyc2lvbiBjbGllbnQgMS43IG9yIGxhdGVyLgorCisyMDEzLTA0 LTEwICBHbGVubiBBZGFtcyAgPGdsZW5uQHNreW5hdi5jb20+CisKICAgICAgICAgW3dlYmtpdHB5 XSBSZW1vdmUgdW51c2VkIHJldHVybl9leGl0X2NvZGUgYXJndW1lbnQgYW5kIHJldHVybmVkIHZh bHVlcyBmcm9tIFNDTS57YWRkLGFkZF9saXN0fQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE0NDEwCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5CmluZGV4IDIx NWVkZDE3YTA3YTJhOGFkMGM1MGNlZWUyOTJhZjViYjBjODc4YTIuLjE1NDMyZjBlOGY1YzRlNGEw NzExMDE5MzE5MmQzYzhjYzliZjRjMTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVzdC5weQpAQCAtODkxLDEz ICs4OTEsMTcgQEAgRU5ECiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2Uob3MucGF0aC5leGlzdHMo c2VsZi5ib2d1c19kaXIpKQogCiAgICAgZGVmIHRlc3Rfc3ZuX2xvY2soc2VsZik6Ci0gICAgICAg IHN2bl9yb290X2xvY2tfcGF0aCA9ICIuc3ZuL2xvY2siCi0gICAgICAgIHdyaXRlX2ludG9fZmls ZV9hdF9wYXRoKHN2bl9yb290X2xvY2tfcGF0aCwgIiIsICJ1dGYtOCIpCi0gICAgICAgICMgd2Vi a2l0LXBhdGNoIHVzZXMgYSBDaGVja291dCBvYmplY3QgYW5kIHJ1bnMgdXBkYXRlLXdlYmtpdCwg anVzdCB1c2Ugc3ZuIHVwZGF0ZSBoZXJlLgotICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhTY3Jp cHRFcnJvciwgcnVuX2NvbW1hbmQsIFsnc3ZuJywgJ3VwZGF0ZSddKQotICAgICAgICBzZWxmLnNj bS5kaXNjYXJkX3dvcmtpbmdfZGlyZWN0b3J5X2NoYW5nZXMoKQotICAgICAgICBzZWxmLmFzc2Vy dEZhbHNlKG9zLnBhdGguZXhpc3RzKHN2bl9yb290X2xvY2tfcGF0aCkpCi0gICAgICAgIHJ1bl9j b21tYW5kKFsnc3ZuJywgJ3VwZGF0ZSddKSAgIyBTaG91bGQgc3VjY2VlZCBhbmQgbm90IHJhaXNl LgorICAgICAgICBpZiBzZWxmLnNjbS5zdm5fdmVyc2lvbigpID49ICIxLjciOgorICAgICAgICAg ICAgIyB0aGUgZm9sbG93aW5nIHRlY2huaXF1ZSB3aXRoIC5zdm4vbG9jayB0aGVuIHN2biB1cGRh dGUgZG9lc24ndCB3b3JrIHdpdGggc3VidmVyc2lvbiBjbGllbnQgMS43IG9yIGxhdGVyCisgICAg ICAgICAgICBwYXNzCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBzdm5fcm9vdF9sb2NrX3Bh dGggPSAiLnN2bi9sb2NrIgorICAgICAgICAgICAgd3JpdGVfaW50b19maWxlX2F0X3BhdGgoc3Zu X3Jvb3RfbG9ja19wYXRoLCAiIiwgInV0Zi04IikKKyAgICAgICAgICAgICMgd2Via2l0LXBhdGNo IHVzZXMgYSBDaGVja291dCBvYmplY3QgYW5kIHJ1bnMgdXBkYXRlLXdlYmtpdCwganVzdCB1c2Ug c3ZuIHVwZGF0ZSBoZXJlLgorICAgICAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoU2NyaXB0RXJy b3IsIHJ1bl9jb21tYW5kLCBbJ3N2bicsICd1cGRhdGUnXSkKKyAgICAgICAgICAgIHNlbGYuc2Nt LmRpc2NhcmRfd29ya2luZ19kaXJlY3RvcnlfY2hhbmdlcygpCisgICAgICAgICAgICBzZWxmLmFz c2VydEZhbHNlKG9zLnBhdGguZXhpc3RzKHN2bl9yb290X2xvY2tfcGF0aCkpCisgICAgICAgICAg ICBydW5fY29tbWFuZChbJ3N2bicsICd1cGRhdGUnXSkgICMgU2hvdWxkIHN1Y2NlZWQgYW5kIG5v dCByYWlzZS4KIAogICAgIGRlZiB0ZXN0X2V4aXN0cyhzZWxmKToKICAgICAgICAgc2VsZi5fc2hh cmVkX3Rlc3RfZXhpc3RzKHNlbGYuc2NtLCBzZWxmLnNjbS5jb21taXRfd2l0aF9tZXNzYWdlKQpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2 bi5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkK aW5kZXggNmM4MTlmMDI5M2NiMWM5OGEyMGY1MDg1MzU0MTlhNDliOGJkNDhhMi4uYzE0NmY1ZDMy NzBjZWZhZGYwYWEyY2FjYTRhZjdhYzQ5NTZmY2Y1MiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5CkBAIC0xODEsMTAgKzE4MSwyMCBA QCBjbGFzcyBTVk4oU0NNLCBTVk5SZXBvc2l0b3J5KToKICAgICAgICAgICAgIHJldHVybgogICAg ICAgICBzZWxmLmFkZChwYXRoKQogCi0gICAgZGVmIGFkZF9saXN0KHNlbGYsIHBhdGhzLCByZXR1 cm5fZXhpdF9jb2RlPUZhbHNlKToKKyAgICBkZWYgYWRkX2xpc3Qoc2VsZiwgcGF0aHMpOgogICAg ICAgICBmb3IgcGF0aCBpbiBwYXRoczoKICAgICAgICAgICAgIHNlbGYuX2FkZF9wYXJlbnRfZGly ZWN0b3JpZXMob3MucGF0aC5kaXJuYW1lKG9zLnBhdGguYWJzcGF0aChwYXRoKSkpCi0gICAgICAg IHNlbGYuX3J1bl9zdm4oWyJhZGQiXSArIHBhdGhzKQorICAgICAgICBpZiBzZWxmLnN2bl92ZXJz aW9uKCkgPj0gIjEuNyI6CisgICAgICAgICAgICAjIEZvciBzdWJ2ZXJzaW9uIGNsaWVudCAxLjcg YW5kIGxhdGVyLCBuZWVkIHRvIGFkZCAnLS1wYXJlbnRzJyBvcHRpb24gdG8gZW5zdXJlIGludGVy bWVkaWF0ZSBkaXJlY3RvcmllcworICAgICAgICAgICAgIyBhcmUgYWRkZWQ7IGluIGFkZGl0aW9u LCAxLjcgcmV0dXJucyBhbiBleGl0IGNvZGUgb2YgMSBmcm9tIHN2biBhZGQgaWYgb25lIG9yIG1v cmUgb2YgdGhlIHJlcXVlc3RlZAorICAgICAgICAgICAgIyBhZGRzIGFyZSBhbHJlYWR5IHVuZGVy IHZlcnNpb24gY29udHJvbCwgaW5jbHVkaW5nIGludGVybWVkaWF0ZSBkaXJlY3RvcmllcyBzdWJq ZWN0IHRvIGFkZGl0aW9uCisgICAgICAgICAgICAjIGR1ZSB0byAtLXBhcmVudHMKKyAgICAgICAg ICAgIHN2bl9hZGRfYXJncyA9IFsnc3ZuJywgJ2FkZCcsICctLXBhcmVudHMnXSArIHBhdGhzCisg ICAgICAgICAgICBleGl0X2NvZGUgPSBzZWxmLnJ1bihzdm5fYWRkX2FyZ3MsIHJldHVybl9leGl0 X2NvZGU9VHJ1ZSkKKyAgICAgICAgICAgIGlmIGV4aXRfY29kZSBhbmQgZXhpdF9jb2RlICE9IDE6 CisgICAgICAgICAgICAgICAgcmFpc2UgU2NyaXB0RXJyb3Ioc2NyaXB0X2FyZ3M9c3ZuX2FkZF9h cmdzLCBleGl0X2NvZGU9ZXhpdF9jb2RlKQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgc2Vs Zi5fcnVuX3N2bihbImFkZCJdICsgcGF0aHMpCiAKICAgICBkZWYgX2RlbGV0ZV9wYXJlbnRfZGly ZWN0b3JpZXMoc2VsZiwgcGF0aCk6CiAgICAgICAgIGlmIG5vdCBzZWxmLmluX3dvcmtpbmdfZGly ZWN0b3J5KHBhdGgpOgo=