165953 2016-12-16 08:16:14 -0800 svn-apply failed to apply a patch (deleting file with svn property) 2017-01-11 16:19:57 -0800 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=166914 P2 Normal --- 1 jbedard jbedard ap commit-queue dbates ddkilzer lforschler webkit oldest_to_newest 1260583 0 jbedard 2016-12-16 08:16:14 -0800 In https://bugs.webkit.org/show_bug.cgi?id=165927, EWS says the patch in question cannot be applied to trunk even though the patch came from trunk on my local machine. This may have something to do with attempting to delete an entire directory. 1261879 1 dbates 2016-12-20 20:19:50 -0800 The patch referenced in comment 0 is attachment #297250. Here is the EWS failure output: [[ Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=ews104', 'apply-attachment', '--no-update', '--non-interactive', 297250, '--port=mac-wk2']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as buildbot@hotmail.com... Fetching: https://bugs.webkit.org/attachment.cgi?id=297250&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=165927&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Processing patch 297250 from bug 165927. Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 21 cwd: /Volumes/Data/EWS/WebKit The final property value type found "+" does not correspond to the property change type found "Deleted". at /Volumes/Data/EWS/WebKit/Tools/Scripts/VCSUtils.pm line 1526. Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 21 cwd: /Volumes/Data/EWS/WebKit ]] <https://webkit-queues.webkit.org/results/2732316> For completeness, the EWS run for attachment #297250 is at <https://webkit-queues.webkit.org/patch/297250> 1264171 2 jbedard 2017-01-05 11:38:20 -0800 This seems to be related to deleting a file whose changes are being ignored. In the case of the referenced patch, that would be the Xcode project. 1264256 3 298143 jbedard 2017-01-05 15:15:21 -0800 Created attachment 298143 Patch 1264323 4 298143 dbates 2017-01-05 18:36:18 -0800 Comment on attachment 298143 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=298143&action=review Pleas add a unit test for this change. The unit tests are in Tools/Scripts/webkitperl/VCSUtils_unittest. You can run the tests by running the script test-webkitperl > Tools/Scripts/VCSUtils.pm:1238 > + if ($line =~ $svnPropertiesStartRegEx && !($svnText =~ m/\+\+\+(.*)(nonexistent)/)) { This seems weird. Can you elaborate on tyke need to look at the compulsive text, $svnText. 1264324 5 dbates 2017-01-05 18:37:50 -0800 (In reply to comment #4) > Comment on attachment 298143 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=298143&action=review > > Pleas add a unit test for this change. The unit tests are in > Tools/Scripts/webkitperl/VCSUtils_unittest. You can run the tests by running > the script test-webkitperl > > > Tools/Scripts/VCSUtils.pm:1238 > > + if ($line =~ $svnPropertiesStartRegEx && !($svnText =~ m/\+\+\+(.*)(nonexistent)/)) { > > This seems weird. Can you elaborate on tyke need to look at the compulsive > text, $svnText. Autocomplete fail :( The last sentence should read: Can you please elaborate on the need to look at the cumulative text, $svnText? 1264420 6 298143 jbedard 2017-01-06 08:28:06 -0800 Comment on attachment 298143 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=298143&action=review >>> Tools/Scripts/VCSUtils.pm:1238 >>> + if ($line =~ $svnPropertiesStartRegEx && !($svnText =~ m/\+\+\+(.*)(nonexistent)/)) { >> >> This seems weird. Can you elaborate on tyke need to look at the compulsive text, $svnText. > > Autocomplete fail :( The last sentence should read: > > Can you please elaborate on the need to look at the cumulative text, $svnText? This error only happens in the rare case where a file is being deleted which also has properties. What is going on here is checking to see if the file with changed properties has been deleted, $svnText has this information. If a file has changed it's properties but also been deleted, we should ignore the changed properties. 1264457 7 jbedard 2017-01-06 10:42:13 -0800 I've attached a reduced example of this bug. It's not just deleting of a file whose changes are being ignored, it's doing so and then adding something to a file later. 1264458 8 298214 jbedard 2017-01-06 10:43:21 -0800 Created attachment 298214 Reduced test case This is also definitely in the parser, as if you attempt to run this patch as a unit test, it will throw the same error. 1265022 9 298365 jbedard 2017-01-09 09:26:58 -0800 Created attachment 298365 Patch 1265024 10 jbedard 2017-01-09 09:29:23 -0800 A bit of an update about the root cause of this bug: later versions of svn do not include new-lines between diffs. The code which parses properties does not take this into account. It is possible that this change in behavior may cause other issues in svn-apply, although I have not seen examples of this. 1265138 11 298365 dbates 2017-01-09 14:20:23 -0800 Comment on attachment 298365 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=298365&action=review > Tools/Scripts/VCSUtils.pm:1571 > + if (/$svnDiffStartRegEx/) { > + return ($propertyValue, $_); > + } I do not see the need to extract this early return condition from the other early return disjuncts on line 1568. We should add the condition "/$svnDiffStartRegEx/" (without quotes) to the list of disjuncts. > Tools/Scripts/webkitperl/VCSUtils_unittest/parseDiff.pl:1011 > +{ > + # New test > + diffName => "Back-to-back svn diffs with no newline", > + inputText => <<'END', > +Index: Tools/LayoutTestRelay/LayoutTestRelay.xcodeproj > +=================================================================== > +--- Tools/LayoutTestRelay/LayoutTestRelay.xcodeproj (revision 210365) > ++++ Tools/LayoutTestRelay/LayoutTestRelay.xcodeproj (nonexistent) > + > +Property changes on: Tools/LayoutTestRelay/LayoutTestRelay.xcodeproj > +___________________________________________________________________ > +Deleted: svn:ignore > +## -1,2 +0,0 ## > +-project.xcworkspace > +-xcuserdata > +Index: Tools/Scripts/webkitpy/port/base.py > +=================================================================== > +--- Tools/Scripts/webkitpy/port/base.py (revision 210365) > ++++ Tools/Scripts/webkitpy/port/base.py (working copy) > +@@ -131,6 +131,7 @@ > + self._web_platform_test_server = None > + self._image_differ = None > + self._server_process_constructor = server_process.ServerProcess # overridable for testing > ++ self._test_runner_process_constructor = server_process.ServerProcess > + > + if not hasattr(options, 'configuration') or not options.configuration: > + self.set_option_default('configuration', self.default_configuration()) > +END > + expectedReturn => [ > +[{ > + svnConvertedText => <<'END', # Same as input text > +Index: Tools/LayoutTestRelay/LayoutTestRelay.xcodeproj > +=================================================================== > +--- Tools/LayoutTestRelay/LayoutTestRelay.xcodeproj > ++++ Tools/LayoutTestRelay/LayoutTestRelay.xcodeproj > + > +END > + indexPath => "Tools/LayoutTestRelay/LayoutTestRelay.xcodeproj", > + isSvn => 1, > + numTextChunks => 0, > +}], > +"Index: Tools/Scripts/webkitpy/port/base.py\n"], > + expectedNextLine => "===================================================================\n", > +}, This test case is excessive given that the change to parseSvnPropertyValue() affects only the parsing of lines 979 thru 983. We should come up with a smaller test case (unit to test). I suggest that we add a unit test to file file Tools/Scripts/webkitperl/VCSUtils_unittest/parseSvnProperty.pl similar to the test "add svn:executable, followed by empty line and start of next diff, <https://trac.webkit.org/browser/trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseSvnProperty.pl?rev=210520#L243>. I suggest Maybe call the test "remove svn:ignore using SVN 1.7 syntax, followed by start of next diff" and I would put this test under its own section "Property value using SVN 1.7 syntax followed by start of next diff" so as to demarcate it from the tests "Using SVN 1.7 syntax" and tests "Property value followed by empty line and start of next diff" test using the same embellished comment as seen in [1]. Although not necessary for this bug, it would be good to add tests for property modification and property removal diffs using the SVN 1.7 syntax that are followed by the start of a new diff. [1] <https://trac.webkit.org/browser/trunk/Tools/Scripts/webkitperl/VCSUtils_unittest/parseSvnProperty.pl?rev=210520#L178> 1265142 12 dbates 2017-01-09 14:28:39 -0800 The patch looks reasonable. I would like to see one more iteration. 1265158 13 298396 jbedard 2017-01-09 15:08:21 -0800 Created attachment 298396 Patch 1265163 14 jbedard 2017-01-09 15:11:40 -0800 The unit tests have addition and removal. Not sure what a property change looks like in 1.7, so I didn't add that. 1265225 15 298396 dbates 2017-01-09 17:16:46 -0800 Comment on attachment 298396 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=298396&action=review > Tools/Scripts/webkitperl/VCSUtils_unittest/parseSvnProperty.pl:239 > +{ As mentioned in my remark in comment 11, I suggest that we demarcate these tests by adding an embellished comment of the form: ### # Property value using SVN 1.7 syntax followed by start of next diff ## > Tools/Scripts/webkitperl/VCSUtils_unittest/parseSvnProperty.pl:263 > + -* Is the indent intentional? 1265370 16 298467 jbedard 2017-01-10 08:44:17 -0800 Created attachment 298467 Patch 1265403 17 298467 commit-queue 2017-01-10 10:06:09 -0800 Comment on attachment 298467 Patch Clearing flags on attachment: 298467 Committed r210551: <http://trac.webkit.org/changeset/210551> 1265404 18 commit-queue 2017-01-10 10:06:13 -0800 All reviewed patches have been landed. Closing bug. 298143 2017-01-05 15:15:21 -0800 2017-01-09 09:26:55 -0800 Patch bug-165953-20170105151351.patch text/plain 1288 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMDM3NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDE3LTAxLTA1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBzdm4tYXBwbHkgZmFpbGVkIHRvIGFwcGx5IGEgcGF0Y2ggKGRlbGV0aW5n IGZpbGUgd2l0aCBzdm4gcHJvcGVydHkpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNjU5NTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvVkNTVXRpbHMucG06CisgICAgICAgIChwYXJzZURp ZmYpOiBJZ25vcmUgc3ZuIHByb3BlcnR5IHdoZW4gZGVsZXRpbmcgZmlsZS4KKwogMjAxNy0wMS0w NSAgS2VpdGggUm9sbGluICA8a3JvbGxpbkBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIFdlYkNv cmU6OlVSTDo6cHJvdG9jb2xIb3N0QW5kUG9ydApJbmRleDogVG9vbHMvU2NyaXB0cy9WQ1NVdGls cy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCShyZXZpc2lvbiAy MTAzNjUpCisrKyBUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCSh3b3JraW5nIGNvcHkpCkBAIC0x MjM1LDcgKzEyMzUsNyBAQCBzdWIgcGFyc2VEaWZmKCQkOyQpCiAgICAgICAgICAgICAkaGVhZGVy U3RhcnRSZWdFeCA9ICR1bmlmaWVkRGlmZlN0YXJ0UmVnRXg7CiAgICAgICAgIH0KIAotICAgICAg ICBpZiAoJGxpbmUgPX4gJHN2blByb3BlcnRpZXNTdGFydFJlZ0V4KSB7CisgICAgICAgIGlmICgk bGluZSA9fiAkc3ZuUHJvcGVydGllc1N0YXJ0UmVnRXggJiYgISgkc3ZuVGV4dCA9fiBtL1wrXCtc KyguKikobm9uZXhpc3RlbnQpLykpIHsKICAgICAgICAgICAgIG15ICRwcm9wZXJ0eVBhdGggPSAk MTsKICAgICAgICAgICAgIGlmICgkc3ZuUHJvcGVydGllc0hhc2hSZWYgfHwgJGhlYWRlckhhc2hS ZWYgJiYgKCRwcm9wZXJ0eVBhdGggbmUgJGhlYWRlckhhc2hSZWYtPntpbmRleFBhdGh9KSkgewog ICAgICAgICAgICAgICAgICMgVGhpcyBpcyB0aGUgc3RhcnQgb2YgdGhlIHNlY29uZCBkaWZmIGlu IHRoZSB3aGlsZSBsb29wLCB3aGljaCBoYXBwZW5zIHRvCg== 298214 2017-01-06 10:43:21 -0800 2017-01-06 10:43:21 -0800 Reduced test case reducedTestCase.diff application/octet-stream 1136 jbedard SW5kZXg6IFRvb2xzL0xheW91dFRlc3RSZWxheS9MYXlvdXRUZXN0UmVsYXkueGNvZGVwcm9qCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL0xheW91dFRlc3RSZWxheS9MYXlvdXRUZXN0UmVsYXkueGNvZGVw cm9qCShyZXZpc2lvbiAyMTAzNjUpCisrKyBUb29scy9MYXlvdXRUZXN0UmVsYXkvTGF5b3V0VGVz dFJlbGF5Lnhjb2RlcHJvagkobm9uZXhpc3RlbnQpCgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBUb29s cy9MYXlvdXRUZXN0UmVsYXkvTGF5b3V0VGVzdFJlbGF5Lnhjb2RlcHJvagpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkRl bGV0ZWQ6IHN2bjppZ25vcmUKIyMgLTEsMiArMCwwICMjCi1wcm9qZWN0Lnhjd29ya3NwYWNlCi14 Y3VzZXJkYXRhCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQkocmV2aXNpb24g MjEwMzY1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkJKHdvcmtpbmcg Y29weSkKQEAgLTEzMSw2ICsxMzEsNyBAQAogICAgICAgICBzZWxmLl93ZWJfcGxhdGZvcm1fdGVz dF9zZXJ2ZXIgPSBOb25lCiAgICAgICAgIHNlbGYuX2ltYWdlX2RpZmZlciA9IE5vbmUKICAgICAg ICAgc2VsZi5fc2VydmVyX3Byb2Nlc3NfY29uc3RydWN0b3IgPSBzZXJ2ZXJfcHJvY2Vzcy5TZXJ2 ZXJQcm9jZXNzICAjIG92ZXJyaWRhYmxlIGZvciB0ZXN0aW5nCisgICAgICAgIHNlbGYuX3Rlc3Rf cnVubmVyX3Byb2Nlc3NfY29uc3RydWN0b3IgPSBzZXJ2ZXJfcHJvY2Vzcy5TZXJ2ZXJQcm9jZXNz CiAKICAgICAgICAgaWYgbm90IGhhc2F0dHIob3B0aW9ucywgJ2NvbmZpZ3VyYXRpb24nKSBvciBu b3Qgb3B0aW9ucy5jb25maWd1cmF0aW9uOgogICAgICAgICAgICAgc2VsZi5zZXRfb3B0aW9uX2Rl ZmF1bHQoJ2NvbmZpZ3VyYXRpb24nLCBzZWxmLmRlZmF1bHRfY29uZmlndXJhdGlvbigpKQo= 298365 2017-01-09 09:26:58 -0800 2017-01-09 15:08:18 -0800 Patch bug-165953-20170109092523.patch text/plain 3831 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMDQ0NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE3LTAxLTA5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBzdm4tYXBwbHkgZmFpbGVkIHRvIGFwcGx5IGEgcGF0Y2ggKGRlbGV0aW5n IGZpbGUgd2l0aCBzdm4gcHJvcGVydHkpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNjU5NTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvVkNTVXRpbHMucG06CisgICAgICAgIChwYXJzZVN2 blByb3BlcnR5VmFsdWUpOiBUaGUgYmVnaW5uaW5nIG9mIGEgZGlmZiB3aWxsIGNhdXNlIGFuIGVh cmx5IGV4aXQgaW4gdGhlIGNhc2Ugb2Ygbm8gZW1wdHkgbmV3bGluZXMuCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNlRGlmZi5wbDogQWRkIHRlc3Qg d2l0aG91dCBicmVhayBiZXR3ZWVuIGRpZmZzLgorCiAyMDE3LTAxLTA2ICBUaW0gSG9ydG9uICA8 dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFdhcm5pbmcgYWJvdXQgdW5jb25u ZWN0YWJsZSBvdXRsZXRzIHdoZW4gb3BlbmluZyBhIE1pbmlCcm93c2VyIHdpbmRvdwpJbmRleDog VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL1ZD U1V0aWxzLnBtCShyZXZpc2lvbiAyMTA0NDQpCisrKyBUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBt CSh3b3JraW5nIGNvcHkpCkBAIC0xNTY1LDYgKzE1NjUsMTEgQEAgc3ViIHBhcnNlU3ZuUHJvcGVy dHlWYWx1ZSgkJCkKICAgICB9CiAKICAgICB3aGlsZSAoPCRmaWxlSGFuZGxlPikgeworICAgICAg ICAKKyAgICAgICAgaWYgKC8kc3ZuRGlmZlN0YXJ0UmVnRXgvKSB7CisgICAgICAgICAgICByZXR1 cm4gKCRwcm9wZXJ0eVZhbHVlLCAkXyk7CisgICAgICAgIH0KKyAgICAgICAgCiAgICAgICAgIGlm ICgvXltcclxuXSskLyB8fCAvJHN2blByb3BlcnR5VmFsdWVTdGFydFJlZ0V4LyB8fCAvJHN2blBy b3BlcnR5U3RhcnRSZWdFeC8gfHwgLyRzdm5Qcm9wZXJ0eVZhbHVlTm9OZXdsaW5lUmVnRXgvKSB7 CiAgICAgICAgICAgICAjIE5vdGUsIHdlIG1heSBlbmNvdW50ZXIgYW4gZW1wdHkgbGluZSBiZWZv cmUgdGhlIGNvbnRlbnRzIG9mIGEgYmluYXJ5IHBhdGNoLgogICAgICAgICAgICAgIyBBbHNvLCB3 ZSBjaGVjayBmb3IgJHN2blByb3BlcnR5VmFsdWVTdGFydFJlZ0V4IGJlY2F1c2UgYSAnLScgcHJv cGVydHkgbWF5IGJlCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5p dHRlc3QvcGFyc2VEaWZmLnBsCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cGVy bC9WQ1NVdGlsc191bml0dGVzdC9wYXJzZURpZmYucGwJKHJldmlzaW9uIDIxMDQ0NCkKKysrIFRv b2xzL1NjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9wYXJzZURpZmYucGwJKHdv cmtpbmcgY29weSkKQEAgLTk2NSw2ICs5NjUsNTAgQEAgRU5ECiAiSW5kZXg6IE1ha2VmaWxlLnNo YXJlZFxyXG4iXSwKICAgICBleHBlY3RlZE5leHRMaW5lID0+ICI9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09XHJcbiIsCiB9 LAoreworICAgICMgTmV3IHRlc3QKKyAgICBkaWZmTmFtZSA9PiAiQmFjay10by1iYWNrIHN2biBk aWZmcyB3aXRoIG5vIG5ld2xpbmUiLAorICAgIGlucHV0VGV4dCA9PiA8PCdFTkQnLAorSW5kZXg6 IFRvb2xzL0xheW91dFRlc3RSZWxheS9MYXlvdXRUZXN0UmVsYXkueGNvZGVwcm9qCis9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09CistLS0gVG9vbHMvTGF5b3V0VGVzdFJlbGF5L0xheW91dFRlc3RSZWxheS54Y29kZXByb2og KHJldmlzaW9uIDIxMDM2NSkKKysrKyBUb29scy9MYXlvdXRUZXN0UmVsYXkvTGF5b3V0VGVzdFJl bGF5Lnhjb2RlcHJvaiAobm9uZXhpc3RlbnQpCisKK1Byb3BlcnR5IGNoYW5nZXMgb246IFRvb2xz L0xheW91dFRlc3RSZWxheS9MYXlvdXRUZXN0UmVsYXkueGNvZGVwcm9qCitfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCitE ZWxldGVkOiBzdm46aWdub3JlCisjIyAtMSwyICswLDAgIyMKKy1wcm9qZWN0Lnhjd29ya3NwYWNl CisteGN1c2VyZGF0YQorSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5 Cis9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09CistLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkgKHJl dmlzaW9uIDIxMDM2NSkKKysrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weSAo d29ya2luZyBjb3B5KQorQEAgLTEzMSw2ICsxMzEsNyBAQAorICAgICAgICAgc2VsZi5fd2ViX3Bs YXRmb3JtX3Rlc3Rfc2VydmVyID0gTm9uZQorICAgICAgICAgc2VsZi5faW1hZ2VfZGlmZmVyID0g Tm9uZQorICAgICAgICAgc2VsZi5fc2VydmVyX3Byb2Nlc3NfY29uc3RydWN0b3IgPSBzZXJ2ZXJf cHJvY2Vzcy5TZXJ2ZXJQcm9jZXNzICAjIG92ZXJyaWRhYmxlIGZvciB0ZXN0aW5nCisrICAgICAg ICBzZWxmLl90ZXN0X3J1bm5lcl9wcm9jZXNzX2NvbnN0cnVjdG9yID0gc2VydmVyX3Byb2Nlc3Mu U2VydmVyUHJvY2VzcworIAorICAgICAgICAgaWYgbm90IGhhc2F0dHIob3B0aW9ucywgJ2NvbmZp Z3VyYXRpb24nKSBvciBub3Qgb3B0aW9ucy5jb25maWd1cmF0aW9uOgorICAgICAgICAgICAgIHNl bGYuc2V0X29wdGlvbl9kZWZhdWx0KCdjb25maWd1cmF0aW9uJywgc2VsZi5kZWZhdWx0X2NvbmZp Z3VyYXRpb24oKSkKK0VORAorICAgIGV4cGVjdGVkUmV0dXJuID0+IFsKK1t7CisgICAgc3ZuQ29u dmVydGVkVGV4dCA9PiAgPDwnRU5EJywgIyBTYW1lIGFzIGlucHV0IHRleHQKK0luZGV4OiBUb29s cy9MYXlvdXRUZXN0UmVsYXkvTGF5b3V0VGVzdFJlbGF5Lnhjb2RlcHJvagorPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQor LS0tIFRvb2xzL0xheW91dFRlc3RSZWxheS9MYXlvdXRUZXN0UmVsYXkueGNvZGVwcm9qCisrKysg VG9vbHMvTGF5b3V0VGVzdFJlbGF5L0xheW91dFRlc3RSZWxheS54Y29kZXByb2oKKworRU5ECisg ICAgaW5kZXhQYXRoID0+ICJUb29scy9MYXlvdXRUZXN0UmVsYXkvTGF5b3V0VGVzdFJlbGF5Lnhj b2RlcHJvaiIsCisgICAgaXNTdm4gPT4gMSwKKyAgICBudW1UZXh0Q2h1bmtzID0+IDAsCit9XSwK KyJJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHlcbiJdLAorICAgIGV4 cGVjdGVkTmV4dExpbmUgPT4gIj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT1cbiIsCit9LAogIyMjIwogIyAgICBHaXQgdGVz dCBjYXNlcwogIyMK 298396 2017-01-09 15:08:21 -0800 2017-01-10 08:44:12 -0800 Patch bug-165953-20170109150646.patch text/plain 2911 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMDUyNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE3LTAxLTA5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBzdm4tYXBwbHkgZmFpbGVkIHRvIGFwcGx5IGEgcGF0Y2ggKGRlbGV0aW5n IGZpbGUgd2l0aCBzdm4gcHJvcGVydHkpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNjU5NTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvVkNTVXRpbHMucG06CisgICAgICAgIChwYXJzZVN2 blByb3BlcnR5VmFsdWUpOiBUaGUgYmVnaW5uaW5nIG9mIGEgZGlmZiB3aWxsIGNhdXNlIGFuIGVh cmx5IGV4aXQgaW4gdGhlIGNhc2Ugb2Ygbm8gZW1wdHkgbmV3bGluZXMuCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNlU3ZuUHJvcGVydHkucGw6IEFk ZCB0ZXN0cyB3aXRob3V0IGJyZWFrIGJldHdlZW4gZGlmZnMgZm9yIHByb3BlcnRpZXMuCisKIDIw MTctMDEtMDkgIENhcmxvcyBBbGJlcnRvIExvcGV6IFBlcmV6ICA8Y2xvcGV6QGlnYWxpYS5jb20+ CiAKICAgICAgICAgW0dUS11bV2F5bGFuZF0gQWxsb3cgcnVubmluZyB0aGUgbGF5b3V0IHRlc3Rz IHVuZGVyIGEgbmF0aXZlIFdheWxhbmQgZW52aXJvbm1lbnQuCkluZGV4OiBUb29scy9TY3JpcHRz L1ZDU1V0aWxzLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0JKHJl dmlzaW9uIDIxMDUyMikKKysrIFRvb2xzL1NjcmlwdHMvVkNTVXRpbHMucG0JKHdvcmtpbmcgY29w eSkKQEAgLTE1NjUsNyArMTU2NSw3IEBAIHN1YiBwYXJzZVN2blByb3BlcnR5VmFsdWUoJCQpCiAg ICAgfQogCiAgICAgd2hpbGUgKDwkZmlsZUhhbmRsZT4pIHsKLSAgICAgICAgaWYgKC9eW1xyXG5d KyQvIHx8IC8kc3ZuUHJvcGVydHlWYWx1ZVN0YXJ0UmVnRXgvIHx8IC8kc3ZuUHJvcGVydHlTdGFy dFJlZ0V4LyB8fCAvJHN2blByb3BlcnR5VmFsdWVOb05ld2xpbmVSZWdFeC8pIHsKKyAgICAgICAg aWYgKC9eW1xyXG5dKyQvIHx8IC8kc3ZuUHJvcGVydHlWYWx1ZVN0YXJ0UmVnRXgvIHx8IC8kc3Zu UHJvcGVydHlTdGFydFJlZ0V4LyB8fCAvJHN2blByb3BlcnR5VmFsdWVOb05ld2xpbmVSZWdFeC8g fHwgLyRzdm5EaWZmU3RhcnRSZWdFeC8pIHsKICAgICAgICAgICAgICMgTm90ZSwgd2UgbWF5IGVu Y291bnRlciBhbiBlbXB0eSBsaW5lIGJlZm9yZSB0aGUgY29udGVudHMgb2YgYSBiaW5hcnkgcGF0 Y2guCiAgICAgICAgICAgICAjIEFsc28sIHdlIGNoZWNrIGZvciAkc3ZuUHJvcGVydHlWYWx1ZVN0 YXJ0UmVnRXggYmVjYXVzZSBhICctJyBwcm9wZXJ0eSBtYXkgYmUKICAgICAgICAgICAgICMgZm9s bG93ZWQgYnkgYSAnKycgcHJvcGVydHkgaW4gdGhlIGNhc2Ugb2YgYSAiTW9kaWZpZWQiIG9yICJO YW1lIiBwcm9wZXJ0eS4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGlsc191 bml0dGVzdC9wYXJzZVN2blByb3BlcnR5LnBsCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv d2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9wYXJzZVN2blByb3BlcnR5LnBsCShyZXZpc2lv biAyMTA1MjIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3Qv cGFyc2VTdm5Qcm9wZXJ0eS5wbAkod29ya2luZyBjb3B5KQpAQCAtMjM2LDYgKzIzNiw0MiBAQCBF TkQKICJBZGRlZDogc3ZuOmV4ZWN1dGFibGVcbiJdLAogICAgIGV4cGVjdGVkTmV4dExpbmUgPT4g IiMjIC0wLDAgKzEgIyNcbiIsCiB9LAoreworICAgICMgTmV3IHRlc3QKKyAgICBkaWZmTmFtZSA9 PiAiYWRkIHN2bjppZ25vcmUgdXNpbmcgU1ZOIDEuNyBzeW50YXgsIGZvbGxvd2VkIGJ5IHN0YXJ0 IG9mIG5leHQgZGlmZiIsCisgICAgaW5wdXRUZXh0ID0+IDw8J0VORCcsCitBZGRlZDogc3ZuOmln bm9yZQorIyMgLTAsMCArMSAjIworKyoKK0luZGV4OiBNYWtlZmlsZS5zaGFyZWQKK0VORAorICAg IGV4cGVjdGVkUmV0dXJuID0+IFsKK3sKKyAgICBuYW1lID0+ICJzdm46aWdub3JlIiwKKyAgICBw cm9wZXJ0eUNoYW5nZURlbHRhID0+IDEsCisgICAgdmFsdWUgPT4gIioiLAorfSwKKyJJbmRleDog TWFrZWZpbGUuc2hhcmVkXG4iXSwKKyAgICBleHBlY3RlZE5leHRMaW5lID0+IHVuZGVmLAorfSwK K3sKKyAgICAjIE5ldyB0ZXN0CisgICAgZGlmZk5hbWUgPT4gInJlbW92ZSBzdm46aWdub3JlIHVz aW5nIFNWTiAxLjcgc3ludGF4LCBmb2xsb3dlZCBieSBzdGFydCBvZiBuZXh0IGRpZmYiLAorICAg IGlucHV0VGV4dCA9PiA8PCdFTkQnLAorRGVsZXRlZDogc3ZuOmlnbm9yZQorIyMgLTEgKzAsMCAj IworICAgIC0qCitJbmRleDogTWFrZWZpbGUuc2hhcmVkCitFTkQKKyAgICBleHBlY3RlZFJldHVy biA9PiBbCit7CisgICAgbmFtZSA9PiAic3ZuOmlnbm9yZSIsCisgICAgcHJvcGVydHlDaGFuZ2VE ZWx0YSA9PiAtMSwKKyAgICB2YWx1ZSA9PiAiKiIsCit9LAorIkluZGV4OiBNYWtlZmlsZS5zaGFy ZWRcbiJdLAorICAgIGV4cGVjdGVkTmV4dExpbmUgPT4gdW5kZWYsCit9LAogIyMjIwogIyBQcm9w ZXJ0eSB2YWx1ZSBmb2xsb3dlZCBieSBlbXB0eSBsaW5lIGFuZCBzdGFydCBvZiBuZXh0IGRpZmYK ICMjCg== 298467 2017-01-10 08:44:17 -0800 2017-01-10 10:06:09 -0800 Patch bug-165953-20170110084240.patch text/plain 2999 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMDU0NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE3LTAxLTEwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBzdm4tYXBwbHkgZmFpbGVkIHRvIGFwcGx5IGEgcGF0Y2ggKGRlbGV0aW5n IGZpbGUgd2l0aCBzdm4gcHJvcGVydHkpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNjU5NTMKKworICAgICAgICBSZXZpZXdlZCBieSBEYW5pZWwgQmF0 ZXMuCisKKyAgICAgICAgKiBTY3JpcHRzL1ZDU1V0aWxzLnBtOgorICAgICAgICAocGFyc2VTdm5Q cm9wZXJ0eVZhbHVlKTogVGhlIGJlZ2lubmluZyBvZiBhIGRpZmYgd2lsbCBjYXVzZSBhbiBlYXJs eSBleGl0IGluIHRoZSBjYXNlIG9mIG5vIGVtcHR5IG5ld2xpbmVzLgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cGVybC9WQ1NVdGlsc191bml0dGVzdC9wYXJzZVN2blByb3BlcnR5LnBsOiBBZGQg dGVzdHMgd2l0aG91dCBicmVhayBiZXR3ZWVuIGRpZmZzIGZvciBwcm9wZXJ0aWVzLgorCiAyMDE3 LTAxLTEwICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2FsaWEuY29tPgog CiAgICAgICAgIFtHVEtdIEFkZCBhIG5ldyByZWxlYXNlIHRlc3QgYm90IGZvciBXYXlsYW5kIGFu ZCBwYXNzIC0tZGlzcGxheS1zZXJ2ZXI9eG9yZyB0byB0aGUgR1RLIFBlcmYgYm90LgpJbmRleDog VG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL1ZD U1V0aWxzLnBtCShyZXZpc2lvbiAyMTA1NDYpCisrKyBUb29scy9TY3JpcHRzL1ZDU1V0aWxzLnBt CSh3b3JraW5nIGNvcHkpCkBAIC0xNTY1LDcgKzE1NjUsNyBAQCBzdWIgcGFyc2VTdm5Qcm9wZXJ0 eVZhbHVlKCQkKQogICAgIH0KIAogICAgIHdoaWxlICg8JGZpbGVIYW5kbGU+KSB7Ci0gICAgICAg IGlmICgvXltcclxuXSskLyB8fCAvJHN2blByb3BlcnR5VmFsdWVTdGFydFJlZ0V4LyB8fCAvJHN2 blByb3BlcnR5U3RhcnRSZWdFeC8gfHwgLyRzdm5Qcm9wZXJ0eVZhbHVlTm9OZXdsaW5lUmVnRXgv KSB7CisgICAgICAgIGlmICgvXltcclxuXSskLyB8fCAvJHN2blByb3BlcnR5VmFsdWVTdGFydFJl Z0V4LyB8fCAvJHN2blByb3BlcnR5U3RhcnRSZWdFeC8gfHwgLyRzdm5Qcm9wZXJ0eVZhbHVlTm9O ZXdsaW5lUmVnRXgvIHx8IC8kc3ZuRGlmZlN0YXJ0UmVnRXgvKSB7CiAgICAgICAgICAgICAjIE5v dGUsIHdlIG1heSBlbmNvdW50ZXIgYW4gZW1wdHkgbGluZSBiZWZvcmUgdGhlIGNvbnRlbnRzIG9m IGEgYmluYXJ5IHBhdGNoLgogICAgICAgICAgICAgIyBBbHNvLCB3ZSBjaGVjayBmb3IgJHN2blBy b3BlcnR5VmFsdWVTdGFydFJlZ0V4IGJlY2F1c2UgYSAnLScgcHJvcGVydHkgbWF5IGJlCiAgICAg ICAgICAgICAjIGZvbGxvd2VkIGJ5IGEgJysnIHByb3BlcnR5IGluIHRoZSBjYXNlIG9mIGEgIk1v ZGlmaWVkIiBvciAiTmFtZSIgcHJvcGVydHkuCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHBl cmwvVkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VTdm5Qcm9wZXJ0eS5wbAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VTdm5Qcm9wZXJ0 eS5wbAkocmV2aXNpb24gMjEwNTQ2KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0 aWxzX3VuaXR0ZXN0L3BhcnNlU3ZuUHJvcGVydHkucGwJKHdvcmtpbmcgY29weSkKQEAgLTIzNiw2 ICsyMzYsNDUgQEAgRU5ECiAiQWRkZWQ6IHN2bjpleGVjdXRhYmxlXG4iXSwKICAgICBleHBlY3Rl ZE5leHRMaW5lID0+ICIjIyAtMCwwICsxICMjXG4iLAogfSwKKyMjIworIyBQcm9wZXJ0eSB2YWx1 ZSB1c2luZyBTVk4gMS43IHN5bnRheCBmb2xsb3dlZCBieSBzdGFydCBvZiBuZXh0IGRpZmYKKyMj Cit7CisgICAgIyBOZXcgdGVzdAorICAgIGRpZmZOYW1lID0+ICJhZGQgc3ZuOmlnbm9yZSB1c2lu ZyBTVk4gMS43IHN5bnRheCwgZm9sbG93ZWQgYnkgc3RhcnQgb2YgbmV4dCBkaWZmIiwKKyAgICBp bnB1dFRleHQgPT4gPDwnRU5EJywKK0FkZGVkOiBzdm46aWdub3JlCisjIyAtMCwwICsxICMjCisr KgorSW5kZXg6IE1ha2VmaWxlLnNoYXJlZAorRU5ECisgICAgZXhwZWN0ZWRSZXR1cm4gPT4gWwor eworICAgIG5hbWUgPT4gInN2bjppZ25vcmUiLAorICAgIHByb3BlcnR5Q2hhbmdlRGVsdGEgPT4g MSwKKyAgICB2YWx1ZSA9PiAiKiIsCit9LAorIkluZGV4OiBNYWtlZmlsZS5zaGFyZWRcbiJdLAor ICAgIGV4cGVjdGVkTmV4dExpbmUgPT4gdW5kZWYsCit9LAoreworICAgICMgTmV3IHRlc3QKKyAg ICBkaWZmTmFtZSA9PiAicmVtb3ZlIHN2bjppZ25vcmUgdXNpbmcgU1ZOIDEuNyBzeW50YXgsIGZv bGxvd2VkIGJ5IHN0YXJ0IG9mIG5leHQgZGlmZiIsCisgICAgaW5wdXRUZXh0ID0+IDw8J0VORCcs CitEZWxldGVkOiBzdm46aWdub3JlCisjIyAtMSArMCwwICMjCistKgorSW5kZXg6IE1ha2VmaWxl LnNoYXJlZAorRU5ECisgICAgZXhwZWN0ZWRSZXR1cm4gPT4gWworeworICAgIG5hbWUgPT4gInN2 bjppZ25vcmUiLAorICAgIHByb3BlcnR5Q2hhbmdlRGVsdGEgPT4gLTEsCisgICAgdmFsdWUgPT4g IioiLAorfSwKKyJJbmRleDogTWFrZWZpbGUuc2hhcmVkXG4iXSwKKyAgICBleHBlY3RlZE5leHRM aW5lID0+IHVuZGVmLAorfSwKICMjIyMKICMgUHJvcGVydHkgdmFsdWUgZm9sbG93ZWQgYnkgZW1w dHkgbGluZSBhbmQgc3RhcnQgb2YgbmV4dCBkaWZmCiAjIwo=