72489 2011-11-16 04:47:33 -0800 [NRWT] Fix --platform=qt-5.0 --new-baseline combo 2012-06-28 15:45:00 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED INVALID NRWT P2 Normal --- 80581 80682 88680 89880 1 ossy bank abarth dpranke eric galpeter hnandor ojan ossy pnormand rafael.lobo webkit.review.bot oldest_to_newest 503767 0 ossy 2011-11-16 04:47:33 -0800 Now NRWT ignores --platform option and generate new results into platform/qt-linux directory. Explicit --platform=qt, --platform=qt-5.0, --platform=qt-wk2 options don't work. But -2 option makes NRWT to generate results into platform/qt-wk2 directory irrespectively of --platform option 504069 1 eric 2011-11-16 11:08:44 -0800 This is a bug in the QtPort implementation in qt.py. The bug shouldn't really be *there* specifically, since the platform parsing should not be a responsibility of the ports themselves, but that's how the current design works. Qt.__init__ needs to learn how to parse the platform name like other ports do. Eventually I will come along and rip all that out of the __init__ methods and move it to PortFactory (port/factory.py) where it belongs. 504070 2 eric 2011-11-16 11:10:57 -0800 Compare: http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py#L62 with say: http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/layout_tests/port/apple.py#L59 and you'll see what I mean. Note the FIXME's in apple.py. I would start by writing unittests in qt_unittest.py which have your desired behavior. Then figure out where in the port hierarchy to fix what you want. 504679 3 bank 2011-11-17 02:31:27 -0800 Thank you the help! 510754 4 116964 bank 2011-11-29 07:25:10 -0800 Created attachment 116964 proposed fix Firstly I modified the qt.py then I had to modify run-webkit-tests file. 510784 5 116964 eric 2011-11-29 08:19:01 -0800 Comment on attachment 116964 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=116964&action=review > Tools/Scripts/run-webkit-tests:108 > + my $isPlatformSet = 0; > + for (@ARGV){ > + # Pass --qt if platform isn't passed explicitly (eg. qt-5.0, qt-wk2, ...) > + if(/^--platform.*/){ > + $isPlatformSet = 1; > + } > + } I'm not sure I understand this part of the change. > Tools/Scripts/webkitpy/layout_tests/port/qt.py:77 > + if port_name != self.port_name: > + self._name = port_name > + else: > + name_components = [self.port_name] > + if self._operating_system: > + name_components.append(self._operating_system) > + self._name = "-".join(name_components) But this part looks good. It's unfortunate this all has to go in teh Port class itself. But for now that's teh curent design. 510788 6 116964 ossy 2011-11-29 08:23:08 -0800 Comment on attachment 116964 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=116964&action=review >> Tools/Scripts/run-webkit-tests:108 >> + } > > I'm not sure I understand this part of the change. If you execute run-webkit-tests without this change, it will pass the explicitly added --platform=qt-5.0 and --qt too to the NRWT. And unfortunately --qt overrides --platform=qt-5.0 510793 7 116964 eric 2011-11-29 08:27:28 -0800 Comment on attachment 116964 proposed fix Yes, makes sense. I suspect se should just pass --platform=qt always instead of using the --qt alias. But we can clean that up later. 511437 8 116964 ossy 2011-11-29 23:53:59 -0800 Comment on attachment 116964 proposed fix Clearing flags on attachment: 116964 Committed r101451: <http://trac.webkit.org/changeset/101451> 511438 9 ossy 2011-11-29 23:54:08 -0800 All reviewed patches have been landed. Closing bug. 557252 10 rafael.lobo 2012-02-15 07:14:52 -0800 This doesn't seem to work anymore. Reopening bug. 557253 11 ossy 2012-02-15 07:16:33 -0800 (In reply to comment #10) > This doesn't seem to work anymore. Reopening bug. Thanks for noticing it. We will check it tomorrow with Balázs. 558113 12 127361 rafael.lobo 2012-02-16 05:45:20 -0800 Created attachment 127361 Patch 573295 13 127361 webkit.review.bot 2012-03-07 15:21:17 -0800 Comment on attachment 127361 Patch Clearing flags on attachment: 127361 Committed r110115: <http://trac.webkit.org/changeset/110115> 573296 14 webkit.review.bot 2012-03-07 15:21:23 -0800 All reviewed patches have been landed. Closing bug. 573717 15 pnormand 2012-03-08 01:46:24 -0800 Reopening as it breaks the unit tests: ====================================================================== FAIL: test_baseline_search_path (webkitpy.layout_tests.port.qt_unittest.QtPortTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/slave/webkitgtk/gtk-linux-64-release/build/Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py", line 71, in test_baseline_search_path self._assert_search_path(['qt-5.0-wk2', 'qt-mac', 'qt-5.0', 'qt'], 'mac', use_webkit2=True, qt_version='5.0') File "/home/slave/webkitgtk/gtk-linux-64-release/build/Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py", line 54, in _assert_search_path self.assertEquals(port.baseline_search_path(), absolute_search_paths) AssertionError: ['/mock-checkout/LayoutTests/platform/qt-mac', '/mock-checkout/LayoutTests/platform/qt-5.0', '/mock-checkout/LayoutTests/platform/qt'] != ['/mock-checkout/LayoutTests/platform/qt-5.0-wk2', '/mock-checkout/LayoutTests/platform/qt-mac', '/mock-checkout/LayoutTests/platform/qt-5.0', '/mock-checkout/LayoutTests/platform/qt'] ---------------------------------------------------------------------- 574035 16 130868 rafael.lobo 2012-03-08 11:54:27 -0800 Created attachment 130868 Patch Sorry about the trouble, I didnt know about these tests. Now the expected results are updated. 574493 17 130868 webkit.review.bot 2012-03-08 19:07:38 -0800 Comment on attachment 130868 Patch Clearing flags on attachment: 130868 Committed r110250: <http://trac.webkit.org/changeset/110250> 574494 18 webkit.review.bot 2012-03-08 19:07:44 -0800 All reviewed patches have been landed. Closing bug. 574719 19 ossy 2012-03-09 01:18:59 -0800 Reopen, because I had to rollout again: http://trac.webkit.org/changeset/110273 The problem was this patch broke Qt5-WK2 tests. Before this patch: ------------------- INFO Baseline search path: qt-5.0-wk2 -> qt-linux -> qt-5.0 -> qt -> generic INFO Parsing expectations ... DEBUG Using test_expectations.txt: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/qt/test_expectations.txt DEBUG Using Skipped file: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/qt-linux/Skipped DEBUG Using Skipped file: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/wk2/Skipped DEBUG Using Skipped file: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/qt/Skipped DEBUG Using Skipped file: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/qt-5.0-wk2/Skipped DEBUG Using Skipped file: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/qt-5.0/Skipped INFO Preparing tests ... INFO Found: 28641 tests INFO Expect: 23150 passes (23150 now, 0 wontfix) INFO Expect: 137 failures ( 137 now, 0 wontfix) INFO Expect: 0 flaky ( 0 now, 0 wontfix) INFO Expect: 5354 skipped ( 5354 now, 0 wontfix) After this patch: ------------------ INFO Baseline search path: qt-5.0-wk2 -> qt-5.0 -> qt -> generic INFO Parsing expectations ... DEBUG Using test_expectations.txt: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/qt/test_expectations.txt DEBUG Using Skipped file: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/wk2/Skipped DEBUG Using Skipped file: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/qt/Skipped DEBUG Using Skipped file: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/qt-5.0-wk2/Skipped DEBUG Using Skipped file: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/qt-5.0/Skipped INFO Found: 28641 tests INFO Expect: 23283 passes (23283 now, 0 wontfix) INFO Expect: 0 failures ( 0 now, 0 wontfix) INFO Expect: 0 flaky ( 0 now, 0 wontfix) INFO Expect: 5358 skipped ( 5358 now, 0 wontfix) The problem is that test_expectations.txt (137 tests markes as expected to fail) and qt-linux platform is absolutely ignored (skipped list and baseline search path too) after this patch. I don't know why, but it needs more investigation and more testing, and maybe more unit tests, because it seems the test coverage isn't so good now. 575055 20 dpranke 2012-03-09 12:06:39 -0800 Grr. Sorry! I need to be more careful in reviewing these things, I guess. 575075 21 dpranke 2012-03-09 12:22:12 -0800 Okay, having stared at this ... the patch is pretty clear that qt-linux gets replaced w/ qt-5.0 (see line 62 in qt.py). If qt-linux was supposed to stay in the baseline search path, then baseline_search_path() will need to be modified as well. 578721 22 rafael.lobo 2012-03-14 13:35:55 -0700 (In reply to comment #19) > Reopen, because I had to rollout again: http://trac.webkit.org/changeset/110273 > > The problem was this patch broke Qt5-WK2 tests. > > Before this patch: > ------------------- > INFO Baseline search path: qt-5.0-wk2 -> qt-linux -> qt-5.0 -> qt -> generic > INFO Parsing expectations ... > DEBUG Using test_expectations.txt: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/qt/test_expectations.txt > DEBUG Using Skipped file: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/qt-linux/Skipped > DEBUG Using Skipped file: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/wk2/Skipped > DEBUG Using Skipped file: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/qt/Skipped > DEBUG Using Skipped file: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/qt-5.0-wk2/Skipped > DEBUG Using Skipped file: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/qt-5.0/Skipped > INFO Preparing tests ... > INFO Found: 28641 tests > INFO Expect: 23150 passes (23150 now, 0 wontfix) > INFO Expect: 137 failures ( 137 now, 0 wontfix) > INFO Expect: 0 flaky ( 0 now, 0 wontfix) > INFO Expect: 5354 skipped ( 5354 now, 0 wontfix) > > After this patch: > ------------------ > INFO Baseline search path: qt-5.0-wk2 -> qt-5.0 -> qt -> generic > INFO Parsing expectations ... > DEBUG Using test_expectations.txt: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/qt/test_expectations.txt > DEBUG Using Skipped file: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/wk2/Skipped > DEBUG Using Skipped file: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/qt/Skipped > DEBUG Using Skipped file: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/qt-5.0-wk2/Skipped > DEBUG Using Skipped file: /ramdisk/qt-linux-32-release-webkit2/build/LayoutTests/platform/qt-5.0/Skipped > INFO Found: 28641 tests > INFO Expect: 23283 passes (23283 now, 0 wontfix) > INFO Expect: 0 failures ( 0 now, 0 wontfix) > INFO Expect: 0 flaky ( 0 now, 0 wontfix) > INFO Expect: 5358 skipped ( 5358 now, 0 wontfix) > > > The problem is that test_expectations.txt (137 tests markes as expected to fail) and qt-linux platform is absolutely ignored (skipped list and baseline search path too) after this patch. I don't know why, but it needs more investigation and more testing, and maybe more unit tests, because it seems the test coverage isn't so good now. Ossy, thanks for the info and sorry for the trouble again. I've been checking how the baseline behaves before this patch, and it seems that we don't have qt-5.0-wk1 on baseline search path when we run tests using qt-5.0 and wk1, but I believe I should fix this into a separate patch. Right now I just don't want to change any behavior we have so far. 578898 23 131950 rafael.lobo 2012-03-14 16:14:26 -0700 Created attachment 131950 Patch I've added test cases to check our coverage in different Qt versions and/or OS (they are in QtPortTest.test_skipped_file_search_paths). Any feedback will be nice. 579710 24 131950 dpranke 2012-03-15 14:02:36 -0700 Comment on attachment 131950 Patch The code looks fine to me. I'll let one of the QT experts make sure that it does what they want and r+ it ... 580205 25 rafael.lobo 2012-03-15 23:57:25 -0700 Ossy would you mind to take a look on this? Just to make sure the bot won't complain this time. 633170 26 131950 rafael.lobo 2012-05-24 13:47:57 -0700 Comment on attachment 131950 Patch This patch doesnt work anymore, I'm working on a new version of it. 651340 27 148088 jbadics 2012-06-18 06:01:56 -0700 Created attachment 148088 Proposed patch I made some modifications on qt.py and it seems to be working for me. Could someone have a look at it please? 651341 28 webkit.review.bot 2012-06-18 06:05:24 -0700 Attachment 148088 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/Scripts/webkitpy..." exit_code: 1 Tools/Scripts/webkitpy/layout_tests/port/qt.py:126: missing whitespace after ',' [pep8/E231] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 651556 29 148088 rafael.lobo 2012-06-18 11:18:47 -0700 Comment on attachment 148088 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=148088&action=review Are you using Qt 5.0? I believe your patch is incomplete because it will use the platform path qt-5.0-wk1 (or wk2) rather the one you've specified with platform. Sometimes you want the test results made by one specific setup like qt5 wk2 to be dropped into qt-5.0 folder, or qt so it will affect the results for a more generic setting. I believe running for example qt5 wk2, putting platform as qt and using new-baseline won't put generated results on qt folder. > Tools/ChangeLog:3 > + [Qt] Fixed an issue with --platform and new-baseline options set. You should use the same title of the bug. 652108 30 galpeter 2012-06-18 23:45:37 -0700 View in context: https://bugs.webkit.org/attachment.cgi?id=148088&action=review > Tools/Scripts/webkitpy/layout_tests/port/qt.py:125 > + if hasattr(self._options, "new_baseline"): This way if the new_baseline is False you'll add the platform to the search_path. Maybe you should use getattr(..). 659499 31 148088 ossy 2012-06-28 07:32:51 -0700 Comment on attachment 148088 Proposed patch We shouldn't change search_paths, we need better way to fix it. 659682 32 rafael.lobo 2012-06-28 12:16:48 -0700 Dirk Pranke, maybe you can give some input here. My attempts so far are taking advantage of the auto-detection of the platform, so we can use the proper qt test related classes and then we can handle special platform values. But is this really correct? Should "platform" value be handled as the destination folder for test results/rebaselines? I couldn't figure out yet how we manage to detect we're on qt platform while running the tests even if we specify completely different platforms, but I wonder if for some reason it doesn't work and we end up being forced to pass "--qt" explicitly... what do you think? Do we need a new flag for it? 659827 33 dpranke 2012-06-28 14:25:05 -0700 (In reply to comment #32) > Dirk Pranke, maybe you can give some input here. My attempts so far are taking advantage of the auto-detection of the platform, so we can use the proper qt test related classes and then we can handle special platform values. But is this really correct? Should "platform" value be handled as the destination folder for test results/rebaselines? I couldn't figure out yet how we manage to detect we're on qt platform while running the tests even if we specify completely different platforms, but I wonder if for some reason it doesn't work and we end up being forced to pass "--qt" explicitly... what do you think? Do we need a new flag for it? This whole situation is sadly complicated, and it's actually changed a fair amount since this bug was first filed and people started working on it. Now, there are five ways to control where baselines are placed. The first, using --reset-results, updates existing baselines in place. We'll ignore that one. There are four other classes of locations for baselines, and which location is used where depends on the kind of baseline and the flags in question, but the options are: 1) alongside the test; this is the location used by default for .wav files and non-render-tree text files. 2) in the 'implementation' directory, e.g., 'platform/mac', 'platform/chromium', 'platform/qt'. This is the value that port.baseline_platform_dir() [it's actually a bit unclear to me if the correct value to use for this is qt/chromium or qt/chromium-$OS, but at the moment, it should be 'qt']. This is the location used by default if the result is expected to be platform specific (render trees and pixel results). 3) in the 'version-specific' directory, e.g., 'platform/mac-snowleopard'. In the case of Qt, where you have different versions of Qt but not different operating-system versions, it's not clear to me what the right value to use here should be; you guys can decide which would be most useful, e.g., qt-mac, or qt-mac-4.8. I suppose probably the directory that has the most results is useful. This is the value returned by port.baseline_version_dir(). This value is only every used if you pass --add-platform-exceptions. The default implementation for this is to use the *first* directory in the baseline search path, but if the first directory for you is a WK2-specific dir or a QT-version-dir, you might not want to use this. 4) somewhere else. This is how you could generate baselines automatically into some other directory; this would be done by using --add-platform-exceptions and --additional-platform-directory. In this case, for, example, if you wanted to put results into qt-4.8, you could pass --add-platform-exceptions --additional-platform-directory=LayoutTests/platform/qt-4.8 (even if qt-4.8 was already in the search path). Note that this has the side effect of picking up qt-4.8 results before anything else when running the test as well. This whole thing is probably too complicated. I think we're overloading too many functions at once. Did that help anything? Maybe a better question to ask is, 1) Do you just want to match whatever ORWT does? Does ORWT support the same set of configurations that NRWT does? If so, we can reverse-engineer what the desired thing to do here would be. 2) Or, is there some other thing you'd actually prefer to have happen? 659860 34 rafael.lobo 2012-06-28 15:01:52 -0700 (In reply to comment #33) > (In reply to comment #32) > > Dirk Pranke, maybe you can give some input here. My attempts so far are taking advantage of the auto-detection of the platform, so we can use the proper qt test related classes and then we can handle special platform values. But is this really correct? Should "platform" value be handled as the destination folder for test results/rebaselines? I couldn't figure out yet how we manage to detect we're on qt platform while running the tests even if we specify completely different platforms, but I wonder if for some reason it doesn't work and we end up being forced to pass "--qt" explicitly... what do you think? Do we need a new flag for it? > > This whole situation is sadly complicated, and it's actually changed a fair amount since this bug was first filed and people started working on it. > > Now, there are five ways to control where baselines are placed. The first, using --reset-results, updates existing baselines in place. We'll ignore that one. > > There are four other classes of locations for baselines, and which location is used where depends on the kind of baseline and the flags in question, but the options are: > > 1) alongside the test; this is the location used by default for .wav files and non-render-tree text files. > > 2) in the 'implementation' directory, e.g., 'platform/mac', 'platform/chromium', 'platform/qt'. This is the value that port.baseline_platform_dir() [it's actually a bit unclear to me if the correct value to use for this is qt/chromium or qt/chromium-$OS, but at the moment, it should be 'qt']. This is the location used by default if the result is expected to be platform specific (render trees and pixel results). > > 3) in the 'version-specific' directory, e.g., 'platform/mac-snowleopard'. In the case of Qt, where you have different versions of Qt but not different operating-system versions, it's not clear to me what the right value to use here should be; you guys can decide which would be most useful, e.g., qt-mac, or qt-mac-4.8. I suppose probably the directory that has the most results is useful. This is the value returned by port.baseline_version_dir(). This value is only every used if you pass --add-platform-exceptions. The default implementation for this is to use the *first* directory in the baseline search path, but if the first directory for you is a WK2-specific dir or a QT-version-dir, you might not want to use this. > > 4) somewhere else. This is how you could generate baselines automatically into some other directory; this would be done by using --add-platform-exceptions and --additional-platform-directory. In this case, for, example, if you wanted to put results into qt-4.8, you could pass --add-platform-exceptions --additional-platform-directory=LayoutTests/platform/qt-4.8 (even if qt-4.8 was already in the search path). Note that this has the side effect of picking up qt-4.8 results before anything else when running the test as well. This is probably what I was looking for, I guess. If we use 'new-baseline', does it matters the result we pick? We're generating new results to replace, isn't? If not, then I would want something without this side effect. > > This whole thing is probably too complicated. I think we're overloading too many functions at once. I agree. Part of this over complicated situation is our fault, we have far too many options on our port and a not very clear consensus of how the platform paths should be named or results should be placed. > > Did that help anything? Sure, thanks. > > Maybe a better question to ask is, > > 1) Do you just want to match whatever ORWT does? Does ORWT support the same set of configurations that NRWT does? If so, we can reverse-engineer what the desired thing to do here would be. I've talked to Ossy a long time ago, and I was asking him if there was a way to put results of tests in a particular folder: running with qt5 wk2 but putting the results on qt-4.8 for example. The intention is to generate those results and then afterwards run the tests using qt-4.8 and checking which test results differs from qt-5.0. Then he pointed me this combo, so maybe it was working on ORWT, but I'm not sure. Ossy could you give some input? > > 2) Or, is there some other thing you'd actually prefer to have happen? I think you've pointed out the solution already. I believe this bug should be marked as invalid then. :-) 659876 35 dpranke 2012-06-28 15:26:13 -0700 (In reply to comment #34) > > > > 2) Or, is there some other thing you'd actually prefer to have happen? > > I think you've pointed out the solution already. I believe this bug should be marked as invalid then. :-) Having to use --additional-platform-directory for this (and having the side effect that it also messes with the search path) is kind of kludgy. It sounds like maybe we need a "--save-baselines-under=X" flag instead. 659892 36 rafael.lobo 2012-06-28 15:45:00 -0700 (In reply to comment #35) > (In reply to comment #34) > > > > > > 2) Or, is there some other thing you'd actually prefer to have happen? > > > > I think you've pointed out the solution already. I believe this bug should be marked as invalid then. :-) > > Having to use --additional-platform-directory for this (and having the side effect that it also messes with the search path) is kind of kludgy. > > It sounds like maybe we need a "--save-baselines-under=X" flag instead. That would be perfect. We can safely close this bug then but also create one under "Polish NRWT until it shines.". I've added the tips we've learned here on https://trac.webkit.org/wiki/NewRunWebKitTests. 116964 2011-11-29 07:25:10 -0800 2012-03-08 11:51:08 -0800 proposed fix 2011-11-29.patch text/plain 3005 bank ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwNTEy ZGNjLi4zMDdjNmRkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMTEtMjkgIEJhbGF6cyBBbmtlcyAgPEFua2Vz LkJhbGF6c0BzdHVkLnUtc3plZ2VkLmh1PgorCisgICAgICAgIFtOUldUXSBGaXggLS1wbGF0Zm9y bT1xdC01LjAgLS1uZXctYmFzZWxpbmUgY29tYm8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTcyNDg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQmVmb3JlIHRoZSB0aGlzIGZpeCBhbHdheXMgYWRkZWQgInF0 IiBvcHRpb24gZm9yIHRoZSBvcHRpb24gbGlzdAorICAgICAgICAqIFNjcmlwdHMvcnVuLXdlYmtp dC10ZXN0czoKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0 LnB5OgorCiAyMDExLTExLTE2ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAg ICAgICBjaGVjay13ZWJraXQtc3R5bGUgYnJva2VuIGJ5IHI5OTc3MzogIkNvdWxkIG5vdCBkZXRl cm1pbmUgdGhlIHBvcnQiCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVz dHMgYi9Ub29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMKaW5kZXggZTRkOTcwNi4uZDhiMTlm NCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzCisrKyBiL1Rvb2xz L1NjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cwpAQCAtOTksNyArOTksMTQgQEAgaWYgKHVzZU5ld1J1 bldlYktpdFRlc3RzKCkpIHsKICMgd2Via2l0ZGlycy5wbSBzdHJpcHMgLS1xdCBhbmQgLS1ndGsg ZnJvbSBAQVJHViB3aGVuIHdlIGNhbGwgaXNRdC9pc0d0ay4KICMgV2UgaGF2ZSB0byBhZGQgYmFj ayBhbnkgLS1QT1JUIGFyZ3VtZW50cyB3aGljaCBtYXkgaGF2ZSBiZWVuIHJlbW92ZWQgYnkgaXNQ b3J0KCkgY2hlY2tzIGFib3ZlLgogaWYgKGlzUXQoKSkgewotICAgIHB1c2goQEFSR1YsICItLXF0 Iik7CisgICAgbXkgJGlzUGxhdGZvcm1TZXQgPSAwOworICAgIGZvciAoQEFSR1YpeworICAgICAg ICAjIFBhc3MgLS1xdCBpZiBwbGF0Zm9ybSBpc24ndCBwYXNzZWQgZXhwbGljaXRseSAoZWcuIHF0 LTUuMCwgcXQtd2syLCAuLi4pCisgICAgICAgIGlmKC9eLS1wbGF0Zm9ybS4qLyl7CisgICAgICAg ICAgICAkaXNQbGF0Zm9ybVNldCA9IDE7CisgICAgICAgIH0KKyAgICB9CisgICAgcHVzaChAQVJH ViwgIi0tcXQiKSBpZighJGlzUGxhdGZvcm1TZXQpOwogfSBlbHNpZiAoaXNHdGsoKSkgewogICAg IHB1c2goQEFSR1YsICItLWd0ayIpOwogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvcXQucHkKaW5kZXggNWVjYzg5MC4uMDI0NGU3NSAxMDA2NDQKLS0tIGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5CkBAIC01OSwxNyArNTks MjIgQEAgY2xhc3MgUXRQb3J0KFdlYktpdFBvcnQpOgogICAgICAgICByZXR1cm4gTm9uZQogCiAg ICAgIyBzeXNfcGxhdGZvcm0gZXhpc3RzIG9ubHkgZm9yIHVuaXQgdGVzdGluZy4KLSAgICBkZWYg X19pbml0X18oc2VsZiwgaG9zdCwgc3lzX3BsYXRmb3JtPU5vbmUsICoqa3dhcmdzKToKLSAgICAg ICAgV2ViS2l0UG9ydC5fX2luaXRfXyhzZWxmLCBob3N0LCAqKmt3YXJncykKKyAgICBkZWYgX19p bml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1lPU5vbmUsIHN5c19wbGF0Zm9ybT1Ob25lLCAqKmt3 YXJncyk6CisgICAgICAgIHBvcnRfbmFtZSA9IHBvcnRfbmFtZSBvciBzZWxmLnBvcnRfbmFtZQor ICAgICAgICBXZWJLaXRQb3J0Ll9faW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFtZT1Ob25lLCAq Kmt3YXJncykKICAgICAgICAgc2VsZi5fb3BlcmF0aW5nX3N5c3RlbSA9IHNlbGYuX29wZXJhdGlu Z19zeXN0ZW1fZm9yX3BsYXRmb3JtKHN5c19wbGF0Zm9ybSBvciBzeXMucGxhdGZvcm0pCiAgICAg ICAgIHNlbGYuX3ZlcnNpb24gPSBzZWxmLl9vcGVyYXRpbmdfc3lzdGVtCiAKICAgICAgICAgIyBG SVhNRTogVGhpcyB3aWxsIGFsbG93IFdlYktpdFBvcnQuYmFzZWxpbmVfc2VhcmNoX3BhdGggYW5k IFdlYktpdFBvcnQuX3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMKICAgICAgICAgIyB0byBkbyB0 aGUgcmlnaHQgdGhpbmcsIGJ1dCBkb2Vzbid0IGluY2x1ZGUgc3VwcG9ydCBmb3IgcXQtNC44IG9y IHF0LWFybSAoc2VlbiBpbiBMYXlvdXRUZXN0cy9wbGF0Zm9ybSkgeWV0LgotICAgICAgICBuYW1l X2NvbXBvbmVudHMgPSBbc2VsZi5wb3J0X25hbWVdCi0gICAgICAgIGlmIHNlbGYuX29wZXJhdGlu Z19zeXN0ZW06Ci0gICAgICAgICAgICBuYW1lX2NvbXBvbmVudHMuYXBwZW5kKHNlbGYuX29wZXJh dGluZ19zeXN0ZW0pCi0gICAgICAgIHNlbGYuX25hbWUgPSAiLSIuam9pbihuYW1lX2NvbXBvbmVu dHMpCisKKyAgICAgICAgaWYgcG9ydF9uYW1lICE9IHNlbGYucG9ydF9uYW1lOgorICAgICAgICAg ICAgc2VsZi5fbmFtZSA9IHBvcnRfbmFtZQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgbmFt ZV9jb21wb25lbnRzID0gW3NlbGYucG9ydF9uYW1lXQorICAgICAgICAgICAgaWYgc2VsZi5fb3Bl cmF0aW5nX3N5c3RlbToKKyAgICAgICAgICAgICAgICBuYW1lX2NvbXBvbmVudHMuYXBwZW5kKHNl bGYuX29wZXJhdGluZ19zeXN0ZW0pCisgICAgICAgICAgICBzZWxmLl9uYW1lID0gIi0iLmpvaW4o bmFtZV9jb21wb25lbnRzKQogCiAgICAgZGVmIF9nZW5lcmF0ZV9hbGxfdGVzdF9jb25maWd1cmF0 aW9ucyhzZWxmKToKICAgICAgICAgY29uZmlndXJhdGlvbnMgPSBbXQo= 127361 2012-02-16 05:45:20 -0800 2012-03-08 11:51:14 -0800 Patch bug-72489-20120216104517.patch text/plain 4487 rafael.lobo U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3OTIyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmRhMmJiMTFkMzU3NDk3NTkxZmU5OTMxMDkyNzY0MDc1 YjY0ZDcyZC4uYzRkYzM4YzczYzFiZjczZjYzYTllOTVmNzU0ZjA0ZDFlMmI4MGM3MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDEyLTAyLTE2ICBSYWZhZWwgQnJhbmRhbyAgPHJhZmFlbC5sb2JvQG9wZW5ib3NzYS5v cmc+CisKKyAgICAgICAgW05SV1RdIEZpeCAtLXBsYXRmb3JtPXF0LTUuMCAtLW5ldy1iYXNlbGlu ZSBjb21ibworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzI0ODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBO UldUOiBUaGUgZGVmYXVsdCBwbGF0Zm9ybSBuYW1lIGZvciBRdCBjb21iaW5lZCB3aXRoIC0td2Vi a2l0LXRlc3QtcnVubmVyIGlzIG5vdworICAgICAgICAicXQtNS4wLXdrMiIgaW5zdGVhZCBvZiAi cXQtbGludXgiIGFuZCB0aGF0IG5hbWUgaXMgbm93IHByZWZlcmVkIGZvciB0ZXN0cy4KKyAgICAg ICAgLS1wbGF0Zm9ybSB3aWxsIG92ZXJyaWRlIHRoZSBwbGF0Zm9ybSBuYW1lIGFuZCB0aGVuIHdl J2xsIHVzZSBpdC4KKworICAgICAgICBPUldUOiBXZSBjaGVjayBmb3IgcXQgdmVyc2lvbiBhbmQg dXNlIHBsYXRmb3JtIG5hbWUgInF0LTQuOCIgaWYgdGhlIHZlcnNpb24gaXMgbG93ZXIKKyAgICAg ICAgdGhhbiA1LjAuMCwgYW5kIHRoZW4gd2UgY2hvb3NlIGJldHdlZW4gInF0LTUuMC13azEiIGFu ZCAicXQtNS4wLXdrMiIuIC0tcGxhdGZvcm0gd2lsbAorICAgICAgICBvdmVycmlkZSBpdCBpbiB0 aGUgZW5kLgorCisgICAgICAgICogU2NyaXB0cy9vbGQtcnVuLXdlYmtpdC10ZXN0czoKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5OgorICAgICAgICAo UXRQb3J0KToKKyAgICAgICAgKFF0UG9ydC5kZXRlcm1pbmVfZnVsbF9wb3J0X25hbWUpOgorICAg ICAgICAoUXRQb3J0LmJhc2VsaW5lX3NlYXJjaF9wYXRoKToKKwogMjAxMi0wMi0xNiAgUGF0cmlj ayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBEaXNhYmxlIGluc3Bl Y3RvciBvbiBXaW5DRS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvb2xkLXJ1bi13ZWJraXQt dGVzdHMgYi9Ub29scy9TY3JpcHRzL29sZC1ydW4td2Via2l0LXRlc3RzCmluZGV4IDk2NzBiNzdh MGY1NTQ5ZjhiMGRmN2MxM2IyODUwMDcxNzQ1YzIzZWUuLmFlZTYzOWYzOTE0ODk3ZjIzMjczMWMz YjlhOTk0ZjRhNTc5Yjg3ODQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvb2xkLXJ1bi13ZWJr aXQtdGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9vbGQtcnVuLXdlYmtpdC10ZXN0cwpAQCAtMjMy LDcgKzIzMiwxMSBAQCBpZiAoaXNBcHBsZU1hY1dlYktpdCgpKSB7CiAgICAgICAgICRwbGF0Zm9y bSA9ICJtYWMiOwogICAgIH0KIH0gZWxzaWYgKGlzUXQoKSkgewotICAgICRwbGF0Zm9ybSA9ICJx dCI7CisgICAgaWYgKGdldFF0VmVyc2lvbigpIGx0ICI1LjAiKSB7CisgICAgICAgICRwbGF0Zm9y bSA9ICJxdC00LjgiOworICAgIH0gZWxzZSB7CisgICAgICAgICRwbGF0Zm9ybSA9ICJxdC01LjAt d2sxIjsKKyAgICB9CiB9IGVsc2lmIChpc0d0aygpKSB7CiAgICAgJHBsYXRmb3JtID0gImd0ayI7 CiB9IGVsc2lmIChpc1d4KCkpIHsKQEAgLTMyOCw2ICszMzIsMjMgQEAgRU9GCiAKIHNldENvbmZp Z3VyYXRpb24oKTsKIAoraWYgKCR1c2VXZWJLaXRUZXN0UnVubmVyKSB7CisgICAgaWYgKGlzQXBw bGVNYWNXZWJLaXQoKSkgeworICAgICAgICAkcmVhbFBsYXRmb3JtID0gJHBsYXRmb3JtOworICAg ICAgICAkcGxhdGZvcm0gPSAibWFjLXdrMiI7CisgICAgfSBlbHNpZiAoaXNBcHBsZVdpbldlYktp dCgpKSB7CisgICAgICAgICRzdHJpcEVkaXRpbmdDYWxsYmFja3MgPSAwIHVubGVzcyBkZWZpbmVk ICRzdHJpcEVkaXRpbmdDYWxsYmFja3M7CisgICAgICAgICRyZWFsUGxhdGZvcm0gPSAkcGxhdGZv cm07CisgICAgICAgICRwbGF0Zm9ybSA9ICJ3aW4td2syIjsKKyAgICB9IGVsc2lmIChpc1F0KCkp IHsKKyAgICAgICAgJHJlYWxQbGF0Zm9ybSA9ICRwbGF0Zm9ybTsKKyAgICAgICAgJHBsYXRmb3Jt ID0gInF0LTUuMC13azIiOworICAgIH0gZWxzaWYgKGlzR3RrKCkpIHsKKyAgICAgICAgJHJlYWxQ bGF0Zm9ybSA9ICRwbGF0Zm9ybTsKKyAgICAgICAgJHBsYXRmb3JtID0gImd0ay13azIiOworICAg IH0KK30KKwogbXkgJGdldE9wdGlvbnNSZXN1bHQgPSBHZXRPcHRpb25zKAogICAgICdhZGQtcGxh dGZvcm0tZXhjZXB0aW9ucycgPT4gXCRhZGRQbGF0Zm9ybUV4Y2VwdGlvbnMsCiAgICAgJ2FkZGl0 aW9uYWwtcGxhdGZvcm0tZGlyZWN0b3J5PXMnID0+IFxAYWRkaXRpb25hbFBsYXRmb3JtRGlyZWN0 b3JpZXMsCkBAIC0zODIsMjMgKzQwMyw2IEBAIGlmICghJGdldE9wdGlvbnNSZXN1bHQgfHwgJHNo b3dIZWxwKSB7CiAgICAgZXhpdCAxOwogfQogCi1pZiAoJHVzZVdlYktpdFRlc3RSdW5uZXIpIHsK LSAgICBpZiAoaXNBcHBsZU1hY1dlYktpdCgpKSB7Ci0gICAgICAgICRyZWFsUGxhdGZvcm0gPSAk cGxhdGZvcm07Ci0gICAgICAgICRwbGF0Zm9ybSA9ICJtYWMtd2syIjsKLSAgICB9IGVsc2lmIChp c0FwcGxlV2luV2ViS2l0KCkpIHsKLSAgICAgICAgJHN0cmlwRWRpdGluZ0NhbGxiYWNrcyA9IDAg dW5sZXNzIGRlZmluZWQgJHN0cmlwRWRpdGluZ0NhbGxiYWNrczsKLSAgICAgICAgJHJlYWxQbGF0 Zm9ybSA9ICRwbGF0Zm9ybTsKLSAgICAgICAgJHBsYXRmb3JtID0gIndpbi13azIiOwotICAgIH0g ZWxzaWYgKGlzUXQoKSkgewotICAgICAgICAkcmVhbFBsYXRmb3JtID0gJHBsYXRmb3JtOwotICAg ICAgICAkcGxhdGZvcm0gPSAicXQtNS4wLXdrMiI7Ci0gICAgfSBlbHNpZiAoaXNHdGsoKSkgewot ICAgICAgICAkcmVhbFBsYXRmb3JtID0gJHBsYXRmb3JtOwotICAgICAgICAkcGxhdGZvcm0gPSAi Z3RrLXdrMiI7Ci0gICAgfQotfQotCiAkdGltZW91dFNlY29uZHMgKj0gMTAgaWYgJGd1YXJkTWFs bG9jOwogCiAkc3RyaXBFZGl0aW5nQ2FsbGJhY2tzID0gaXNDeWd3aW4oKSB1bmxlc3MgZGVmaW5l ZCAkc3RyaXBFZGl0aW5nQ2FsbGJhY2tzOwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvcXQucHkKaW5kZXggNWZjNjBhNTkwMDg1M2IyNDU1Yzg3NzYzM2I4M2Nl MTA3ODg0NzAwZS4uZWRiOWYwZjJiMWE1ZDljMGM2YjFkN2VhNDM5NjVkZDU5MTZkNGJhNCAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5CkBAIC00 Nyw2ICs0Nyw3IEBAIGNsYXNzIFF0UG9ydChXZWJLaXRQb3J0KToKICAgICBBTExfVkVSU0lPTlMg PSBbJ2xpbnV4JywgJ3dpbicsICdtYWMnXQogICAgIHBvcnRfbmFtZSA9ICJxdCIKIAorICAgIEBj bGFzc21ldGhvZAogICAgIGRlZiBfd2syX3BvcnRfbmFtZShzZWxmKToKICAgICAgICAgcmV0dXJu ICJxdC01LjAtd2syIgogCkBAIC01Nyw2ICs1OCw4IEBAIGNsYXNzIFF0UG9ydChXZWJLaXRQb3J0 KToKICAgICBkZWYgZGV0ZXJtaW5lX2Z1bGxfcG9ydF9uYW1lKGNscywgaG9zdCwgb3B0aW9ucywg cG9ydF9uYW1lKToKICAgICAgICAgaWYgcG9ydF9uYW1lIGFuZCBwb3J0X25hbWUgIT0gY2xzLnBv cnRfbmFtZToKICAgICAgICAgICAgIHJldHVybiBwb3J0X25hbWUKKyAgICAgICAgaWYgaGFzYXR0 cihvcHRpb25zLCAnd2Via2l0X3Rlc3RfcnVubmVyJykgYW5kIGdldGF0dHIob3B0aW9ucywgJ3dl YmtpdF90ZXN0X3J1bm5lcicpOgorICAgICAgICAgICAgcmV0dXJuIGNscy5fd2syX3BvcnRfbmFt ZSgpCiAgICAgICAgIHJldHVybiBwb3J0X25hbWUgKyAnLScgKyBob3N0LnBsYXRmb3JtLm9zX25h bWUKIAogICAgICMgc3lzX3BsYXRmb3JtIGV4aXN0cyBvbmx5IGZvciB1bml0IHRlc3RpbmcuCkBA IC0xMDgsOCArMTExLDYgQEAgY2xhc3MgUXRQb3J0KFdlYktpdFBvcnQpOgogCiAgICAgZGVmIGJh c2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgogICAgICAgICBzZWFyY2hfcGF0aHMgPSBbXQotICAg ICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ3dlYmtpdF90ZXN0X3J1bm5lcicpOgotICAgICAgICAg ICAgc2VhcmNoX3BhdGhzLmFwcGVuZChzZWxmLl93azJfcG9ydF9uYW1lKCkpCiAgICAgICAgIHNl YXJjaF9wYXRocy5hcHBlbmQoc2VsZi5uYW1lKCkpCiAgICAgICAgIHZlcnNpb24gPSBzZWxmLnF0 X3ZlcnNpb24oKQogICAgICAgICBpZiAnNC44JyBpbiB2ZXJzaW9uOgo= 130868 2012-03-08 11:54:27 -0800 2012-03-14 16:14:19 -0700 Patch bug-72489-20120308165425.patch text/plain 9361 rafael.lobo U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwMTcxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTJlYWRiMzU5Y2QyOGI3ZDhkNTQzZDJkOTkyYjQxODE3 MDkyMzc0NC4uMDE1ZDRmYWM3NzQ1OWVhYzdhMTY1YjIyZjZkMGUyYjFhMDEzOTdiZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDEyLTAzLTA4ICBSYWZhZWwgQnJhbmRhbyAgPHJhZmFlbC5sb2JvQG9wZW5ib3NzYS5v cmc+CisKKyAgICAgICAgW05SV1RdIEZpeCAtLXBsYXRmb3JtPXF0LTUuMCAtLW5ldy1iYXNlbGlu ZSBjb21ibworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzI0ODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBO UldUOiBUaGUgZGVmYXVsdCBwbGF0Zm9ybSBuYW1lIGZvciBRdCBjb21iaW5lZCB3aXRoIC0td2Vi a2l0LXRlc3QtcnVubmVyIGlzIG5vdworICAgICAgICAicXQtNS4wLXdrMiIgaW5zdGVhZCBvZiAi cXQtbGludXgiIGFuZCB0aGF0IG5hbWUgaXMgbm93IHByZWZlcmVkIGZvciB0ZXN0cy4KKyAgICAg ICAgLS1wbGF0Zm9ybSB3aWxsIG92ZXJyaWRlIHRoZSBwbGF0Zm9ybSBuYW1lIGFuZCB0aGVuIHdl J2xsIHVzZSBpdC4KKworICAgICAgICBPUldUOiBXZSBjaGVjayBmb3IgcXQgdmVyc2lvbiBhbmQg dXNlIHBsYXRmb3JtIG5hbWUgInF0LTQuOCIgaWYgdGhlIHZlcnNpb24gaXMgbG93ZXIKKyAgICAg ICAgdGhhbiA1LjAuMCwgYW5kIHRoZW4gd2UgY2hvb3NlIGJldHdlZW4gInF0LTUuMC13azEiIGFu ZCAicXQtNS4wLXdrMiIuIC0tcGxhdGZvcm0gd2lsbAorICAgICAgICBvdmVycmlkZSBpdCBpbiB0 aGUgZW5kLgorCisgICAgICAgICogU2NyaXB0cy9vbGQtcnVuLXdlYmtpdC10ZXN0czoKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5OgorICAgICAgICAo UXRQb3J0KToKKyAgICAgICAgKFF0UG9ydC5kZXRlcm1pbmVfZnVsbF9wb3J0X25hbWUpOgorICAg ICAgICAoUXRQb3J0LmJhc2VsaW5lX3NlYXJjaF9wYXRoKToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5OgorICAgICAgICAoUXRQb3J0 VGVzdCk6CisgICAgICAgIChRdFBvcnRUZXN0Ll9hc3NlcnRfc2VhcmNoX3BhdGgpOgorICAgICAg ICAoUXRQb3J0VGVzdC50ZXN0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKToKKwogMjAxMi0wMy0wOCAg U2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5y ZXZpZXdlZCwgcm9sbGluZyBvdXQgcjExMDExNS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv b2xkLXJ1bi13ZWJraXQtdGVzdHMgYi9Ub29scy9TY3JpcHRzL29sZC1ydW4td2Via2l0LXRlc3Rz CmluZGV4IDk2NzBiNzdhMGY1NTQ5ZjhiMGRmN2MxM2IyODUwMDcxNzQ1YzIzZWUuLmFlZTYzOWYz OTE0ODk3ZjIzMjczMWMzYjlhOTk0ZjRhNTc5Yjg3ODQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvb2xkLXJ1bi13ZWJraXQtdGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9vbGQtcnVuLXdlYmtp dC10ZXN0cwpAQCAtMjMyLDcgKzIzMiwxMSBAQCBpZiAoaXNBcHBsZU1hY1dlYktpdCgpKSB7CiAg ICAgICAgICRwbGF0Zm9ybSA9ICJtYWMiOwogICAgIH0KIH0gZWxzaWYgKGlzUXQoKSkgewotICAg ICRwbGF0Zm9ybSA9ICJxdCI7CisgICAgaWYgKGdldFF0VmVyc2lvbigpIGx0ICI1LjAiKSB7Cisg ICAgICAgICRwbGF0Zm9ybSA9ICJxdC00LjgiOworICAgIH0gZWxzZSB7CisgICAgICAgICRwbGF0 Zm9ybSA9ICJxdC01LjAtd2sxIjsKKyAgICB9CiB9IGVsc2lmIChpc0d0aygpKSB7CiAgICAgJHBs YXRmb3JtID0gImd0ayI7CiB9IGVsc2lmIChpc1d4KCkpIHsKQEAgLTMyOCw2ICszMzIsMjMgQEAg RU9GCiAKIHNldENvbmZpZ3VyYXRpb24oKTsKIAoraWYgKCR1c2VXZWJLaXRUZXN0UnVubmVyKSB7 CisgICAgaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgeworICAgICAgICAkcmVhbFBsYXRmb3JtID0g JHBsYXRmb3JtOworICAgICAgICAkcGxhdGZvcm0gPSAibWFjLXdrMiI7CisgICAgfSBlbHNpZiAo aXNBcHBsZVdpbldlYktpdCgpKSB7CisgICAgICAgICRzdHJpcEVkaXRpbmdDYWxsYmFja3MgPSAw IHVubGVzcyBkZWZpbmVkICRzdHJpcEVkaXRpbmdDYWxsYmFja3M7CisgICAgICAgICRyZWFsUGxh dGZvcm0gPSAkcGxhdGZvcm07CisgICAgICAgICRwbGF0Zm9ybSA9ICJ3aW4td2syIjsKKyAgICB9 IGVsc2lmIChpc1F0KCkpIHsKKyAgICAgICAgJHJlYWxQbGF0Zm9ybSA9ICRwbGF0Zm9ybTsKKyAg ICAgICAgJHBsYXRmb3JtID0gInF0LTUuMC13azIiOworICAgIH0gZWxzaWYgKGlzR3RrKCkpIHsK KyAgICAgICAgJHJlYWxQbGF0Zm9ybSA9ICRwbGF0Zm9ybTsKKyAgICAgICAgJHBsYXRmb3JtID0g Imd0ay13azIiOworICAgIH0KK30KKwogbXkgJGdldE9wdGlvbnNSZXN1bHQgPSBHZXRPcHRpb25z KAogICAgICdhZGQtcGxhdGZvcm0tZXhjZXB0aW9ucycgPT4gXCRhZGRQbGF0Zm9ybUV4Y2VwdGlv bnMsCiAgICAgJ2FkZGl0aW9uYWwtcGxhdGZvcm0tZGlyZWN0b3J5PXMnID0+IFxAYWRkaXRpb25h bFBsYXRmb3JtRGlyZWN0b3JpZXMsCkBAIC0zODIsMjMgKzQwMyw2IEBAIGlmICghJGdldE9wdGlv bnNSZXN1bHQgfHwgJHNob3dIZWxwKSB7CiAgICAgZXhpdCAxOwogfQogCi1pZiAoJHVzZVdlYktp dFRlc3RSdW5uZXIpIHsKLSAgICBpZiAoaXNBcHBsZU1hY1dlYktpdCgpKSB7Ci0gICAgICAgICRy ZWFsUGxhdGZvcm0gPSAkcGxhdGZvcm07Ci0gICAgICAgICRwbGF0Zm9ybSA9ICJtYWMtd2syIjsK LSAgICB9IGVsc2lmIChpc0FwcGxlV2luV2ViS2l0KCkpIHsKLSAgICAgICAgJHN0cmlwRWRpdGlu Z0NhbGxiYWNrcyA9IDAgdW5sZXNzIGRlZmluZWQgJHN0cmlwRWRpdGluZ0NhbGxiYWNrczsKLSAg ICAgICAgJHJlYWxQbGF0Zm9ybSA9ICRwbGF0Zm9ybTsKLSAgICAgICAgJHBsYXRmb3JtID0gIndp bi13azIiOwotICAgIH0gZWxzaWYgKGlzUXQoKSkgewotICAgICAgICAkcmVhbFBsYXRmb3JtID0g JHBsYXRmb3JtOwotICAgICAgICAkcGxhdGZvcm0gPSAicXQtNS4wLXdrMiI7Ci0gICAgfSBlbHNp ZiAoaXNHdGsoKSkgewotICAgICAgICAkcmVhbFBsYXRmb3JtID0gJHBsYXRmb3JtOwotICAgICAg ICAkcGxhdGZvcm0gPSAiZ3RrLXdrMiI7Ci0gICAgfQotfQotCiAkdGltZW91dFNlY29uZHMgKj0g MTAgaWYgJGd1YXJkTWFsbG9jOwogCiAkc3RyaXBFZGl0aW5nQ2FsbGJhY2tzID0gaXNDeWd3aW4o KSB1bmxlc3MgZGVmaW5lZCAkc3RyaXBFZGl0aW5nQ2FsbGJhY2tzOwpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHkKaW5kZXggNWZjNjBhNTkwMDg1M2Iy NDU1Yzg3NzYzM2I4M2NlMTA3ODg0NzAwZS4uZTRjYTYzZjg3N2Q5NjdiMTMxN2EwZmU2MWU1ZTAz YzE1OGQxMzZkNyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9xdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3F0LnB5CkBAIC00Nyw2ICs0Nyw3IEBAIGNsYXNzIFF0UG9ydChXZWJLaXRQb3J0KToKICAg ICBBTExfVkVSU0lPTlMgPSBbJ2xpbnV4JywgJ3dpbicsICdtYWMnXQogICAgIHBvcnRfbmFtZSA9 ICJxdCIKIAorICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBfd2syX3BvcnRfbmFtZShzZWxmKToK ICAgICAgICAgcmV0dXJuICJxdC01LjAtd2syIgogCkBAIC01Nyw3ICs1OCw5IEBAIGNsYXNzIFF0 UG9ydChXZWJLaXRQb3J0KToKICAgICBkZWYgZGV0ZXJtaW5lX2Z1bGxfcG9ydF9uYW1lKGNscywg aG9zdCwgb3B0aW9ucywgcG9ydF9uYW1lKToKICAgICAgICAgaWYgcG9ydF9uYW1lIGFuZCBwb3J0 X25hbWUgIT0gY2xzLnBvcnRfbmFtZToKICAgICAgICAgICAgIHJldHVybiBwb3J0X25hbWUKLSAg ICAgICAgcmV0dXJuIHBvcnRfbmFtZSArICctJyArIGhvc3QucGxhdGZvcm0ub3NfbmFtZQorICAg ICAgICBpZiBoYXNhdHRyKG9wdGlvbnMsICd3ZWJraXRfdGVzdF9ydW5uZXInKSBhbmQgZ2V0YXR0 cihvcHRpb25zLCAnd2Via2l0X3Rlc3RfcnVubmVyJyk6CisgICAgICAgICAgICByZXR1cm4gY2xz Ll93azJfcG9ydF9uYW1lKCkKKyAgICAgICAgcmV0dXJuIGNscy5wb3J0X25hbWUgKyAnLScgKyBo b3N0LnBsYXRmb3JtLm9zX25hbWUKIAogICAgICMgc3lzX3BsYXRmb3JtIGV4aXN0cyBvbmx5IGZv ciB1bml0IHRlc3RpbmcuCiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFtZSwg Kiprd2FyZ3MpOgpAQCAtMTA4LDggKzExMSw2IEBAIGNsYXNzIFF0UG9ydChXZWJLaXRQb3J0KToK IAogICAgIGRlZiBiYXNlbGluZV9zZWFyY2hfcGF0aChzZWxmKToKICAgICAgICAgc2VhcmNoX3Bh dGhzID0gW10KLSAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd3ZWJraXRfdGVzdF9ydW5uZXIn KToKLSAgICAgICAgICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoc2VsZi5fd2syX3BvcnRfbmFtZSgp KQogICAgICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKHNlbGYubmFtZSgpKQogICAgICAgICB2ZXJz aW9uID0gc2VsZi5xdF92ZXJzaW9uKCkKICAgICAgICAgaWYgJzQuOCcgaW4gdmVyc2lvbjoKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXRfdW5p dHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3Vu aXR0ZXN0LnB5CmluZGV4IDI2NzlmMzNmMWYyZWFlNTIyODRhMDJiOTBkMDU5NTY3MWI2Mjc3OTcu LjJlYzBkZDkwMzA5YjEwNDIzZDRmMmM4Yzc1NDkwYjkxZDM5NTZiOGUgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXRfdW5pdHRlc3QucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91bml0dGVzdC5w eQpAQCAtMzgsMTggKzM4LDE4IEBAIGZyb20gd2Via2l0cHkudG9vbC5tb2NrdG9vbCBpbXBvcnQg TW9ja09wdGlvbnMKIAogCiBjbGFzcyBRdFBvcnRUZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFRlc3RD YXNlKToKLSAgICBwb3J0X25hbWUgPSAncXQtbWFjJworICAgIHBvcnRfbmFtZSA9ICdxdCcKICAg ICBwb3J0X21ha2VyID0gUXRQb3J0CiAKLSAgICBkZWYgX2Fzc2VydF9zZWFyY2hfcGF0aChzZWxm LCBzZWFyY2hfcGF0aHMsIG9zX25hbWU9Tm9uZSwgdXNlX3dlYmtpdDI9RmFsc2UsIHF0X3ZlcnNp b249JzQuOCcpOgorICAgIGRlZiBfYXNzZXJ0X3NlYXJjaF9wYXRoKHNlbGYsIHNlYXJjaF9wYXRo cywgb3NfbmFtZT1Ob25lLCBvdmVycmlkZV9wbGF0Zm9ybT1Ob25lLCB1c2Vfd2Via2l0Mj1GYWxz ZSwgcXRfdmVyc2lvbj0nNC44Jyk6CiAgICAgICAgICMgRklYTUU6IFBvcnQgY29uc3RydWN0b3Jz IHNob3VsZCBub3QgInBhcnNlIiB0aGUgcG9ydCBuYW1lLCBidXQKICAgICAgICAgIyByYXRoZXIg YmUgcGFzc2VkIGNvbXBvbmVudHMgKGRpcmVjdGx5IG9yIHZpYSBzZXR0ZXJzKS4gIE9uY2UKICAg ICAgICAgIyB3ZSBmaXggdGhhdCwgdGhpcyBtZXRob2Qgd2lsbCBuZWVkIGEgcmUtd3JpdGUuCiAg ICAgICAgIGhvc3QgPSBNb2NrU3lzdGVtSG9zdChvc19uYW1lPW9zX25hbWUpCiAgICAgICAgIGhv c3QuZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2ZTIoc2VsZi5fcXRfdmVyc2lvbihxdF92ZXJzaW9u KSkKLSAgICAgICAgcG9ydF9uYW1lID0gJ3F0LScgKyBvc19uYW1lCi0gICAgICAgIHBvcnQgPSBz ZWxmLm1ha2VfcG9ydChob3N0PWhvc3QsIHF0X3ZlcnNpb249cXRfdmVyc2lvbiwgcG9ydF9uYW1l PXBvcnRfbmFtZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9wdGlvbnM9TW9ja09w dGlvbnMod2Via2l0X3Rlc3RfcnVubmVyPXVzZV93ZWJraXQyLCBwbGF0Zm9ybT0ncXQnKSkKKyAg ICAgICAgb3B0aW9ucyA9IE1vY2tPcHRpb25zKHdlYmtpdF90ZXN0X3J1bm5lcj11c2Vfd2Via2l0 MiwgcGxhdGZvcm09J3F0JykKKyAgICAgICAgcG9ydF9uYW1lID0gUXRQb3J0LmRldGVybWluZV9m dWxsX3BvcnRfbmFtZShob3N0PWhvc3QsIG9wdGlvbnM9b3B0aW9ucywgcG9ydF9uYW1lPW92ZXJy aWRlX3BsYXRmb3JtKQorICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoaG9zdD1ob3N0LCBx dF92ZXJzaW9uPXF0X3ZlcnNpb24sIHBvcnRfbmFtZT1wb3J0X25hbWUsIG9wdGlvbnM9b3B0aW9u cykKICAgICAgICAgYWJzb2x1dGVfc2VhcmNoX3BhdGhzID0gbWFwKHBvcnQuX3dlYmtpdF9iYXNl bGluZV9wYXRoLCBzZWFyY2hfcGF0aHMpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQu YmFzZWxpbmVfc2VhcmNoX3BhdGgoKSwgYWJzb2x1dGVfc2VhcmNoX3BhdGhzKQogCkBAIC02MCwx NyArNjAsMjUgQEAgY2xhc3MgUXRQb3J0VGVzdChwb3J0X3Rlc3RjYXNlLlBvcnRUZXN0Q2FzZSk6 CiAgICAgICAgICAgICByZXR1cm4gJ1FNYWtlIHZlcnNpb24gMi4wMWFcblVzaW5nIFF0IHZlcnNp b24gNS4wLjAgaW4gL3Vzci9sb2NhbC9Ucm9sbHRlY2gvUXQtNS4wLjAvbGliJwogCiAgICAgZGVm IHRlc3RfYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6Ci0gICAgICAgIHNlbGYuX2Fzc2VydF9z ZWFyY2hfcGF0aChbJ3F0LW1hYycsICdxdC00LjgnLCAncXQnXSwgJ21hYycsIHF0X3ZlcnNpb249 JzQuOCcpCi0gICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LXdpbicsICdxdC00 LjgnLCAncXQnXSwgJ3dpbicsIHF0X3ZlcnNpb249JzQuOCcpCi0gICAgICAgIHNlbGYuX2Fzc2Vy dF9zZWFyY2hfcGF0aChbJ3F0LWxpbnV4JywgJ3F0LTQuOCcsICdxdCddLCAnbGludXgnLCBxdF92 ZXJzaW9uPSc0LjgnKQorICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC1tYWMn LCAncXQtNC44JywgJ3F0J10sIG9zX25hbWU9J21hYycsIHF0X3ZlcnNpb249JzQuOCcpCisgICAg ICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LXdpbicsICdxdC00LjgnLCAncXQnXSwg b3NfbmFtZT0nd2luJywgcXRfdmVyc2lvbj0nNC44JykKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3Nl YXJjaF9wYXRoKFsncXQtbGludXgnLCAncXQtNC44JywgJ3F0J10sIG9zX25hbWU9J2xpbnV4Jywg cXRfdmVyc2lvbj0nNC44JykKIAotICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydx dC1tYWMnLCAncXQtNC44JywgJ3F0J10sICdtYWMnKQotICAgICAgICBzZWxmLl9hc3NlcnRfc2Vh cmNoX3BhdGgoWydxdC13aW4nLCAncXQtNC44JywgJ3F0J10sICd3aW4nKQotICAgICAgICBzZWxm Ll9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC1saW51eCcsICdxdC00LjgnLCAncXQnXSwgJ2xpbnV4 JykKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtNC44JywgJ3F0LTQuOCcs ICdxdCddLCBvc19uYW1lPSdtYWMnLCBvdmVycmlkZV9wbGF0Zm9ybT0ncXQtNC44JywgcXRfdmVy c2lvbj0nNC44JykKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtNC44Jywg J3F0LTQuOCcsICdxdCddLCBvc19uYW1lPSd3aW4nLCBvdmVycmlkZV9wbGF0Zm9ybT0ncXQtNC44 JywgcXRfdmVyc2lvbj0nNC44JykKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsn cXQtNC44JywgJ3F0LTQuOCcsICdxdCddLCBvc19uYW1lPSdsaW51eCcsIG92ZXJyaWRlX3BsYXRm b3JtPSdxdC00LjgnLCBxdF92ZXJzaW9uPSc0LjgnKQogCi0gICAgICAgIHNlbGYuX2Fzc2VydF9z ZWFyY2hfcGF0aChbJ3F0LTUuMC13azInLCAncXQtbWFjJywgJ3F0LTUuMCcsICdxdCddLCAnbWFj JywgdXNlX3dlYmtpdDI9VHJ1ZSwgcXRfdmVyc2lvbj0nNS4wJykKLSAgICAgICAgc2VsZi5fYXNz ZXJ0X3NlYXJjaF9wYXRoKFsncXQtNS4wLXdrMicsICdxdC13aW4nLCAncXQtNS4wJywgJ3F0J10s ICd3aW4nLCB1c2Vfd2Via2l0Mj1UcnVlLCBxdF92ZXJzaW9uPSc1LjAnKQotICAgICAgICBzZWxm Ll9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC01LjAtd2syJywgJ3F0LWxpbnV4JywgJ3F0LTUuMCcs ICdxdCddLCAnbGludXgnLCB1c2Vfd2Via2l0Mj1UcnVlLCBxdF92ZXJzaW9uPSc1LjAnKQorICAg ICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC1tYWMnLCAncXQtNC44JywgJ3F0J10s IG9zX25hbWU9J21hYycpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LXdp bicsICdxdC00LjgnLCAncXQnXSwgb3NfbmFtZT0nd2luJykKKyAgICAgICAgc2VsZi5fYXNzZXJ0 X3NlYXJjaF9wYXRoKFsncXQtbGludXgnLCAncXQtNC44JywgJ3F0J10sIG9zX25hbWU9J2xpbnV4 JykKKworICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC01LjAtd2syJywgJ3F0 LTUuMCcsICdxdCddLCBvc19uYW1lPSdtYWMnLCB1c2Vfd2Via2l0Mj1UcnVlLCBxdF92ZXJzaW9u PSc1LjAnKQorICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC01LjAtd2syJywg J3F0LTUuMCcsICdxdCddLCBvc19uYW1lPSd3aW4nLCB1c2Vfd2Via2l0Mj1UcnVlLCBxdF92ZXJz aW9uPSc1LjAnKQorICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC01LjAtd2sy JywgJ3F0LTUuMCcsICdxdCddLCBvc19uYW1lPSdsaW51eCcsIHVzZV93ZWJraXQyPVRydWUsIHF0 X3ZlcnNpb249JzUuMCcpCisKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQt bWFjJywgJ3F0LTUuMCcsICdxdCddLCBvc19uYW1lPSdtYWMnLCBvdmVycmlkZV9wbGF0Zm9ybT0n cXQtbWFjJywgdXNlX3dlYmtpdDI9VHJ1ZSwgcXRfdmVyc2lvbj0nNS4wJykKKyAgICAgICAgc2Vs Zi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtd2luJywgJ3F0LTUuMCcsICdxdCddLCBvc19uYW1l PSd3aW4nLCBvdmVycmlkZV9wbGF0Zm9ybT0ncXQtd2luJywgdXNlX3dlYmtpdDI9VHJ1ZSwgcXRf dmVyc2lvbj0nNS4wJykKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtbGlu dXgnLCAncXQtNS4wJywgJ3F0J10sIG9zX25hbWU9J2xpbnV4Jywgb3ZlcnJpZGVfcGxhdGZvcm09 J3F0LWxpbnV4JywgdXNlX3dlYmtpdDI9VHJ1ZSwgcXRfdmVyc2lvbj0nNS4wJykKIAogICAgIGRl ZiB0ZXN0X3Nob3dfcmVzdWx0c19odG1sX2ZpbGUoc2VsZik6CiAgICAgICAgIHBvcnQgPSBzZWxm Lm1ha2VfcG9ydCgpCg== 131950 2012-03-14 16:14:26 -0700 2012-05-24 13:47:57 -0700 Patch bug-72489-20120314201424.patch text/plain 14963 rafael.lobo U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwNzQwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTYzYTg2ZWUyMTYwMjVjYWRhNmRlMzY0MGRiOTFlZWFk NTc3ZWI2YS4uODE4NGQwZjQyZGIzZjM2MzA0ZGZlNjQwMDg5MTgwODExMzM0YTUyYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3 IEBACisyMDEyLTAzLTE0ICBSYWZhZWwgQnJhbmRhbyAgPHJhZmFlbC5sb2JvQG9wZW5ib3NzYS5v cmc+CisKKyAgICAgICAgW05SV1RdIEZpeCAtLXBsYXRmb3JtPXF0LTUuMCAtLW5ldy1iYXNlbGlu ZSBjb21ibworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzI0ODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBO UldUOiBUaGUgZGVmYXVsdCBwbGF0Zm9ybSBuYW1lIGZvciBRdCBjb21iaW5lZCB3aXRoIC0td2Vi a2l0LXRlc3QtcnVubmVyIGlzIG5vdworICAgICAgICAicXQtNS4wLXdrMiIgaW5zdGVhZCBvZiAi cXQtbGludXgiLiBUaGlzIGltcGxpZXMgdGhhdCB3ZSBub3cgbmVlZCB0byBhZGQsIGlmIG5lY2Vz c2FyeSwKKyAgICAgICAgInF0LVtwbGF0Zm9ybV0iIHRvIGJhc2VsaW5lIGFuZCBza2lwcGVkIGZp bGUgc2VhcmNoIHBhdGhzLiBCZWZvcmUgYWRkaW5nIHBhdGhzLCBpdCBpcworICAgICAgICBub3cg Y2hlY2tpbmcgaWYgdGhlIGVudHJ5IGlzIG5vdCB0aGVyZSBhbHJlYWR5IChpdCBpcyBwb3NzaWJs ZSBhY2NvcmRpbmcgdG8gcGxhdGZvcm0gbmFtZSB1c2VkKS4KKyAgICAgICAgLS1wbGF0Zm9ybSB1 c2FnZSB3aWxsIG92ZXJyaWRlIHRoZSBwbGF0Zm9ybSBuYW1lLgorCisgICAgICAgIE9SV1Q6IFdl IGNoZWNrIGZvciBxdCB2ZXJzaW9uIGFuZCB1c2UgcGxhdGZvcm0gbmFtZSAicXQtNC44IiBpZiB0 aGUgdmVyc2lvbiBpcyBsb3dlcgorICAgICAgICB0aGFuIDUuMC4wLCBhbmQgdGhlbiB3ZSBjaG9v c2UgYmV0d2VlbiAicXQtNS4wLXdrMSIgYW5kICJxdC01LjAtd2syIi4gLS1wbGF0Zm9ybSB3aWxs CisgICAgICAgIG92ZXJyaWRlIGl0IGluIHRoZSBlbmQuCisKKyAgICAgICAgKiBTY3JpcHRzL29s ZC1ydW4td2Via2l0LXRlc3RzOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvcXQucHk6CisgICAgICAgIChRdFBvcnQpOgorICAgICAgICAoUXRQb3J0Ll9vc19w b3J0X25hbWUpOgorICAgICAgICAoUXRQb3J0LmRldGVybWluZV9mdWxsX3BvcnRfbmFtZSk6Cisg ICAgICAgIChRdFBvcnQuX19pbml0X18pOgorICAgICAgICAoUXRQb3J0LmJhc2VsaW5lX3NlYXJj aF9wYXRoKToKKyAgICAgICAgKFF0UG9ydC5fc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRocyk6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91bml0dGVzdC5w eToKKyAgICAgICAgKFF0UG9ydFRlc3QpOgorICAgICAgICAoUXRQb3J0VGVzdC5fZ2V0X3BvcnQp OgorICAgICAgICAoUXRQb3J0VGVzdC5fYXNzZXJ0X3NlYXJjaF9wYXRoKToKKyAgICAgICAgKFF0 UG9ydFRlc3QuX2Fzc2VydF9za2lwcGVkX2ZpbGVfc2VhcmNoX3BhdGgpOgorICAgICAgICAoUXRQ b3J0VGVzdC50ZXN0X2Jhc2VsaW5lX3NlYXJjaF9wYXRoKToKKyAgICAgICAgKFF0UG9ydFRlc3Qu dGVzdF9za2lwcGVkX2ZpbGVfc2VhcmNoX3BhdGhzKTogVGhlc2UgY2hlY2sgaWYgd2Uga2VlcCB0 aGUgc2FtZSBza2lwcGVkIGZpbGVzIGNvdmVyYWdlCisgICAgICAgIGFzIHdlIGNoYW5nZSB0aGUg LS1wbGF0Zm9ybSB2YWx1ZXMgb24gZGlmZmVyZW50IHF0IHZlcnNpb25zIG9yIG9wZXJhdGluZyBz eXN0ZW1zLgorCiAyMDEyLTAzLTE0ICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgQWRkIHRoZSBjaHJvbWl1bSBsaW9uIGJvdCB0byBnYXJkZW4tby1tYXRpYyBhbmQg cmVtb3ZlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL29sZC1ydW4td2Via2l0LXRlc3RzIGIv VG9vbHMvU2NyaXB0cy9vbGQtcnVuLXdlYmtpdC10ZXN0cwppbmRleCA5NjcwYjc3YTBmNTU0OWY4 YjBkZjdjMTNiMjg1MDA3MTc0NWMyM2VlLi5hZWU2MzlmMzkxNDg5N2YyMzI3MzFjM2I5YTk5NGY0 YTU3OWI4Nzg0IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL29sZC1ydW4td2Via2l0LXRlc3Rz CisrKyBiL1Rvb2xzL1NjcmlwdHMvb2xkLXJ1bi13ZWJraXQtdGVzdHMKQEAgLTIzMiw3ICsyMzIs MTEgQEAgaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgewogICAgICAgICAkcGxhdGZvcm0gPSAibWFj IjsKICAgICB9CiB9IGVsc2lmIChpc1F0KCkpIHsKLSAgICAkcGxhdGZvcm0gPSAicXQiOworICAg IGlmIChnZXRRdFZlcnNpb24oKSBsdCAiNS4wIikgeworICAgICAgICAkcGxhdGZvcm0gPSAicXQt NC44IjsKKyAgICB9IGVsc2UgeworICAgICAgICAkcGxhdGZvcm0gPSAicXQtNS4wLXdrMSI7Cisg ICAgfQogfSBlbHNpZiAoaXNHdGsoKSkgewogICAgICRwbGF0Zm9ybSA9ICJndGsiOwogfSBlbHNp ZiAoaXNXeCgpKSB7CkBAIC0zMjgsNiArMzMyLDIzIEBAIEVPRgogCiBzZXRDb25maWd1cmF0aW9u KCk7CiAKK2lmICgkdXNlV2ViS2l0VGVzdFJ1bm5lcikgeworICAgIGlmIChpc0FwcGxlTWFjV2Vi S2l0KCkpIHsKKyAgICAgICAgJHJlYWxQbGF0Zm9ybSA9ICRwbGF0Zm9ybTsKKyAgICAgICAgJHBs YXRmb3JtID0gIm1hYy13azIiOworICAgIH0gZWxzaWYgKGlzQXBwbGVXaW5XZWJLaXQoKSkgewor ICAgICAgICAkc3RyaXBFZGl0aW5nQ2FsbGJhY2tzID0gMCB1bmxlc3MgZGVmaW5lZCAkc3RyaXBF ZGl0aW5nQ2FsbGJhY2tzOworICAgICAgICAkcmVhbFBsYXRmb3JtID0gJHBsYXRmb3JtOworICAg ICAgICAkcGxhdGZvcm0gPSAid2luLXdrMiI7CisgICAgfSBlbHNpZiAoaXNRdCgpKSB7CisgICAg ICAgICRyZWFsUGxhdGZvcm0gPSAkcGxhdGZvcm07CisgICAgICAgICRwbGF0Zm9ybSA9ICJxdC01 LjAtd2syIjsKKyAgICB9IGVsc2lmIChpc0d0aygpKSB7CisgICAgICAgICRyZWFsUGxhdGZvcm0g PSAkcGxhdGZvcm07CisgICAgICAgICRwbGF0Zm9ybSA9ICJndGstd2syIjsKKyAgICB9Cit9CisK IG15ICRnZXRPcHRpb25zUmVzdWx0ID0gR2V0T3B0aW9ucygKICAgICAnYWRkLXBsYXRmb3JtLWV4 Y2VwdGlvbnMnID0+IFwkYWRkUGxhdGZvcm1FeGNlcHRpb25zLAogICAgICdhZGRpdGlvbmFsLXBs YXRmb3JtLWRpcmVjdG9yeT1zJyA9PiBcQGFkZGl0aW9uYWxQbGF0Zm9ybURpcmVjdG9yaWVzLApA QCAtMzgyLDIzICs0MDMsNiBAQCBpZiAoISRnZXRPcHRpb25zUmVzdWx0IHx8ICRzaG93SGVscCkg ewogICAgIGV4aXQgMTsKIH0KIAotaWYgKCR1c2VXZWJLaXRUZXN0UnVubmVyKSB7Ci0gICAgaWYg KGlzQXBwbGVNYWNXZWJLaXQoKSkgewotICAgICAgICAkcmVhbFBsYXRmb3JtID0gJHBsYXRmb3Jt OwotICAgICAgICAkcGxhdGZvcm0gPSAibWFjLXdrMiI7Ci0gICAgfSBlbHNpZiAoaXNBcHBsZVdp bldlYktpdCgpKSB7Ci0gICAgICAgICRzdHJpcEVkaXRpbmdDYWxsYmFja3MgPSAwIHVubGVzcyBk ZWZpbmVkICRzdHJpcEVkaXRpbmdDYWxsYmFja3M7Ci0gICAgICAgICRyZWFsUGxhdGZvcm0gPSAk cGxhdGZvcm07Ci0gICAgICAgICRwbGF0Zm9ybSA9ICJ3aW4td2syIjsKLSAgICB9IGVsc2lmIChp c1F0KCkpIHsKLSAgICAgICAgJHJlYWxQbGF0Zm9ybSA9ICRwbGF0Zm9ybTsKLSAgICAgICAgJHBs YXRmb3JtID0gInF0LTUuMC13azIiOwotICAgIH0gZWxzaWYgKGlzR3RrKCkpIHsKLSAgICAgICAg JHJlYWxQbGF0Zm9ybSA9ICRwbGF0Zm9ybTsKLSAgICAgICAgJHBsYXRmb3JtID0gImd0ay13azIi OwotICAgIH0KLX0KLQogJHRpbWVvdXRTZWNvbmRzICo9IDEwIGlmICRndWFyZE1hbGxvYzsKIAog JHN0cmlwRWRpdGluZ0NhbGxiYWNrcyA9IGlzQ3lnd2luKCkgdW5sZXNzIGRlZmluZWQgJHN0cmlw RWRpdGluZ0NhbGxiYWNrczsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvcXQucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L3F0LnB5CmluZGV4IDM3MTE4YmJlMDMxZjI5OWU1ZmZhYjU4MTEyMTZhZGQyOWRjYTY1 OGMuLjgyYTE0NzM5MDVkMmNlMzllZDNlNTYyODJmOTY5OTJlM2ZjZGQzYjMgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weQpAQCAtNDcsOSArNDcs MTMgQEAgY2xhc3MgUXRQb3J0KFdlYktpdFBvcnQpOgogICAgIEFMTF9WRVJTSU9OUyA9IFsnbGlu dXgnLCAnd2luJywgJ21hYyddCiAgICAgcG9ydF9uYW1lID0gInF0IgogCisgICAgQGNsYXNzbWV0 aG9kCiAgICAgZGVmIF93azJfcG9ydF9uYW1lKHNlbGYpOgogICAgICAgICByZXR1cm4gInF0LTUu MC13azIiCiAKKyAgICBkZWYgX29zX3BvcnRfbmFtZShzZWxmKToKKyAgICAgICAgcmV0dXJuICJx dC0iICsgc2VsZi5fb3BlcmF0aW5nX3N5c3RlbQorCiAgICAgZGVmIF9wb3J0X2ZsYWdfZm9yX3Nj cmlwdHMoc2VsZik6CiAgICAgICAgIHJldHVybiAiLS1xdCIKIApAQCAtNTcsNyArNjEsOSBAQCBj bGFzcyBRdFBvcnQoV2ViS2l0UG9ydCk6CiAgICAgZGVmIGRldGVybWluZV9mdWxsX3BvcnRfbmFt ZShjbHMsIGhvc3QsIG9wdGlvbnMsIHBvcnRfbmFtZSk6CiAgICAgICAgIGlmIHBvcnRfbmFtZSBh bmQgcG9ydF9uYW1lICE9IGNscy5wb3J0X25hbWU6CiAgICAgICAgICAgICByZXR1cm4gcG9ydF9u YW1lCi0gICAgICAgIHJldHVybiBwb3J0X25hbWUgKyAnLScgKyBob3N0LnBsYXRmb3JtLm9zX25h bWUKKyAgICAgICAgaWYgZ2V0YXR0cihvcHRpb25zLCAnd2Via2l0X3Rlc3RfcnVubmVyJywgRmFs c2UpOgorICAgICAgICAgICAgcmV0dXJuIGNscy5fd2syX3BvcnRfbmFtZSgpCisgICAgICAgIHJl dHVybiBjbHMucG9ydF9uYW1lICsgJy0nICsgaG9zdC5wbGF0Zm9ybS5vc19uYW1lCiAKICAgICAj IHN5c19wbGF0Zm9ybSBleGlzdHMgb25seSBmb3IgdW5pdCB0ZXN0aW5nLgogICAgIGRlZiBfX2lu aXRfXyhzZWxmLCBob3N0LCBwb3J0X25hbWUsICoqa3dhcmdzKToKQEAgLTY1LDcgKzcxLDcgQEAg Y2xhc3MgUXRQb3J0KFdlYktpdFBvcnQpOgogCiAgICAgICAgICMgRklYTUU6IFRoaXMgd2lsbCBh bGxvdyBXZWJLaXRQb3J0LmJhc2VsaW5lX3NlYXJjaF9wYXRoIGFuZCBXZWJLaXRQb3J0Ll9za2lw cGVkX2ZpbGVfc2VhcmNoX3BhdGhzCiAgICAgICAgICMgdG8gZG8gdGhlIHJpZ2h0IHRoaW5nLCBi dXQgZG9lc24ndCBpbmNsdWRlIHN1cHBvcnQgZm9yIHF0LTQuOCBvciBxdC1hcm0gKHNlZW4gaW4g TGF5b3V0VGVzdHMvcGxhdGZvcm0pIHlldC4KLSAgICAgICAgc2VsZi5fb3BlcmF0aW5nX3N5c3Rl bSA9IHBvcnRfbmFtZS5yZXBsYWNlKCdxdC0nLCAnJykKKyAgICAgICAgc2VsZi5fb3BlcmF0aW5n X3N5c3RlbSA9IGhvc3QucGxhdGZvcm0ub3NfbmFtZQogCiAgICAgICAgICMgRklYTUU6IFdoeSBp cyB0aGlzIGJlaW5nIHNldCBhdCBhbGw/CiAgICAgICAgIHNlbGYuX3ZlcnNpb24gPSBzZWxmLm9w ZXJhdGluZ19zeXN0ZW0oKQpAQCAtMTA4LDE5ICsxMTQsMjUgQEAgY2xhc3MgUXRQb3J0KFdlYktp dFBvcnQpOgogCiAgICAgZGVmIGJhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgogICAgICAgICBz ZWFyY2hfcGF0aHMgPSBbXQotICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ3dlYmtpdF90ZXN0 X3J1bm5lcicpOgotICAgICAgICAgICAgc2VhcmNoX3BhdGhzLmFwcGVuZChzZWxmLl93azJfcG9y dF9uYW1lKCkpCiAgICAgICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoc2VsZi5uYW1lKCkpCisgICAg ICAgIGlmIHNlbGYuX29zX3BvcnRfbmFtZSgpIG5vdCBpbiBzZWFyY2hfcGF0aHM6CisgICAgICAg ICAgICBzZWFyY2hfcGF0aHMuYXBwZW5kKHNlbGYuX29zX3BvcnRfbmFtZSgpKQorICAgICAgICBp ZiBzZWxmLmdldF9vcHRpb24oJ3dlYmtpdF90ZXN0X3J1bm5lcicpOgorICAgICAgICAgICAgaWYg IHNlbGYuX3drMl9wb3J0X25hbWUoKSBub3QgaW4gc2VhcmNoX3BhdGhzOgorICAgICAgICAgICAg ICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoc2VsZi5fd2syX3BvcnRfbmFtZSgpKQogICAgICAgICB2 ZXJzaW9uID0gc2VsZi5xdF92ZXJzaW9uKCkKICAgICAgICAgaWYgJzQuOCcgaW4gdmVyc2lvbjoK LSAgICAgICAgICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoJ3F0LTQuOCcpCisgICAgICAgICAgICBp ZiAncXQtNC44JyBub3QgaW4gc2VhcmNoX3BhdGhzOgorICAgICAgICAgICAgICAgIHNlYXJjaF9w YXRocy5hcHBlbmQoJ3F0LTQuOCcpCiAgICAgICAgIGVsaWYgdmVyc2lvbjoKLSAgICAgICAgICAg IHNlYXJjaF9wYXRocy5hcHBlbmQoJ3F0LTUuMCcpCi0gICAgICAgIHNlYXJjaF9wYXRocy5hcHBl bmQoc2VsZi5wb3J0X25hbWUpCisgICAgICAgICAgICBpZiAncXQtNS4wJyBub3QgaW4gc2VhcmNo X3BhdGhzOgorICAgICAgICAgICAgICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoJ3F0LTUuMCcpCisg ICAgICAgIGlmIHNlbGYucG9ydF9uYW1lIG5vdCBpbiBzZWFyY2hfcGF0aHM6CisgICAgICAgICAg ICBzZWFyY2hfcGF0aHMuYXBwZW5kKHNlbGYucG9ydF9uYW1lKQogICAgICAgICByZXR1cm4gbWFw KHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoLCBzZWFyY2hfcGF0aHMpCiAKICAgICBkZWYgX3Nr aXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMoc2VsZik6Ci0gICAgICAgIHNlYXJjaF9wYXRocyA9IHNl dChbc2VsZi5wb3J0X25hbWUsIHNlbGYubmFtZSgpXSkKKyAgICAgICAgc2VhcmNoX3BhdGhzID0g c2V0KFtzZWxmLnBvcnRfbmFtZSwgc2VsZi5uYW1lKCksIHNlbGYuX29zX3BvcnRfbmFtZSgpXSkK ICAgICAgICAgdmVyc2lvbiA9IHNlbGYucXRfdmVyc2lvbigpCiAgICAgICAgIGlmICc0LjgnIGlu IHZlcnNpb246CiAgICAgICAgICAgICBzZWFyY2hfcGF0aHMuYWRkKCdxdC00LjgnKQpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91bml0dGVz dC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXRfdW5pdHRl c3QucHkKaW5kZXggMjY3OWYzM2YxZjJlYWU1MjI4NGEwMmI5MGQwNTk1NjcxYjYyNzc5Ny4uYWJl ZmIzZGI0NDI5NDFkYzJmNTdhM2QzZDA4MGEyZDA2NzM5ZjU0MSAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdF91bml0dGVzdC5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0X3VuaXR0ZXN0LnB5CkBA IC0zOCwyMSArMzgsMjggQEAgZnJvbSB3ZWJraXRweS50b29sLm1vY2t0b29sIGltcG9ydCBNb2Nr T3B0aW9ucwogCiAKIGNsYXNzIFF0UG9ydFRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2Up OgotICAgIHBvcnRfbmFtZSA9ICdxdC1tYWMnCisgICAgcG9ydF9uYW1lID0gJ3F0JwogICAgIHBv cnRfbWFrZXIgPSBRdFBvcnQKIAotICAgIGRlZiBfYXNzZXJ0X3NlYXJjaF9wYXRoKHNlbGYsIHNl YXJjaF9wYXRocywgb3NfbmFtZT1Ob25lLCB1c2Vfd2Via2l0Mj1GYWxzZSwgcXRfdmVyc2lvbj0n NC44Jyk6CisgICAgZGVmIF9nZXRfcG9ydChzZWxmLCBvc19uYW1lPU5vbmUsIG92ZXJyaWRlX3Bs YXRmb3JtPU5vbmUsIHVzZV93ZWJraXQyPUZhbHNlLCBxdF92ZXJzaW9uPSc0LjgnKToKICAgICAg ICAgIyBGSVhNRTogUG9ydCBjb25zdHJ1Y3RvcnMgc2hvdWxkIG5vdCAicGFyc2UiIHRoZSBwb3J0 IG5hbWUsIGJ1dAogICAgICAgICAjIHJhdGhlciBiZSBwYXNzZWQgY29tcG9uZW50cyAoZGlyZWN0 bHkgb3IgdmlhIHNldHRlcnMpLiAgT25jZQogICAgICAgICAjIHdlIGZpeCB0aGF0LCB0aGlzIG1l dGhvZCB3aWxsIG5lZWQgYSByZS13cml0ZS4KICAgICAgICAgaG9zdCA9IE1vY2tTeXN0ZW1Ib3N0 KG9zX25hbWU9b3NfbmFtZSkKICAgICAgICAgaG9zdC5leGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZl MihzZWxmLl9xdF92ZXJzaW9uKHF0X3ZlcnNpb24pKQotICAgICAgICBwb3J0X25hbWUgPSAncXQt JyArIG9zX25hbWUKLSAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KGhvc3Q9aG9zdCwgcXRf dmVyc2lvbj1xdF92ZXJzaW9uLCBwb3J0X25hbWU9cG9ydF9uYW1lLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgb3B0aW9ucz1Nb2NrT3B0aW9ucyh3ZWJraXRfdGVzdF9ydW5uZXI9dXNl X3dlYmtpdDIsIHBsYXRmb3JtPSdxdCcpKQorICAgICAgICBvcHRpb25zID0gTW9ja09wdGlvbnMo d2Via2l0X3Rlc3RfcnVubmVyPXVzZV93ZWJraXQyLCBwbGF0Zm9ybT0ncXQnKQorICAgICAgICBw b3J0X25hbWUgPSBRdFBvcnQuZGV0ZXJtaW5lX2Z1bGxfcG9ydF9uYW1lKGhvc3Q9aG9zdCwgb3B0 aW9ucz1vcHRpb25zLCBwb3J0X25hbWU9b3ZlcnJpZGVfcGxhdGZvcm0pCisgICAgICAgIHJldHVy biBzZWxmLm1ha2VfcG9ydChob3N0PWhvc3QsIHF0X3ZlcnNpb249cXRfdmVyc2lvbiwgcG9ydF9u YW1lPXBvcnRfbmFtZSwgb3B0aW9ucz1vcHRpb25zKQorCisgICAgZGVmIF9hc3NlcnRfc2VhcmNo X3BhdGgoc2VsZiwgc2VhcmNoX3BhdGhzLCBvc19uYW1lPU5vbmUsIG92ZXJyaWRlX3BsYXRmb3Jt PU5vbmUsIHVzZV93ZWJraXQyPUZhbHNlLCBxdF92ZXJzaW9uPSc0LjgnKToKKyAgICAgICAgcG9y dCA9IHNlbGYuX2dldF9wb3J0KG9zX25hbWUsIG92ZXJyaWRlX3BsYXRmb3JtLCB1c2Vfd2Via2l0 MiwgcXRfdmVyc2lvbikKICAgICAgICAgYWJzb2x1dGVfc2VhcmNoX3BhdGhzID0gbWFwKHBvcnQu X3dlYmtpdF9iYXNlbGluZV9wYXRoLCBzZWFyY2hfcGF0aHMpCiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWxzKHBvcnQuYmFzZWxpbmVfc2VhcmNoX3BhdGgoKSwgYWJzb2x1dGVfc2VhcmNoX3BhdGhz KQogCisgICAgZGVmIF9hc3NlcnRfc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRoKHNlbGYsIHNlYXJj aF9wYXRocywgb3NfbmFtZT1Ob25lLCBvdmVycmlkZV9wbGF0Zm9ybT1Ob25lLCB1c2Vfd2Via2l0 Mj1GYWxzZSwgcXRfdmVyc2lvbj0nNC44Jyk6CisgICAgICAgIHBvcnQgPSBzZWxmLl9nZXRfcG9y dChvc19uYW1lLCBvdmVycmlkZV9wbGF0Zm9ybSwgdXNlX3dlYmtpdDIsIHF0X3ZlcnNpb24pCisg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQuX3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aHMo KSwgc2V0KHNlYXJjaF9wYXRocykpCisKICAgICBkZWYgX3F0X3ZlcnNpb24oc2VsZiwgcXRfdmVy c2lvbik6CiAgICAgICAgIGlmIHF0X3ZlcnNpb24gaW4gJzQuOCc6CiAgICAgICAgICAgICByZXR1 cm4gJ1FNYWtlIHZlcnNpb24gMi4wMWFcblVzaW5nIFF0IHZlcnNpb24gNC44LjAgaW4gL3Vzci9s b2NhbC9Ucm9sbHRlY2gvUXQtNC44LjIvbGliJwpAQCAtNjAsMTcgKzY3LDQ5IEBAIGNsYXNzIFF0 UG9ydFRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdENhc2UpOgogICAgICAgICAgICAgcmV0dXJu ICdRTWFrZSB2ZXJzaW9uIDIuMDFhXG5Vc2luZyBRdCB2ZXJzaW9uIDUuMC4wIGluIC91c3IvbG9j YWwvVHJvbGx0ZWNoL1F0LTUuMC4wL2xpYicKIAogICAgIGRlZiB0ZXN0X2Jhc2VsaW5lX3NlYXJj aF9wYXRoKHNlbGYpOgotICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC1tYWMn LCAncXQtNC44JywgJ3F0J10sICdtYWMnLCBxdF92ZXJzaW9uPSc0LjgnKQotICAgICAgICBzZWxm Ll9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC13aW4nLCAncXQtNC44JywgJ3F0J10sICd3aW4nLCBx dF92ZXJzaW9uPSc0LjgnKQotICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC1s aW51eCcsICdxdC00LjgnLCAncXQnXSwgJ2xpbnV4JywgcXRfdmVyc2lvbj0nNC44JykKKyAgICAg ICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtbWFjJywgJ3F0LTQuOCcsICdxdCddLCBv c19uYW1lPSdtYWMnLCBxdF92ZXJzaW9uPSc0LjgnKQorICAgICAgICBzZWxmLl9hc3NlcnRfc2Vh cmNoX3BhdGgoWydxdC13aW4nLCAncXQtNC44JywgJ3F0J10sIG9zX25hbWU9J3dpbicsIHF0X3Zl cnNpb249JzQuOCcpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LWxpbnV4 JywgJ3F0LTQuOCcsICdxdCddLCBvc19uYW1lPSdsaW51eCcsIHF0X3ZlcnNpb249JzQuOCcpCisK KyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtNC44JywgJ3F0LW1hYycsICdx dCddLCBvc19uYW1lPSdtYWMnLCBvdmVycmlkZV9wbGF0Zm9ybT0ncXQtNC44JywgcXRfdmVyc2lv bj0nNC44JykKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtNC44JywgJ3F0 LXdpbicsICdxdCddLCBvc19uYW1lPSd3aW4nLCBvdmVycmlkZV9wbGF0Zm9ybT0ncXQtNC44Jywg cXRfdmVyc2lvbj0nNC44JykKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQt NC44JywgJ3F0LWxpbnV4JywgJ3F0J10sIG9zX25hbWU9J2xpbnV4Jywgb3ZlcnJpZGVfcGxhdGZv cm09J3F0LTQuOCcsIHF0X3ZlcnNpb249JzQuOCcpCisKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3Nl YXJjaF9wYXRoKFsncXQtbWFjJywgJ3F0LTQuOCcsICdxdCddLCBvc19uYW1lPSdtYWMnKQorICAg ICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC13aW4nLCAncXQtNC44JywgJ3F0J10s IG9zX25hbWU9J3dpbicpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LWxp bnV4JywgJ3F0LTQuOCcsICdxdCddLCBvc19uYW1lPSdsaW51eCcpCisKKyAgICAgICAgc2VsZi5f YXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtNS4wLXdrMicsICdxdC1tYWMnLCAncXQtNS4wJywgJ3F0 J10sIG9zX25hbWU9J21hYycsIHVzZV93ZWJraXQyPVRydWUsIHF0X3ZlcnNpb249JzUuMCcpCisg ICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LTUuMC13azInLCAncXQtd2luJywg J3F0LTUuMCcsICdxdCddLCBvc19uYW1lPSd3aW4nLCB1c2Vfd2Via2l0Mj1UcnVlLCBxdF92ZXJz aW9uPSc1LjAnKQorICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC01LjAtd2sy JywgJ3F0LWxpbnV4JywgJ3F0LTUuMCcsICdxdCddLCBvc19uYW1lPSdsaW51eCcsIHVzZV93ZWJr aXQyPVRydWUsIHF0X3ZlcnNpb249JzUuMCcpCisKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NlYXJj aF9wYXRoKFsncXQtbWFjJywgJ3F0LTUuMC13azInLCAncXQtNS4wJywgJ3F0J10sIG9zX25hbWU9 J21hYycsIG92ZXJyaWRlX3BsYXRmb3JtPSdxdC1tYWMnLCB1c2Vfd2Via2l0Mj1UcnVlLCBxdF92 ZXJzaW9uPSc1LjAnKQorICAgICAgICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC13aW4n LCAncXQtNS4wLXdrMicsICdxdC01LjAnLCAncXQnXSwgb3NfbmFtZT0nd2luJywgb3ZlcnJpZGVf cGxhdGZvcm09J3F0LXdpbicsIHVzZV93ZWJraXQyPVRydWUsIHF0X3ZlcnNpb249JzUuMCcpCisg ICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LWxpbnV4JywgJ3F0LTUuMC13azIn LCAncXQtNS4wJywgJ3F0J10sIG9zX25hbWU9J2xpbnV4Jywgb3ZlcnJpZGVfcGxhdGZvcm09J3F0 LWxpbnV4JywgdXNlX3dlYmtpdDI9VHJ1ZSwgcXRfdmVyc2lvbj0nNS4wJykKKworICAgICAgICBz ZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC1saW51eCcsICdxdC1tYWMnLCAncXQtNS4wJywg J3F0J10sIG9zX25hbWU9J21hYycsIG92ZXJyaWRlX3BsYXRmb3JtPSdxdC1saW51eCcsIHF0X3Zl cnNpb249JzUuMCcpCisgICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LWxpbnV4 JywgJ3F0LW1hYycsICdxdC01LjAtd2syJywgJ3F0LTUuMCcsICdxdCddLCBvc19uYW1lPSdtYWMn LCBvdmVycmlkZV9wbGF0Zm9ybT0ncXQtbGludXgnLCB1c2Vfd2Via2l0Mj1UcnVlLCBxdF92ZXJz aW9uPSc1LjAnKQorCisgICAgZGVmIHRlc3Rfc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRocyhzZWxm KToKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NraXBwZWRfZmlsZV9zZWFyY2hfcGF0aChbJ3F0LTQu OCcsICdxdC1saW51eCcsICdxdCddLCBvc19uYW1lPSdsaW51eCcsIHF0X3ZlcnNpb249JzQuOCcp CisgICAgICAgIHNlbGYuX2Fzc2VydF9za2lwcGVkX2ZpbGVfc2VhcmNoX3BhdGgoWydxdC00Ljgn LCAncXQtd2luJywgJ3F0J10sIG9zX25hbWU9J3dpbicsIHF0X3ZlcnNpb249JzQuOCcpCisgICAg ICAgIHNlbGYuX2Fzc2VydF9za2lwcGVkX2ZpbGVfc2VhcmNoX3BhdGgoWydxdC00LjgnLCAncXQt bWFjJywgJ3F0J10sIG9zX25hbWU9J21hYycsIHF0X3ZlcnNpb249JzQuOCcpCisgICAgICAgIHNl bGYuX2Fzc2VydF9za2lwcGVkX2ZpbGVfc2VhcmNoX3BhdGgoWydxdC00LjgnLCAncXQtbWFjJywg J3F0J10sIG9zX25hbWU9J21hYycsIG92ZXJyaWRlX3BsYXRmb3JtPSJxdCIsIHF0X3ZlcnNpb249 JzQuOCcpCisgICAgICAgIHNlbGYuX2Fzc2VydF9za2lwcGVkX2ZpbGVfc2VhcmNoX3BhdGgoWydx dC00LjgnLCAncXQtd2luJywgJ3F0J10sIG9zX25hbWU9J3dpbicsIG92ZXJyaWRlX3BsYXRmb3Jt PSJxdCIsIHF0X3ZlcnNpb249JzQuOCcpCisgICAgICAgIHNlbGYuX2Fzc2VydF9za2lwcGVkX2Zp bGVfc2VhcmNoX3BhdGgoWydxdC00LjgnLCAncXQtbGludXgnLCAncXQnXSwgb3NfbmFtZT0nbGlu dXgnLCBvdmVycmlkZV9wbGF0Zm9ybT0icXQiLCBxdF92ZXJzaW9uPSc0LjgnKQorICAgICAgICBz ZWxmLl9hc3NlcnRfc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRoKFsncXQtNC44JywgJ3F0LWxpbnV4 JywgJ3F0J10sIG9zX25hbWU9J2xpbnV4Jywgb3ZlcnJpZGVfcGxhdGZvcm09InF0LTQuOCIsIHF0 X3ZlcnNpb249JzQuOCcpCisKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NraXBwZWRfZmlsZV9zZWFy Y2hfcGF0aChbJ3F0LTUuMC13azEnLCAncXQtNS4wJywgJ3F0LWxpbnV4JywgJ3F0J10sIG9zX25h bWU9J2xpbnV4JywgcXRfdmVyc2lvbj0nNS4wJykKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NraXBw ZWRfZmlsZV9zZWFyY2hfcGF0aChbJ3F0LTUuMC13azEnLCAncXQtNS4wJywgJ3F0LW1hYycsICdx dCddLCBvc19uYW1lPSdtYWMnLCBxdF92ZXJzaW9uPSc1LjAnKQorICAgICAgICBzZWxmLl9hc3Nl cnRfc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRoKFsncXQtNS4wLXdrMScsICdxdC01LjAnLCAncXQt d2luJywgJ3F0J10sIG9zX25hbWU9J3dpbicsIHF0X3ZlcnNpb249JzUuMCcpCisgICAgICAgIHNl bGYuX2Fzc2VydF9za2lwcGVkX2ZpbGVfc2VhcmNoX3BhdGgoWydxdC01LjAtd2sxJywgJ3F0LTUu MCcsICdxdC1saW51eCcsICdxdCddLCBvc19uYW1lPSdsaW51eCcsIG92ZXJyaWRlX3BsYXRmb3Jt PSJxdC01LjAiLCBxdF92ZXJzaW9uPSc1LjAnKQorICAgICAgICBzZWxmLl9hc3NlcnRfc2tpcHBl ZF9maWxlX3NlYXJjaF9wYXRoKFsncXQtNS4wLXdrMScsICdxdC01LjAnLCAncXQtbGludXgnLCAn cXQnXSwgb3NfbmFtZT0nbGludXgnLCBvdmVycmlkZV9wbGF0Zm9ybT0icXQiLCBxdF92ZXJzaW9u PSc1LjAnKQogCi0gICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LW1hYycsICdx dC00LjgnLCAncXQnXSwgJ21hYycpCi0gICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChb J3F0LXdpbicsICdxdC00LjgnLCAncXQnXSwgJ3dpbicpCi0gICAgICAgIHNlbGYuX2Fzc2VydF9z ZWFyY2hfcGF0aChbJ3F0LWxpbnV4JywgJ3F0LTQuOCcsICdxdCddLCAnbGludXgnKQorICAgICAg ICBzZWxmLl9hc3NlcnRfc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRoKFsncXQtNS4wLXdrMicsICdx dC01LjAnLCAncXQtbGludXgnLCAncXQnLCAnd2syJ10sIG9zX25hbWU9J2xpbnV4JywgdXNlX3dl YmtpdDI9VHJ1ZSwgcXRfdmVyc2lvbj0nNS4wJykKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3NraXBw ZWRfZmlsZV9zZWFyY2hfcGF0aChbJ3F0LTUuMC13azInLCAncXQtNS4wJywgJ3F0LWxpbnV4Jywg J3F0JywgJ3drMiddLCBvc19uYW1lPSdsaW51eCcsIG92ZXJyaWRlX3BsYXRmb3JtPSJxdC01LjAi LCB1c2Vfd2Via2l0Mj1UcnVlLCBxdF92ZXJzaW9uPSc1LjAnKQorICAgICAgICBzZWxmLl9hc3Nl cnRfc2tpcHBlZF9maWxlX3NlYXJjaF9wYXRoKFsncXQtNS4wLXdrMicsICdxdC01LjAnLCAncXQt bGludXgnLCAncXQnLCAnd2syJ10sIG9zX25hbWU9J2xpbnV4Jywgb3ZlcnJpZGVfcGxhdGZvcm09 IndrMiIsIHVzZV93ZWJraXQyPVRydWUsIHF0X3ZlcnNpb249JzUuMCcpCisgICAgICAgIHNlbGYu X2Fzc2VydF9za2lwcGVkX2ZpbGVfc2VhcmNoX3BhdGgoWydxdC01LjAtd2syJywgJ3F0LTUuMCcs ICdxdC1tYWMnLCAncXQnLCAnd2syJ10sIG9zX25hbWU9J21hYycsIG92ZXJyaWRlX3BsYXRmb3Jt PSJxdCIsIHVzZV93ZWJraXQyPVRydWUsIHF0X3ZlcnNpb249JzUuMCcpCiAKLSAgICAgICAgc2Vs Zi5fYXNzZXJ0X3NlYXJjaF9wYXRoKFsncXQtNS4wLXdrMicsICdxdC1tYWMnLCAncXQtNS4wJywg J3F0J10sICdtYWMnLCB1c2Vfd2Via2l0Mj1UcnVlLCBxdF92ZXJzaW9uPSc1LjAnKQotICAgICAg ICBzZWxmLl9hc3NlcnRfc2VhcmNoX3BhdGgoWydxdC01LjAtd2syJywgJ3F0LXdpbicsICdxdC01 LjAnLCAncXQnXSwgJ3dpbicsIHVzZV93ZWJraXQyPVRydWUsIHF0X3ZlcnNpb249JzUuMCcpCi0g ICAgICAgIHNlbGYuX2Fzc2VydF9zZWFyY2hfcGF0aChbJ3F0LTUuMC13azInLCAncXQtbGludXgn LCAncXQtNS4wJywgJ3F0J10sICdsaW51eCcsIHVzZV93ZWJraXQyPVRydWUsIHF0X3ZlcnNpb249 JzUuMCcpCiAKICAgICBkZWYgdGVzdF9zaG93X3Jlc3VsdHNfaHRtbF9maWxlKHNlbGYpOgogICAg ICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQo= 148088 2012-06-18 06:01:56 -0700 2012-06-28 07:32:51 -0700 Proposed patch nrwt_rebase_7.patch text/plain 1567 jbadics ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0MTlh MGExLi4xZTFjNmE1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDYtMTggIErDoW5vcyBCYWRpY3MgIDxqYmFk aWNzQGluZi51LXN6ZWdlZC5odT4KKworICAgICAgICBbUXRdIEZpeGVkIGFuIGlzc3VlIHdpdGgg LS1wbGF0Zm9ybSBhbmQgbmV3LWJhc2VsaW5lIG9wdGlvbnMgc2V0LgorICAgICAgICBOUldUIHVz ZWQgdG8gcHV0IG5ldyBleHBlY3RlZCBmaWxlcyB0byBwbGF0Zm9ybS9xdC1saW51eCBkaXJlY3Rv cnkgd2hlbiBpdCB3YXMgcnVuCisgICAgICAgIHdpdGggLS1wbGF0Zm9ybSBxdCAtLW5ldy1iYXNl bGluZSAod2hpbGUgaXQgc2hvdWxkIGhhdmUgcHV0IHRoZW0gaW50byB0aGUgcGxhdGZvcm0vcXQg ZGlyKS4KKyAgICAgICAgTm93IHBsYXRmb3JtL3F0IGRpciBpcyB1c2VkIGluIHRoaXMgY2FzZSBp bnN0ZWFkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzI0ODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHk6CisgICAgICAgIChRdFBv cnQuYmFzZWxpbmVfc2VhcmNoX3BhdGgpOgorCiAyMDEyLTA2LTE3ICBTaW1vbiBGcmFzZXIgIDxz aW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIGdhcmRlbi1vLW1hdGljICdSZXN1bHRz JyBwYW5lbCBpcyBicm9rZW4gZm9yIHRoZSBBcHBsZSBwbGF0Zm9ybQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9xdC5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcXQucHkKaW5kZXggNTIwNTc1OS4uYzk5Yjc2 ZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9x dC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3F0LnB5 CkBAIC0xMjIsNyArMTIyLDEwIEBAIGNsYXNzIFF0UG9ydChXZWJLaXRQb3J0KToKICAgICAgICAg ICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoJ3F0LTQuOCcpCiAgICAgICAgIGVsaWYgdmVyc2lvbjoK ICAgICAgICAgICAgIHNlYXJjaF9wYXRocy5hcHBlbmQoJ3F0LTUuMCcpCi0gICAgICAgIHNlYXJj aF9wYXRocy5hcHBlbmQoc2VsZi5wb3J0X25hbWUpCisgICAgICAgIGlmIGhhc2F0dHIoc2VsZi5f b3B0aW9ucywgIm5ld19iYXNlbGluZSIpOgorICAgICAgICAgICAgc2VhcmNoX3BhdGhzLmluc2Vy dCgwLHNlbGYuX29wdGlvbnMucGxhdGZvcm0pCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBz ZWFyY2hfcGF0aHMuYXBwZW5kKHNlbGYucG9ydF9uYW1lKQogICAgICAgICByZXR1cm4gbWFwKHNl bGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoLCBzZWFyY2hfcGF0aHMpCiAKICAgICBkZWYgX3NraXBw ZWRfZmlsZV9zZWFyY2hfcGF0aHMoc2VsZik6Cg==