29684 2009-09-23 08:12:29 -0700 svn-apply fails when a patch has an empty file 2018-05-27 09:52:17 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 186009 1 eric.carlson ddkilzer ap cjerdonek dbates ddkilzer ews-watchlist jbedard webkit-bug-importer oldest_to_newest 149400 0 eric.carlson 2009-09-23 08:12:29 -0700 As noted in https://bugs.webkit.org/show_bug.cgi?id=29623, svn-apply fails when a patch has an entry for a new, empty file. 248332 1 ddkilzer 2010-07-08 10:49:23 -0700 *** Bug 38801 has been marked as a duplicate of this bug. *** 401650 2 dbates 2011-05-10 16:53:50 -0700 svn-apply failed to apply <https://bugs.webkit.org/attachment.cgi?id=92978> (bug #59930). Notice this patch removes the empty file, LayoutTests/fast/dom/resources/articles.m4a. 1427718 3 ddkilzer 2018-05-26 08:24:41 -0700 The patch from Eric Carlson in Bug 29623 is an svn patch: Index: LayoutTests/media/content/empty.oga =================================================================== Index: LayoutTests/media/content/garbage.ogv =================================================================== --- LayoutTests/media/content/garbage.ogv (revision 0) +++ LayoutTests/media/content/garbage.ogv (revision 0) @@ -0,0 +1 @@ +moov This is garbage! And the patch from Daniel Bates in Bug 59930 is a git patch: diff --git a/LayoutTests/fast/dom/resources/articles.m4a b/LayoutTests/fast/dom/resources/articles.m4a deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt index f290aa5db48fed46100d6a042b543f36c6ac307e..4862e52a7d562dd43dc3be049343d679ce274fe9 100644 --- a/LayoutTests/platform/chromium/test_expectations.txt +++ b/LayoutTests/platform/chromium/test_expectations.txt @@ -1101,7 +1101,6 @@ BUGCR10350 LINUX : fast/replaced/width100percent-radio.html = FAIL // These tests are marked as failing on Linux because they depend on QuickTime. // See the bug for more discussion. -BUGCR15797 LINUX : fast/dom/object-embed-plugin-scripting.html = FAIL BUGCR15797 LINUX : plugins/embed-attributes-setting.html = FAIL CRASH // Skip because we throw an exception before we get to dumpAsText. I think later versions of svn have probably changed to call out the deleted file, so I'm going to use this to fix the git variant. If the svn variant still happens, we can file a new bug. 1427719 4 ddkilzer 2018-05-26 08:26:03 -0700 Also, it seems like the svn issue happens when adding an empty file, but the git issue happens when deleting an empty file, which are two different bugs! 1427727 5 ddkilzer 2018-05-26 09:16:28 -0700 Creating some experimental patches: $ svn --version svn, version 1.9.7 (r1800392) compiled Jan 17 2018, 17:16:44 on x86_64-apple-darwin16.1.0 $ git --version git version 2.15.1 (Apple Git-101) 1. svn add empty file $ touch LayoutTests/empty Davids-MacBook-Pro-9:WebKit.svn ddkilzer$ svn add LayoutTests/empty A LayoutTests/empty $ svn diff LayoutTests Index: LayoutTests/empty =================================================================== $ ./Tools/Scripts/svn-create-patch LayoutTests Index: LayoutTests/empty =================================================================== $ svn --force rm LayoutTests/empty D LayoutTests/empty 2. svn delete empty file $ cat Source/ThirdParty/libwebrtc/WebKit/patch-usrsctp $ svn rm Source/ThirdParty/libwebrtc/WebKit/patch-usrsctp D Source/ThirdParty/libwebrtc/WebKit/patch-usrsctp $ svn diff Source/ThirdParty/libwebrtc/WebKit $ ./Tools/Scripts/svn-create-patch Source/ThirdParty/libwebrtc/WebKit Index: Source/ThirdParty/libwebrtc/WebKit/patch-usrsctp =================================================================== $ svn revert Source/ThirdParty/libwebrtc/WebKit/patch-usrsctp Reverted 'Source/ThirdParty/libwebrtc/WebKit/patch-usrsctp' 3. git add empty file $ touch LayoutTests/empty $ git add LayoutTests/empty $ git diff --cached diff --git a/LayoutTests/empty b/LayoutTests/empty new file mode 100644 index 00000000000..e69de29bb2d $ git rm -f LayoutTests/empty rm 'LayoutTests/empty' 4. git delete empty file $ git rm -f Source/ThirdParty/libwebrtc/WebKit/patch-usrsctp rm 'Source/ThirdParty/libwebrtc/WebKit/patch-usrsctp' $ git diff --cached Source/ThirdParty/libwebrtc/WebKit diff --git a/Source/ThirdParty/libwebrtc/WebKit/patch-usrsctp b/Source/ThirdParty/libwebrtc/WebKit/patch-usrsctp deleted file mode 100644 index e69de29bb2d..00000000000 $ git checkout HEAD Source/ThirdParty/libwebrtc/WebKit/patch-usrsctp 1427728 6 341399 ddkilzer 2018-05-26 09:16:57 -0700 Created attachment 341399 svn add empty file 1427729 7 341400 ddkilzer 2018-05-26 09:17:23 -0700 Created attachment 341400 svn delete empty file 1427730 8 341401 ddkilzer 2018-05-26 09:18:00 -0700 Created attachment 341401 git add empty file 1427731 9 341402 ddkilzer 2018-05-26 09:18:34 -0700 Created attachment 341402 git delete empty file 1427732 10 ews-watchlist 2018-05-26 09:20:25 -0700 Attachment 341401 did not pass style-queue: Total errors found: 0 in 0 files If any of these errors are false positives, please file a bug against check-webkit-style. 1427733 11 ddkilzer 2018-05-26 09:23:21 -0700 Ironically, patches for adding and deleting an empty file using the svn-create-patch tool are identical, so it depends on the state of the repository (whether the file already exists or not) to decide what to do. (Note that using `svn diff` simply produces no output when deleting a empty file, though.) The patches for git give a "new file" or "deleted file" hint, so they should never be ambiguous. 1427734 12 ddkilzer 2018-05-26 09:24:19 -0700 (In reply to Build Bot from comment #10) > Attachment 341401 [details] did not pass style-queue: > > > Total errors found: 0 in 0 files > > > If any of these errors are false positives, please file a bug against > check-webkit-style. And we found a bug in the style-queue as well when you post a patch that just adds an empty file. :) 1427736 13 341403 ddkilzer 2018-05-26 09:36:07 -0700 Created attachment 341403 svn rename empty file 1427737 14 341404 ddkilzer 2018-05-26 09:36:37 -0700 Created attachment 341404 git rename empty file 1427798 15 341401 ddkilzer 2018-05-26 21:35:46 -0700 Comment on attachment 341401 git add empty file The success of applying this patch on the EWS bots is a false-positive. The patch isn't actually added to the repository; it's ignored! 1427800 16 341417 ddkilzer 2018-05-26 21:52:08 -0700 Created attachment 341417 Patch v1 1427801 17 ddkilzer 2018-05-26 21:53:22 -0700 (In reply to David Kilzer (:ddkilzer) from comment #16) > Created attachment 341417 [details] > Patch v1 The irony here is that the empty "resources/empty.txt" file will hit the "false positive" git-add-empty-file bug until this patch lands, so it will need to be landed manually. 1427803 18 341417 ddkilzer 2018-05-26 21:56:24 -0700 Comment on attachment 341417 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=341417&action=review > Tools/ChangeLog:14 > + Prior to this change, applying the following patches resulted in: > + - svn: add empty file (failure) > + - svn: delete empty file (failure) > + - svn: rename empty file (failure) > + - git: add empty file (false-positive success) > + - git: delete empty file (success) > + - git: rename empty file (failure) I should note that the "rename empty file" cases started working once the "delete empty file" cases were fixed because a "rename" is the same as a "copy" followed by a "delete", and copying an empty file worked just fine. 1427822 19 ddkilzer 2018-05-27 09:51:13 -0700 Committed r232228: <https://trac.webkit.org/changeset/232228> 1427823 20 webkit-bug-importer 2018-05-27 09:52:17 -0700 <rdar://problem/40586646> 341399 2018-05-26 09:16:57 -0700 2018-05-26 21:51:15 -0700 svn add empty file svn-add-empty-file.diff text/plain 93 ddkilzer SW5kZXg6IExheW91dFRlc3RzL2VtcHR5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K 341400 2018-05-26 09:17:23 -0700 2018-05-26 21:51:17 -0700 svn delete empty file svn-delete-empty-file.diff text/plain 124 ddkilzer SW5kZXg6IFNvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9XZWJLaXQvcGF0Y2gtdXNyc2N0cAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Cg== 341401 2018-05-26 09:18:00 -0700 2018-05-26 21:51:19 -0700 git add empty file git-add-empty-file.diff text/plain 103 ddkilzer ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VtcHR5IGIvTGF5b3V0VGVzdHMvZW1wdHkKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAuLmU2OWRlMjliYjJkCg== 341402 2018-05-26 09:18:34 -0700 2018-05-26 21:51:20 -0700 git delete empty file git-delete-empty-file.diff text/plain 169 ddkilzer ZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9XZWJLaXQvcGF0Y2gtdXNy c2N0cCBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9XZWJLaXQvcGF0Y2gtdXNyc2N0cApk ZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZTY5ZGUyOWJiMmQuLjAwMDAwMDAwMDAwCg== 341403 2018-05-26 09:36:07 -0700 2018-05-26 21:51:22 -0700 svn rename empty file svn-rename-empty-file.diff text/plain 465 ddkilzer SW5kZXg6IFNvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9XZWJLaXQvcGF0Y2gtdXNyc2N0cAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09CkluZGV4OiBTb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvV2ViS2l0L3BhdGNo LXVzcnNjdHAuZGlmZgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMv V2ViS2l0L3BhdGNoLXVzcnNjdHAuZGlmZgkocmV2aXNpb24gMjMyMjIzKQkoZnJvbSBTb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvV2ViS2l0L3BhdGNoLXVzcnNjdHA6MjMyMjIzKQorKysgU291 cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1dlYktpdC9wYXRjaC11c3JzY3RwLmRpZmYJKHdvcmtp bmcgY29weSkK 341404 2018-05-26 09:36:37 -0700 2018-05-26 21:51:23 -0700 git rename empty file git-rename-empty-file.diff text/plain 265 ddkilzer ZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9XZWJLaXQvcGF0Y2gtdXNy c2N0cCBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9XZWJLaXQvcGF0Y2gtdXNyc2N0cC5k aWZmCnNpbWlsYXJpdHkgaW5kZXggMTAwJQpyZW5hbWUgZnJvbSBTb3VyY2UvVGhpcmRQYXJ0eS9s aWJ3ZWJydGMvV2ViS2l0L3BhdGNoLXVzcnNjdHAKcmVuYW1lIHRvIFNvdXJjZS9UaGlyZFBhcnR5 L2xpYndlYnJ0Yy9XZWJLaXQvcGF0Y2gtdXNyc2N0cC5kaWZmCg== 341417 2018-05-26 21:52:08 -0700 2018-05-27 09:51:29 -0700 Patch v1 bug-29684-20180526215210.patch text/plain 6412 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxOTA5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmYyZTdkMzVjMTQ4ZGM4MDQ2NDY3ZDI5N2I1NjBlODU5 ZjYzNzM1MC4uNzRmMjUzNTMwMzE2MjlmZjI0NWM4MmVlZmIzZTgzMDA2NzMyZTQzZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2 IEBACisyMDE4LTA1LTI2ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAg ICAgICAgc3ZuLWFwcGx5IGZhaWxzIHdoZW4gYSBwYXRjaCBoYXMgYW4gZW1wdHkgZmlsZQorICAg ICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMjk2ODQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUHJpb3IgdG8gdGhpcyBjaGFuZ2UsIGFwcGx5aW5n IHRoZSBmb2xsb3dpbmcgcGF0Y2hlcyByZXN1bHRlZCBpbjoKKyAgICAgICAgLSBzdm46IGFkZCBl bXB0eSBmaWxlICAgICAoZmFpbHVyZSkKKyAgICAgICAgLSBzdm46IGRlbGV0ZSBlbXB0eSBmaWxl ICAoZmFpbHVyZSkKKyAgICAgICAgLSBzdm46IHJlbmFtZSBlbXB0eSBmaWxlICAoZmFpbHVyZSkK KyAgICAgICAgLSBnaXQ6IGFkZCBlbXB0eSBmaWxlICAgICAoZmFsc2UtcG9zaXRpdmUgc3VjY2Vz cykKKyAgICAgICAgLSBnaXQ6IGRlbGV0ZSBlbXB0eSBmaWxlICAoc3VjY2VzcykKKyAgICAgICAg LSBnaXQ6IHJlbmFtZSBlbXB0eSBmaWxlICAoZmFpbHVyZSkKKworICAgICAgICAqIFNjcmlwdHMv VkNTVXRpbHMucG06CisgICAgICAgIChwYXJzZVN2bkRpZmZIZWFkZXIpOiBIYW5kbGUgdGhlIGNh c2Ugd2hlbiB0aGVyZSBpcyBubyBwYXRjaAorICAgICAgICBmb2xsb3dpbmcgdGhlIGhlYWRlci4g IElmIHRoZSBmaWxlIGV4aXN0cyBhbmQgaXMgZW1wdHksIHRoYXQKKyAgICAgICAgbWVhbnMgaXQn cyBhIGRlbGV0aW9uLiAgSWYgdGhlIGZpbGUgZG9lcyBub3QgZXhpc3QsIHRoYXQgbWVhbnMKKyAg ICAgICAgaXQncyBhbiBhZGRpdGlvbi4gRXZlcnl0aGluZyBlbHNlIGlzIGEgZmF0YWwgZXJyb3Iu CisgICAgICAgICogU2NyaXB0cy9zdm4tYXBwbHk6CisgICAgICAgIChwYXRjaCk6CisgICAgICAg IC0gT25seSBhcHBseSBhIHBhdGNoIGZvciBkZWxldGlvbiBpZiBpdCBoYXMgb25lIG9yIG1vcmUg dGV4dAorICAgICAgICAgIGNodW5rcy4KKyAgICAgICAgLSBBZGQgYSBjYXNlIHRvIGhhbmRsZSBh ZGRpbmcgYW4gZW1wdHkgZmlsZSAoYW4gYWRkaXRpb24gd2l0aCBubworICAgICAgICAgIHRleHQg Y2h1bmtzKSwgYW5kIHZlcmlmeSB0aGUgZmlsZSBkb2Vzbid0IGV4aXN0IHlldC4KKyAgICAgICAg LSBBbnkgdW5oYW5kbGVkIHBhdGNoIGlzIGEgZmF0YWwgZXJyb3IuCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0L3BhcnNlU3ZuRGlmZkhlYWRlci5wbDoKKyAg ICAgICAgQWRkIHRlc3RzIGZvciBhZGRpbmcgYW4gZW1wdHkgZmlsZSBhbmQgZGVsZXRpbmcgYW4g ZW1wdHkgZmlsZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRl c3QvcmVzb3VyY2VzL2VtcHR5LnR4dDogQWRkLgorICAgICAgICBVc2VkIGJ5IHBhcnNlU3ZuRGlm ZkhlYWRlci5wbCB1bml0IHRlc3QgZm9yICJhZGQgYW4gZW1wdHkgZmlsZSIKKyAgICAgICAgdGVz dCBjYXNlLgorCiAyMDE4LTA1LTE3ICBWYWxlcmllIFIgWW91bmcgIDx2YWxlcmllQGJvY291cC5j b20+CiAKICAgICAgICAgdGVzdDI2Mi9SdW5uZXIucG06IGxvb2sgZm9yIGpzYyBpbiBwYXRoIGlm IGNhbm5vdCBjYWxsIHdlYmtpdC1idWlsZC1kaXJlY3RvcnkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvVkNTVXRpbHMucG0gYi9Ub29scy9TY3JpcHRzL1ZDU1V0aWxzLnBtCmluZGV4IDRjNDhj ODAxMDg3YzE2NGMwMjk4MjhkN2U3YWZiYjZhNjVlOWMwOGYuLjVmZTQ1OTRmNjAyZGNhOWZlNmQ0 OGFjNmY4YzYwODA1MzIyZTRiMjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvVkNTVXRpbHMu cG0KKysrIGIvVG9vbHMvU2NyaXB0cy9WQ1NVdGlscy5wbQpAQCAtOTM4LDYgKzkzOCw3IEBAIHN1 YiBwYXJzZVN2bkRpZmZIZWFkZXIoJCQpCiAgICAgbXkgJGNvcGllZEZyb21QYXRoOwogICAgIG15 ICRmb3VuZEhlYWRlckVuZGluZzsKICAgICBteSAkaXNCaW5hcnk7CisgICAgbXkgJGlzRGVsZXRp b247CiAgICAgbXkgJGlzTmV3OwogICAgIG15ICRzb3VyY2VSZXZpc2lvbjsKICAgICBteSAkc3Zu Q29udmVydGVkVGV4dDsKQEAgLTk5Miw3ICs5OTMsMTUgQEAgc3ViIHBhcnNlU3ZuRGlmZkhlYWRl cigkJCkKICAgICB9CiAKICAgICBpZiAoISRmb3VuZEhlYWRlckVuZGluZykgewotICAgICAgICBk aWUoIkRpZCBub3QgZmluZCBlbmQgb2YgaGVhZGVyIGJsb2NrIGNvcnJlc3BvbmRpbmcgdG8gaW5k ZXggcGF0aCBcIiRpbmRleFBhdGhcIi4iKTsKKyAgICAgICAgaWYgKC16ICRpbmRleFBhdGgpIHsK KyAgICAgICAgICAgICMgRGVsZXRlIGFuIGVtcHR5IGZpbGUuCisgICAgICAgICAgICAkaXNEZWxl dGlvbiA9IDE7CisgICAgICAgIH0gZWxzaWYgKCEgLWUgJGluZGV4UGF0aCkgeworICAgICAgICAg ICAgIyBBZGQgYW4gZW1wdHkgZmlsZS4KKyAgICAgICAgICAgICRpc05ldyA9IDE7CisgICAgICAg IH0gZWxzZSB7CisgICAgICAgICAgICBkaWUgIkRpZCBub3QgZmluZCBlbmQgb2YgaGVhZGVyIGJs b2NrIGNvcnJlc3BvbmRpbmcgdG8gaW5kZXggcGF0aCBcIiRpbmRleFBhdGhcIi4iOworICAgICAg ICB9CiAgICAgfQogCiAgICAgbXkgJWhlYWRlcjsKQEAgLTEwMDAsNiArMTAwOSw3IEBAIHN1YiBw YXJzZVN2bkRpZmZIZWFkZXIoJCQpCiAgICAgJGhlYWRlcntjb3BpZWRGcm9tUGF0aH0gPSAkY29w aWVkRnJvbVBhdGggaWYgJGNvcGllZEZyb21QYXRoOwogICAgICRoZWFkZXJ7aW5kZXhQYXRofSA9 ICRpbmRleFBhdGg7CiAgICAgJGhlYWRlcntpc0JpbmFyeX0gPSAkaXNCaW5hcnkgaWYgJGlzQmlu YXJ5OworICAgICRoZWFkZXJ7aXNEZWxldGlvbn0gPSAkaXNEZWxldGlvbiBpZiAkaXNEZWxldGlv bjsKICAgICAkaGVhZGVye2lzTmV3fSA9ICRpc05ldyBpZiAkaXNOZXc7CiAgICAgJGhlYWRlcntz b3VyY2VSZXZpc2lvbn0gPSAkc291cmNlUmV2aXNpb24gaWYgJHNvdXJjZVJldmlzaW9uOwogICAg ICRoZWFkZXJ7c3ZuQ29udmVydGVkVGV4dH0gPSAkc3ZuQ29udmVydGVkVGV4dDsKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5IGIvVG9vbHMvU2NyaXB0cy9zdm4tYXBwbHkKaW5k ZXggYzNjOTcyZjU2MTc4ZmFlOTJiNjg3NDIzNzBlNzlkNGE1YjI0YjNlZC4uZDg0MDIxNjk2Mjk2 YjNkYTIwNmY1MWE5NmJjMjgxMWNiNDRhYjU5MiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9z dm4tYXBwbHkKKysrIGIvVG9vbHMvU2NyaXB0cy9zdm4tYXBwbHkKQEAgLTM2Myw3ICszNjMsNyBA QCBzdWIgcGF0Y2goJCkKICAgICAgICAgICAgICAgICBoYW5kbGVCaW5hcnlDaGFuZ2UoJGZ1bGxQ YXRoLCAkcGF0Y2gpIGlmICRwYXRjaDsKICAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNpZiAo JGRlbGV0aW9uKSB7Ci0gICAgICAgICAgICBhcHBseVBhdGNoKCRwYXRjaCwgJGZ1bGxQYXRoLCBb Ii0tZm9yY2UiXSkgaWYgJHBhdGNoOworICAgICAgICAgICAgYXBwbHlQYXRjaCgkcGF0Y2gsICRm dWxsUGF0aCwgWyItLWZvcmNlIl0pIGlmICgkcGF0Y2ggJiYgJGhhc1RleHRDaHVua3MpOwogICAg ICAgICAgICAgc2NtUmVtb3ZlKCRmdWxsUGF0aCk7CiAgICAgICAgIH0gZWxzaWYgKCRhZGRpdGlv biAmJiAkaGFzVGV4dENodW5rcykgewogICAgICAgICAgICAgIyBBZGRpdGlvbgpAQCAtMzc0LDYg KzM3NCwxNCBAQCBzdWIgcGF0Y2goJCkKICAgICAgICAgICAgIG15ICRlc2NhcGVkRnVsbFBhdGgg PSBlc2NhcGVTdWJ2ZXJzaW9uUGF0aCgiJGZ1bGxQYXRoLm9yaWciKTsKICAgICAgICAgICAgICMg V2hhdCBpcyB0aGlzIGZvcj8KICAgICAgICAgICAgIHN5c3RlbSgic3ZuIiwgInN0YXQiLCAiJGVz Y2FwZWRGdWxsUGF0aCIpIGlmIGlzU1ZOKCkgJiYgLWUgIiRmdWxsUGF0aC5vcmlnIjsKKyAgICAg ICAgfSBlbHNpZiAoJGFkZGl0aW9uICYmICEkaGFzVGV4dENodW5rcykgeworICAgICAgICAgICAg IyBBZGQgZW1wdHkgZmlsZS4KKyAgICAgICAgICAgIGRpZSAiXCIkZnVsbFBhdGhcIiBhbHJlYWR5 IGV4aXN0cyIgaWYgLWUgJGZ1bGxQYXRoOworICAgICAgICAgICAgb3BlbihteSAkRkgsICI+PiIs ICRmdWxsUGF0aCkgb3IgZGllICJDb3VsZCBub3Qgb3BlbiBcIiRmdWxsUGF0aFwiIGZvciB3cml0 aW5nOiAkISI7CisgICAgICAgICAgICBjbG9zZSgkRkgpOworICAgICAgICAgICAgc2NtQWRkKCRm dWxsUGF0aCk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBkaWUgIkNhbid0IGhhbmRs ZSBwYXRjaCBmb3IgXCIkZnVsbFBhdGhcIi4iOwogICAgICAgICB9CiAgICAgfQogCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvcGFyc2VTdm5E aWZmSGVhZGVyLnBsIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0aWxzX3VuaXR0ZXN0 L3BhcnNlU3ZuRGlmZkhlYWRlci5wbAppbmRleCA1ZmM5MDFlNWIyN2Y3Y2IwMjczNTZjNWU4MjM2 ODRiNWExMDIxMjg3Li5mODUwYjAwMDRkYTMwMzIxZGUzNjNhNjg0Mjg4ZmExMGIwMzkwMzgwIDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvcGFy c2VTdm5EaWZmSGVhZGVyLnBsCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9WQ1NVdGls c191bml0dGVzdC9wYXJzZVN2bkRpZmZIZWFkZXIucGwKQEAgLTI2Niw2ICsyNjYsNDcgQEAgRU5E CiAiXG4iXSwKICAgICBleHBlY3RlZE5leHRMaW5lID0+ICJQcm9wZXJ0eSBjaGFuZ2VzIG9uOiB0 ZXN0X2ZpbGUuc3dmXG4iLAogfSwKKyMjIyMKKyMgICAgRW1wdHkgZmlsZSB0ZXN0IGNhc2VzCisj IworeworICAgICMgTmV3IHRlc3QKKyAgICBkaWZmTmFtZSA9PiAiYWRkIGFuIGVtcHR5IGZpbGUi LAorICAgIGlucHV0VGV4dCA9PiA8PCdFTkQnLAorSW5kZXg6IGVtcHR5X2ZpbGVfdGhhdF9zaG91 bGRfbmV2ZXJfZXhpc3QKKz09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KK0VORAorICAgIGV4cGVjdGVkUmV0dXJuID0+IFsK K3sKKyAgICBzdm5Db252ZXJ0ZWRUZXh0ID0+IDw8J0VORCcsCitJbmRleDogZW1wdHlfZmlsZV90 aGF0X3Nob3VsZF9uZXZlcl9leGlzdAorPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorRU5ECisgICAgaW5kZXhQYXRoID0+ ICJlbXB0eV9maWxlX3RoYXRfc2hvdWxkX25ldmVyX2V4aXN0IiwKKyAgICBpc05ldyA9PiAxLAor fSwKK3VuZGVmXSwKKyAgICBleHBlY3RlZE5leHRMaW5lID0+IHVuZGVmLAorfSwKK3sKKyAgICAj IE5ldyB0ZXN0CisgICAgZGlmZk5hbWUgPT4gImRlbGV0ZSBhbiBlbXB0eSBmaWxlIiwKKyAgICBp bnB1dFRleHQgPT4gPDwnRU5EJywKK0luZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNT VXRpbHNfdW5pdHRlc3QvcmVzb3VyY2VzL2VtcHR5LnR4dAorPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorRU5ECisgICAg ZXhwZWN0ZWRSZXR1cm4gPT4gWworeworICAgIHN2bkNvbnZlcnRlZFRleHQgPT4gPDwnRU5EJywK K0luZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvcmVzb3Vy Y2VzL2VtcHR5LnR4dAorPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQorRU5ECisgICAgaW5kZXhQYXRoID0+ICJUb29scy9T Y3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRpbHNfdW5pdHRlc3QvcmVzb3VyY2VzL2VtcHR5LnR4dCIs CisgICAgaXNEZWxldGlvbiA9PiAxLAorfSwKK3VuZGVmXSwKKyAgICBleHBlY3RlZE5leHRMaW5l ID0+IHVuZGVmLAorfSwKICk7CiAKIG15ICR0ZXN0Q2FzZXNDb3VudCA9IEB0ZXN0Q2FzZUhhc2hS ZWZzOwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL1ZDU1V0aWxzX3VuaXR0 ZXN0L3Jlc291cmNlcy9lbXB0eS50eHQgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHBlcmwvVkNTVXRp bHNfdW5pdHRlc3QvcmVzb3VyY2VzL2VtcHR5LnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lNjlkZTI5YmIyZDFk NjQzNGI4YjI5YWU3NzVhZDhjMmU0OGM1MzkxCg==