9322 2006-06-05 22:14:29 -0700 Teach svn-create-patch to sort its output 2006-06-06 20:09:54 -0700 1 1 1 Unclassified WebKit Tools / Tests 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 ddkilzer ddkilzer oldest_to_newest 44820 0 ddkilzer 2006-06-05 22:14:29 -0700 After Bug 9299 landed, there were still a few improvements to make (see Bug 9299 Comment #5). This bug handles sorting the output of svn-create-patch so that binary files appear after text file patches, and the patches appear in alphabetical (and deterministic) order. 44823 1 8725 ddkilzer 2006-06-05 22:36:13 -0700 Created attachment 8725 Patch v1 I took no prisoners in cleaning up the perl code, but I may have been too aggressive. (I was tempted to remove 'use' statements, too, but held off.) Changes (in no particular order): - Sorted 'use' statements alphabetically. - Reworded some die() messages. - Extracted path canonicalization to canonicalizePath() method and switched to using standard Perl modules instead of regular expressions assuming forward slashes. - Moved non-subroutine code together (or moved all subroutines to the end of the file) and added an 'exit 0;' statement so you know where the main code ends. Subroutines are alphabetized. - Moved list-of-path cleanup into the else block of the first if/else statement because it's only needed there. If no arguments are given, "." is used by default and is the only path needed. Changed a while() loop to a for() loop since I thought it read better; also replaced another regex with dirname(). - Created new generateFileList() subroutine. It uses "svn diff" instead of "svn stat" since (a) "svn diff" was roughly 4x faster than "svn stat" in a local test and (b) it's easier to know if a file is binary or not using "svn diff". - Completely gutted diff() and renamed to generateDiff(). It only has to handle creating a patch for one file at a time now. I also removed all of the chdir() business since Subversion handles the full paths quite nicely. That cleaned up a lot of logic in the patch path fix-up as well. Should I have kept this code? 44860 2 8725 darin 2006-06-06 09:42:38 -0700 Comment on attachment 8725 Patch v1 Looks fine. But I think it would be even better if it used the sort from run-webkit-tests. It's called "pathcmp". r=me 45039 3 ddkilzer 2006-06-06 20:09:54 -0700 Committed revision 14758. 8725 2006-06-05 22:36:13 -0700 2006-06-06 09:42:38 -0700 Patch v1 bug-9322-v1.diff text/plain 7876 ddkilzer SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE0NzQxKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDYtMDYtMDYgIERhdmlkIEtpbHplciAgPGRk a2lsemVyQGtpbHplci5uZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9p ZD05MzIyCisgICAgICAgIFRlYWNoIHN2bi1jcmVhdGUtcGF0Y2ggdG8gc29ydCBpdHMgb3V0cHV0 CisKKyAgICAgICAgKiBTY3JpcHRzL3N2bi1jcmVhdGUtcGF0Y2g6IENsZWFuIHVwIHBlcmwgY29k ZS4gIFNvcnQgcGF0Y2ggb3V0cHV0IGFscGhhYmV0aWNhbGx5CisgICAgICAgIGJ5IHRleHQgZmls ZXMgZmlyc3QsIHRoZW4gYnkgYmluYXJ5IGZpbGVzLgorCiAyMDA2LTA2LTA0ICBEYXZpZCBLaWx6 ZXIgIDxkZGtpbHplckBraWx6ZXIubmV0PgogCiAgICAgICAgIFJldmlld2VkIGJ5IGRhcmluLgpJ bmRleDogV2ViS2l0VG9vbHMvU2NyaXB0cy9zdm4tY3JlYXRlLXBhdGNoCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLWNyZWF0ZS1wYXRjaAkocmV2aXNpb24gMTQ3NDEpCisr KyBXZWJLaXRUb29scy9TY3JpcHRzL3N2bi1jcmVhdGUtcGF0Y2gJKHdvcmtpbmcgY29weSkKQEAg LTMzLDIxICszMywyMyBAQAogIyAgIFVzZXMgdGhlIHJlYWwgZGlmZiwgbm90IHN2bidzIGJ1aWx0 LWluIGRpZmYuCiAjICAgQWx3YXlzIHBhc3NlcyAiLXAiIHRvIGRpZmYgc28gaXQgd2lsbCB0cnkg dG8gaW5jbHVkZSBmdW5jdGlvbiBuYW1lcy4KICMgICBIYW5kbGVzIGJpbmFyeSBmaWxlcyAoZW5j b2RlZCBhcyBhIGJhc2U2NCBjaHVuayBvZiB0ZXh0KS4KKyMgICBTb3J0cyB0aGUgZGlmZnMgYWxw aGFiZXRpY2FsbHkgYnkgdGV4dCBmaWxlcywgdGhlbiBiaW5hcnkgZmlsZXMuCiAjCiAjIE1pc3Np bmcgZmVhdHVyZXM6CiAjCi0jICAgU29ydCB0aGUgZGlmZnMsIHNpbmNlIHN2biBlbWl0cyB0aGVt IGluIGEgc2VlbWluZ2x5LXJhbmRvbSBvcmRlci4KICMgICBIYW5kbGUgbW92ZWQgZmlsZXMuCiAK IHVzZSBzdHJpY3Q7CisKK3VzZSBDb25maWc7CiB1c2UgQ3dkOwotdXNlIEdldG9wdDo6TG9uZzsK LXVzZSBUaW1lOjpnbXRpbWU7Ci11c2UgRmlsZTo6c3RhdDsKK3VzZSBGaWxlOjpCYXNlbmFtZTsK IHVzZSBGaWxlOjpTcGVjOwotdXNlIFBPU0lYIHF3KDplcnJub19oKTsKLXVzZSBDb25maWc7Cit1 c2UgRmlsZTo6c3RhdDsKK3VzZSBHZXRvcHQ6Okxvbmc7CiB1c2UgTUlNRTo6QmFzZTY0OwordXNl IFBPU0lYIHF3KDplcnJub19oKTsKK3VzZSBUaW1lOjpnbXRpbWU7CiAKIG15ICRzdGFydERpciA9 IGdldGN3ZCgpOwogbXkgJXBhdGhzOwpAQCAtNTcsMTAwICs1OSwxMjQgQEAgaWYgKCFAQVJHVikg ewogICAgICRwYXRoc3siLiJ9ID0gMTsKIH0gZWxzZSB7CiAgICAgZm9yIG15ICRmaWxlIChAQVJH VikgewotICAgICAgICBkaWUgImNhbid0IGhhbmRsZSBhYnNvbHV0ZSBwYXRocyBsaWtlIFwiJGZp bGVcIlxuIiBpZiAkZmlsZSA9fiBtfF4vfDsKKyAgICAgICAgZGllICJjYW4ndCBoYW5kbGUgYWJz b2x1dGUgcGF0aHMgbGlrZSBcIiRmaWxlXCJcbiIgaWYgRmlsZTo6U3BlYy0+ZmlsZV9uYW1lX2lz X2Fic29sdXRlKCRmaWxlKTsKICAgICAgICAgZGllICJjYW4ndCBoYW5kbGUgZW1wdHkgc3RyaW5n IHBhdGhcbiIgaWYgJGZpbGUgZXEgIiI7Ci0gICAgICAgIGRpZSAiY2FuJ3QgaGFuZGxlIHBhdGgg d2l0aCAnIGluIHRoZSBuYW1lIGxpa2UgXCIkZmlsZVwiXG4iIGlmICRmaWxlID1+IC8nLzsgIyAn IChrZWVwIFhjb2RlIHN5bnRheCBoaWdobGlnaHRpbmcgaGFwcHkpCisgICAgICAgIGRpZSAiY2Fu J3QgaGFuZGxlIHBhdGggd2l0aCBzaW5nbGUgcXVvdGUgaW4gdGhlIG5hbWUgbGlrZSBcIiRmaWxl XCJcbiIgaWYgJGZpbGUgPX4gLycvOyAjICcgKGtlZXAgWGNvZGUgc3ludGF4IGhpZ2hsaWdodGlu ZyBoYXBweSkKIAogICAgICAgICBteSAkdW50b3VjaGVkRmlsZSA9ICRmaWxlOwotICAgICAgICAK LSAgICAgICAgIyBBZGQgYSBsZWFkaW5nIGFuZCB0cmFpbGluZyBzbGFzaCB0byBzaW1wbGlmeSBs b2dpYyBiZWxvdy4KLSAgICAgICAgJGZpbGUgPSAiLyRmaWxlLyI7Ci0KLSAgICAgICAgIyBSZW1v dmUgcmVwZWF0ZWQgc2xhc2hlcy4KLSAgICAgICAgJGZpbGUgPX4gc3wvLyt8L3xnOwotCi0gICAg ICAgICMgUmVtb3ZlIG1lYW5pbmdsZXNzIHNlcXVlbmNlcyBpbnZvbHZpbmcgIi4iLgotICAgICAg ICAkZmlsZSA9fiBzfC9cLi98L3xnOwotCi0gICAgICAgICMgUmVtb3ZlIG1lYW5pbmdsZXNzIHNl cXVlbmNlcyBpbnZvbHZpbmcgIi4uIi4KLSAgICAgICAgJGZpbGUgPX4gc3wvW14uL10vXC5cLi98 L3xnOwotICAgICAgICAkZmlsZSA9fiBzfC9bXi9dK1teLi9dL1wuXC4vfC98ZzsKLSAgICAgICAg JGZpbGUgPX4gc3wvW14uL11bXi9dKy9cLlwuL3wvfGc7Ci0gICAgICAgIGRpZSAiY2FuJ3QgaGFu ZGxlIHBhdGhzIHdpdGggLi4gbGlrZSBcIiR1bnRvdWNoZWRGaWxlXCJcbiIgaWYgJGZpbGUgPX4g bXwvXC5cLi98OwogCi0gICAgICAgICMgUmVtb3ZlIHRoZSBsZWFkaW5nIGFuZCB0cmFpbGluZyBz bGFzaC4KLSAgICAgICAgJGZpbGUgPX4gc3xeLyguKikvJHwkMXw7CisgICAgICAgICRmaWxlID0g Y2Fub25pY2FsaXplUGF0aCgkZmlsZSk7CisKKyAgICAgICAgZGllICJjYW4ndCBoYW5kbGUgcGF0 aHMgd2l0aCAuLiBsaWtlIFwiJHVudG91Y2hlZEZpbGVcIlxuIiBpZiAkZmlsZSA9fiBtfC9cLlwu L3w7CiAKICAgICAgICAgJHBhdGhzeyRmaWxlfSA9IDE7CiAgICAgfQorCisgICAgaWYgKCRwYXRo c3siLiJ9KSB7CisgICAgICAgICVwYXRocyA9ICgpOworICAgICAgICAkcGF0aHN7Ii4ifSA9IDE7 CisgICAgfSBlbHNlIHsKKyAgICAgICAgIyBSZW1vdmUgYW55IHBhdGhzIHRoYXQgYWxzbyBoYXZl IGEgcGFyZW50IGxpc3RlZC4KKyAgICAgICAgZm9yIG15ICRwYXRoIChrZXlzICVwYXRocykgewor ICAgICAgICAgICAgZm9yIChteSAkcGFyZW50ID0gZGlybmFtZSgkcGF0aCk7ICRwYXJlbnQgbmUg Jy4nOyAkcGFyZW50ID0gZGlybmFtZSgkcGFyZW50KSkgeworICAgICAgICAgICAgICAgIGlmICgk cGF0aHN7JHBhcmVudH0pIHsKKyAgICAgICAgICAgICAgICAgICAgZGVsZXRlICRwYXRoc3skcGF0 aH07CisgICAgICAgICAgICAgICAgICAgIGxhc3Q7CisgICAgICAgICAgICAgICAgfQorICAgICAg ICAgICAgfQorICAgICAgICB9CisgICAgfQogfQogCi0jIFJlbW92ZSBhbnkgcGF0aHMgdGhhdCBh bHNvIGhhdmUgYSBwYXJlbnQgbGlzdGVkLgorIyBHZW5lcmF0ZSBhIGxpc3Qgb2YgZmlsZXMgcmVx dWlyaW5nIGRpZmZzCitteSAldGV4dEZpbGVzOworbXkgJWJpbmFyeUZpbGVzOwogZm9yIG15ICRw YXRoIChrZXlzICVwYXRocykgewotICAgIG15ICRwYXJlbnQgPSAkcGF0aDsKLSAgICB3aGlsZSAo JHBhcmVudCA9fiBzfC8rW14vXSskfHwpIHsKLSAgICAgICAgaWYgKCRwYXRoc3skcGFyZW50fSkg ewotICAgICAgICAgICAgZGVsZXRlICRwYXRoc3skcGF0aH07Ci0gICAgICAgICAgICBsYXN0Owor ICAgIGdlbmVyYXRlRmlsZUxpc3QoJHBhdGgsIFwldGV4dEZpbGVzLCBcJWJpbmFyeUZpbGVzKTsK K30KKworIyBHZW5lcmF0ZSB0aGUgZGlmZiBmb3IgdGV4dCBmaWxlcywgdGhlbiBiaW5hcnkgZmls ZXMsIGZvciBlYXN5IHJldmlld2luZworZm9yIG15ICRmaWxlIChzb3J0IGtleXMgJXRleHRGaWxl cykgeworICAgIGdlbmVyYXRlRGlmZigkZmlsZSk7Cit9Citmb3IgbXkgJGZpbGUgKHNvcnQga2V5 cyAlYmluYXJ5RmlsZXMpIHsKKyAgICBnZW5lcmF0ZURpZmYoJGZpbGUpOworfQorCitleGl0IDA7 CisKKworc3ViIGNhbm9uaWNhbGl6ZVBhdGgKK3sKKyAgICBteSAoJGZpbGUpID0gQF87CisKKyAg ICAjIFJlbW92ZSBleHRyYSBzbGFzaGVzIGFuZCAnLicgZGlyZWN0b3JpZXMgaW4gcGF0aAorICAg ICRmaWxlID0gRmlsZTo6U3BlYy0+Y2Fub25wYXRoKCRmaWxlKTsKKworICAgICMgUmVtb3ZlICcu LicgZGlyZWN0b3JpZXMgaW4gcGF0aAorICAgIG15IEBkaXJzID0gKCk7CisgICAgZm9yZWFjaCBt eSAkZGlyIChGaWxlOjpTcGVjLT5zcGxpdGRpcigkZmlsZSkpIHsKKyAgICAgICAgaWYgKCRkaXIg ZXEgJy4uJyAmJiAkI2RpcnMgPj0gMCAmJiAkZGlyc1skI2RpcnNdIG5lICcuLicpIHsKKyAgICAg ICAgICAgIHBvcChAZGlycyk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBwdXNoKEBk aXJzLCAkZGlyKTsKICAgICAgICAgfQogICAgIH0KKyAgICByZXR1cm4gKCQjZGlycyA+PSAwKSA/ IEZpbGU6OlNwZWMtPmNhdGRpcihAZGlycykgOiAiLiI7CiB9CiAKLXN1YiBnZXREaXJBbmRCYXNl CitzdWIgZ2VuZXJhdGVEaWZmCiB7Ci0gICAgbXkgKCRwYXRoKSA9IEBfOwotICAgIGlmICgtZCAk cGF0aCkgewotICAgICAgICAkcGF0aCA9fiBzfC8rJHx8OwotICAgICAgICByZXR1cm4gKCRwYXRo LCAiLiIpOworICAgIG15ICgkZmlsZSkgPSBAXzsKKyAgICBteSAkZXJyb3JzID0gIiI7CisgICAg bXkgJGlzQmluYXJ5OworICAgIG15ICRsYXN0TGluZTsKKyAgICBvcGVuIERJRkYsICJzdm4gZGlm ZiAtLWRpZmYtY21kIGRpZmYgLXggLXVOcCAnJGZpbGUnIHwiIG9yIGRpZTsKKyAgICB3aGlsZSAo PERJRkY+KSB7CisgICAgICAgICRpc0JpbmFyeSA9IDEgaWYgKC9eQ2Fubm90IGRpc3BsYXk6IGZp bGUgbWFya2VkIGFzIGEgYmluYXJ5IHR5cGVcLiQvKTsKKyAgICAgICAgcHJpbnQ7CisgICAgICAg ICRsYXN0TGluZSA9ICRfOwogICAgIH0KLSAgICByZXR1cm4gKCQxLCAkMikgaWYgJHBhdGggPX4g bXxeKC4rKS8oW14vXSspJHw7Ci0gICAgJHBhdGggIX4gbXwvfCBvciBkaWUgIkNvdWxkIG5vdCBw YXJzZSBwYXRoIG5hbWUgJHBhdGguXG4iOwotICAgIHJldHVybiAoIi4iLCAkcGF0aCk7CisgICAg Y2xvc2UgRElGRjsKKyAgICBwcmludCAiXG4iIGlmICgkaXNCaW5hcnkgJiYgJGxhc3RMaW5lID1+ IG0vXFMrLyk7CisgICAgb3V0cHV0QmluYXJ5Q29udGVudCgkZmlsZSkgaWYgKCRpc0JpbmFyeSk7 CisgICAgcHJpbnQgU1RERVJSICRlcnJvcnM7CiB9CiAKLSMgRnVuY3Rpb24gdG8gZ2VuZXJhdGUg YSBkaWZmLgotc3ViIGRpZmYKK3N1YiBnZW5lcmF0ZUZpbGVMaXN0CiB7Ci0gICAgbXkgKCRwYXRo KSA9IEBfOwotICAgIG15ICgkZGlyLCAkYmFzZSkgPSBnZXREaXJBbmRCYXNlKCRwYXRoKTsKLSAg ICBteSAkZXJyb3JzID0gIiI7Ci0gICAgY2hkaXIgJGRpciBvciBkaWU7Ci0gICAgb3BlbiBESUZG LCAic3ZuIGRpZmYgLS1kaWZmLWNtZCBkaWZmIC14IC11TnAgJyRiYXNlJyB8IiBvciBkaWU7Cisg ICAgbXkgKCRwYXRoLCAkdGV4dEZpbGVzLCAkYmluYXJ5RmlsZXMpID0gQF87CiAgICAgbXkgJGlu ZGV4UGF0aDsKLSAgICBteSAkYmluYXJ5UGF0aDsKKyAgICBteSAkaXNCaW5hcnk7CisgICAgb3Bl biBESUZGLCAic3ZuIGRpZmYgLS1kaWZmLWNtZCBkaWZmIC14IC11TnAgJyRwYXRoJyB8IiBvciBk aWU7CiAgICAgd2hpbGUgKDxESUZGPikgewogICAgICAgICBpZiAoL15JbmRleDogKC4qKS8pIHsK LSAgICAgICAgICAgICMgTmV3IHBhdGNoIGp1c3Qgc3RhcnRlZAotICAgICAgICAgICAgJGluZGV4 UGF0aCA9ICQxOwotICAgICAgICAgICAgaWYgKCRkaXIgbmUgIi4iKSB7Ci0gICAgICAgICAgICAg ICAgJGluZGV4UGF0aCA9ICIkZGlyLyRpbmRleFBhdGgiOwotICAgICAgICAgICAgICAgIHMvSW5k ZXg6IC4qL0luZGV4OiAkaW5kZXhQYXRoLzsKKyAgICAgICAgICAgIG15ICRuZXdJbmRleFBhdGgg PSAkMTsKKyAgICAgICAgICAgIGlmICgkaW5kZXhQYXRoKSB7CisgICAgICAgICAgICAgICAgaWYg KCRpc0JpbmFyeSkgeworICAgICAgICAgICAgICAgICAgICAkYmluYXJ5RmlsZXMtPnskaW5kZXhQ YXRofSA9IDE7CisgICAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAg JHRleHRGaWxlcy0+eyRpbmRleFBhdGh9ID0gMTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAg ICAgICB9Ci0gICAgICAgICAgICAjIE91dHB1dCBlbmNvZGVkIGJpbmFyeSBjb250ZW50cyBvZiBs YXN0IHBhdGNoIGJlZm9yZSBiZWdpbm5pbmcgb2YgbmV4dCBwYXRjaAotICAgICAgICAgICAgb3V0 cHV0QmluYXJ5Q29udGVudChGaWxlOjpTcGVjLT5hYnMycmVsKCRiaW5hcnlQYXRoLCAkZGlyKSkg aWYgKCRiaW5hcnlQYXRoKTsKLSAgICAgICAgICAgIHVuZGVmICRiaW5hcnlQYXRoOwotICAgICAg ICB9Ci0gICAgICAgIGlmICgkaW5kZXhQYXRoKSB7Ci0gICAgICAgICAgICAjIEZpeCBwYXRocyBv biBkaWZmLCAtLS0sIGFuZCArKysgbGluZXMgdG8gbWF0Y2ggcHJlY2VkaW5nIEluZGV4OiBsaW5l LgotICAgICAgICAgICAgcy9cUyskLyRpbmRleFBhdGgvIGlmIC9eZGlmZi87Ci0gICAgICAgICAg ICBzL14tLS0gXFMrLy0tLSAkaW5kZXhQYXRoLzsKLSAgICAgICAgICAgIHMvXlwrXCtcKyBcUysv KysrICRpbmRleFBhdGgvICYmIHVuZGVmICRpbmRleFBhdGg7CisgICAgICAgICAgICAkaW5kZXhQ YXRoID0gJG5ld0luZGV4UGF0aDsKKyAgICAgICAgICAgICRpc0JpbmFyeSA9IDA7CiAgICAgICAg IH0KLSAgICAgICAgaWYgKCRiaW5hcnlQYXRoKSB7Ci0gICAgICAgICAgICAjIEZpeCBwYXRoIG9u ICJQcm9wZXJ0eSBjaGFuZ2VzIG9uOiIgbGluZSB0byBtYXRjaCBwcmVjZWRpbmcgSW5kZXg6IGxp bmUuCi0gICAgICAgICAgICBzL14oUHJvcGVydHkgY2hhbmdlcyBvbjopIFxTKy8kMSAkaW5kZXhQ YXRoLzsKKyAgICAgICAgaWYgKC9eQ2Fubm90IGRpc3BsYXk6IGZpbGUgbWFya2VkIGFzIGEgYmlu YXJ5IHR5cGVcLiQvKSB7CisgICAgICAgICAgICAkaXNCaW5hcnkgPSAxOwogICAgICAgICB9Ci0g ICAgICAgICRiaW5hcnlQYXRoID0gJGluZGV4UGF0aCBpZiAoL15DYW5ub3QgZGlzcGxheTogZmls ZSBtYXJrZWQgYXMgYSBiaW5hcnkgdHlwZVwuJC8pOwotICAgICAgICBwcmludDsKICAgICB9CiAg ICAgY2xvc2UgRElGRjsKLSAgICAjIE91dHB1dCBlbmNvZGVkIGJpbmFyeSBjb250ZW50cyBpZiB0 aGUgbGFzdCBwYXRjaCB3YXMgYmluYXJ5Ci0gICAgb3V0cHV0QmluYXJ5Q29udGVudChGaWxlOjpT cGVjLT5hYnMycmVsKCRiaW5hcnlQYXRoLCAkZGlyKSkgaWYgKCRiaW5hcnlQYXRoKTsKLSAgICBj aGRpciAkc3RhcnREaXIgb3IgZGllOwotICAgIHByaW50IFNUREVSUiAkZXJyb3JzOworICAgICMg SGFuZGxlIGxhc3QgcGF0Y2gKKyAgICBpZiAoJGluZGV4UGF0aCkgeworICAgICAgICBpZiAoJGlz QmluYXJ5KSB7CisgICAgICAgICAgICAkYmluYXJ5RmlsZXMtPnskaW5kZXhQYXRofSA9IDE7Cisg ICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAkdGV4dEZpbGVzLT57JGluZGV4UGF0aH0gPSAx OworICAgICAgICB9CisgICAgfQogfQogCi0jIE91dHB1dHMgYmluYXJ5IGNvbnRlbnQgYXMgZW5j b2RlZCB0ZXh0CiBzdWIgb3V0cHV0QmluYXJ5Q29udGVudAogewogICAgIG15ICgkcGF0aCkgPSBA XzsKQEAgLTE2Niw3ICsxOTIsMyBAQCBzdWIgb3V0cHV0QmluYXJ5Q29udGVudAogICAgIHByaW50 ICJcbiI7CiB9CiAKLSMgR2VuZXJhdGUgdGhlIGRpZmYgZm9yIGVhY2ggcGFzc2VkIGZpbGUgb3Ig ZGlyZWN0b3J5LgotZm9yIG15ICRwYXRoIChzb3J0IGtleXMgJXBhdGhzKSB7Ci0gICAgZGlmZigk cGF0aCk7Ci19Cg==