119728 2013-08-12 23:12:48 -0700 extract-localizable-strings output is not suited for parsing by Xcode 2013-08-12 23:25:34 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mitz webkit-unassigned darin oldest_to_newest 916560 0 mitz 2013-08-12 23:12:48 -0700 The Xcode build log editor can identify warnings, errors and file references in script output, but some of the messages extract-localizable-strings prints fail to be parsed correctly. 916563 1 208595 mitz 2013-08-12 23:17:19 -0700 Created attachment 208595 Change the format of some error and warning messages 916564 2 mitz 2013-08-12 23:25:34 -0700 Fixed in <http://trac.webkit.org/r153980>. 208595 2013-08-12 23:17:19 -0700 2013-08-12 23:19:07 -0700 Change the format of some error and warning messages 119728_r1.diff text/plain 10663 mitz SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1Mzk3OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDEzLTA4LTEyICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisK KyAgICAgICAgZXh0cmFjdC1sb2NhbGl6YWJsZS1zdHJpbmdzIG91dHB1dCBpcyBub3Qgc3VpdGVk IGZvciBwYXJzaW5nIGJ5IFhjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMTk3MjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZGRlZCBzcGFjZXMgd2hlcmUgbmVlZGVkIGFmdGVyIOKAnHBhdGg6bGlu ZTrigJ0gdG8gYWxsb3cgWGNvZGUgdG8gcmVjb2duaXplIHRoZSBmaWxlIHJlZmVyZW5jZSwKKyAg ICAgICAgcmVtb3ZlZCDigJxFUlJPUuKAnSBzaW5jZSBtZXNzYWdlcyB0aGF0IHJlZmVyIHRvIGEg bGluZSBpbiBhIGZpbGUgYXJlIHNob3duIGFzIGVycm9yIGJ5IGRlZmF1bHQsCisgICAgICAgIGFk ZGVkIOKAnHdhcm5pbmc6IOKAnSBpbiBtZXNzYWdlcyB0aGF0IGFyZW7igJl0IGVycm9ycyAoaS5l LiBkb27igJl0IHByZXZlbnQgdGhlIHNjcmlwdCBmcm9tIGV4aXRpbmcKKyAgICAgICAgd2l0aCAw KS4KKworICAgICAgICAqIFNjcmlwdHMvZXh0cmFjdC1sb2NhbGl6YWJsZS1zdHJpbmdzOgorCiAy MDEzLTA4LTEyICBSeXVhbiBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KIAogICAgICAg ICBbRUZMXVtXSzFdIFVSTCBwcmludGluZyBjb2RlIGluIER1bXBSZW5kZXJUcmVlIGRvZXNuJ3Qg bWF0Y2ggV1RSIG9yIE1hYyBEUlQKSW5kZXg6IFRvb2xzL1NjcmlwdHMvZXh0cmFjdC1sb2NhbGl6 YWJsZS1zdHJpbmdzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvZXh0cmFjdC1sb2NhbGl6 YWJsZS1zdHJpbmdzCShyZXZpc2lvbiAxNTM5NzgpCisrKyBUb29scy9TY3JpcHRzL2V4dHJhY3Qt bG9jYWxpemFibGUtc3RyaW5ncwkod29ya2luZyBjb3B5KQpAQCAtOTUsMTMgKzk1LDEzIEBAIGlm IChkZWZpbmVkICRleGNlcHRpb25zRmlsZSAmJiBvcGVuIEVYQ0UKICAgICAgICAgY2hvbXA7CiAg ICAgICAgIGlmICgvXiIoW15cXCJdfFxcLikqIiQvIG9yIC9eWy1fXC9cd1xzLl0rLihofG18bW18 Y3xjcHApJC8gb3IgL15bLV9cL1x3XHMuXSsuKGh8bXxtbXxjfGNwcCk6IihbXlxcIl18XFwuKSoi JC8pIHsKICAgICAgICAgICAgIGlmICgkZXhjZXB0aW9ueyRffSkgewotICAgICAgICAgICAgICAg IHByaW50ICIkZXhjZXB0aW9uc0ZpbGU6JC46ZXhjZXB0aW9uIGZvciAkXyBhcHBlYXJzIHR3aWNl XG4iOwotICAgICAgICAgICAgICAgIHByaW50ICIkZXhjZXB0aW9uc0ZpbGU6JGV4Y2VwdGlvbnsk X306Zmlyc3QgYXBwZWFyYW5jZVxuIjsKKyAgICAgICAgICAgICAgICBwcmludCAiJGV4Y2VwdGlv bnNGaWxlOiQuOiB3YXJuaW5nOiBleGNlcHRpb24gZm9yICRfIGFwcGVhcnMgdHdpY2VcbiI7Cisg ICAgICAgICAgICAgICAgcHJpbnQgIiRleGNlcHRpb25zRmlsZTokZXhjZXB0aW9ueyRffTogd2Fy bmluZzogZmlyc3QgYXBwZWFyYW5jZVxuIjsKICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAg ICAgICAgICAgJGV4Y2VwdGlvbnskX30gPSAkLjsKICAgICAgICAgICAgIH0KICAgICAgICAgfSBl bHNlIHsKLSAgICAgICAgICAgIHByaW50ICIkZXhjZXB0aW9uc0ZpbGU6JC46c3ludGF4IGVycm9y XG4iOworICAgICAgICAgICAgcHJpbnQgIiRleGNlcHRpb25zRmlsZTokLjogd2FybmluZzogc3lu dGF4IGVycm9yXG4iOwogICAgICAgICB9CiAgICAgfQogICAgIGNsb3NlIEVYQ0VQVElPTlM7CkBA IC0xNTEsNyArMTUxLDcgQEAgZm9yIG15ICRmaWxlIChzb3J0IEBmaWxlcykgewogICAgICAgICAg ICAgCiAgICAgICAgICAgICBpZiAoJHRva2VuIGVxICJcIiIpIHsKICAgICAgICAgICAgICAgICBp ZiAoJGV4cGVjdGVkIGFuZCAkZXhwZWN0ZWQgbmUgImEgcXVvdGVkIHN0cmluZyIpIHsKLSAgICAg ICAgICAgICAgICAgICAgcHJpbnQgIiRmaWxlOiQuOkVSUk9SOmZvdW5kIGEgcXVvdGVkIHN0cmlu ZyBidXQgZXhwZWN0ZWQgJGV4cGVjdGVkXG4iOworICAgICAgICAgICAgICAgICAgICBwcmludCAi JGZpbGU6JC46IGZvdW5kIGEgcXVvdGVkIHN0cmluZyBidXQgZXhwZWN0ZWQgJGV4cGVjdGVkXG4i OwogICAgICAgICAgICAgICAgICAgICAkc2F3RXJyb3IgPSAxOwogICAgICAgICAgICAgICAgICAg ICAkZXhwZWN0ZWQgPSAiIjsKICAgICAgICAgICAgICAgICB9CkBAIC0xNjMsNyArMTYzLDcgQEAg Zm9yIG15ICRmaWxlIChzb3J0IEBmaWxlcykgewogICAgICAgICAgICAgICAgICAgICAgICAgJHN0 cmluZyAuPSAkMTsKICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0gZWxz ZSB7Ci0gICAgICAgICAgICAgICAgICAgIHByaW50ICIkZmlsZTokLjpFUlJPUjptaXNtYXRjaGVk IHF1b3Rlc1xuIjsKKyAgICAgICAgICAgICAgICAgICAgcHJpbnQgIiRmaWxlOiQuOiBtaXNtYXRj aGVkIHF1b3Rlc1xuIjsKICAgICAgICAgICAgICAgICAgICAgJHNhd0Vycm9yID0gMTsKICAgICAg ICAgICAgICAgICAgICAgJF8gPSAiIjsKICAgICAgICAgICAgICAgICB9CkBAIC0yMDIsNyArMjAy LDcgQEAgaGFuZGxlU3RyaW5nOgogICAgICAgICAgICAgICAgICAgICB9IGVsc2lmICgkZXhjZXB0 aW9ueyIkZmlsZTpcIiRzdHJpbmdcIiJ9KSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAkdXNl ZEV4Y2VwdGlvbnsiJGZpbGU6XCIkc3RyaW5nXCIifSA9IDE7CiAgICAgICAgICAgICAgICAgICAg IH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBwcmludCAiJGZpbGU6JHN0cmluZ0xp bmU6XCIkc3RyaW5nXCIgaXMgbm90IG1hcmtlZCBmb3IgbG9jYWxpemF0aW9uXG4iIGlmICR3YXJu QWJvdXRVbmxvY2FsaXplZFN0cmluZ3M7CisgICAgICAgICAgICAgICAgICAgICAgICBwcmludCAi JGZpbGU6JHN0cmluZ0xpbmU6IHdhcm5pbmc6IFwiJHN0cmluZ1wiIGlzIG5vdCBtYXJrZWQgZm9y IGxvY2FsaXphdGlvblxuIiBpZiAkd2FybkFib3V0VW5sb2NhbGl6ZWRTdHJpbmdzOwogICAgICAg ICAgICAgICAgICAgICAgICAgJG5vdExvY2FsaXplZENvdW50Kys7CiAgICAgICAgICAgICAgICAg ICAgIH0KICAgICAgICAgICAgICAgICB9CkBAIC0yMTMsNyArMjEzLDcgQEAgaGFuZGxlU3RyaW5n OgogICAgICAgICAgICAgJHByZXZpb3VzVG9rZW4gPSAkdG9rZW47CiAKICAgICAgICAgICAgIGlm ICgkdG9rZW4gPX4gL15OU0xvY2FsaXplZC8gJiYgJHRva2VuICF+IC9OU0xvY2FsaXplZERlc2Ny aXB0aW9uS2V5LyAmJiAkdG9rZW4gIX4gL05TTG9jYWxpemVkU3RyaW5nRnJvbVRhYmxlSW5CdW5k bGUvICYmICR0b2tlbiAhfiAvTlNMb2NhbGl6ZWRGaWxlU2l6ZURlc2NyaXB0aW9uLykgewotICAg ICAgICAgICAgICAgIHByaW50ICIkZmlsZTokLjpFUlJPUjpmb3VuZCBhIHVzZSBvZiBhbiBOU0xv Y2FsaXplZCBtYWNybyAoJHRva2VuKTsgbm90IHN1cHBvcnRlZFxuIjsKKyAgICAgICAgICAgICAg ICBwcmludCAiJGZpbGU6JC46IGZvdW5kIGEgdXNlIG9mIGFuIE5TTG9jYWxpemVkIG1hY3JvICgk dG9rZW4pOyBub3Qgc3VwcG9ydGVkXG4iOwogICAgICAgICAgICAgICAgICRuZXN0aW5nTGV2ZWwg PSAwIGlmICFkZWZpbmVkICRuZXN0aW5nTGV2ZWw7CiAgICAgICAgICAgICAgICAgJHNhd0Vycm9y ID0gMTsKICAgICAgICAgICAgICAgICAkTlNMb2NhbGl6ZUNvdW50Kys7CkBAIC0yMjYsMTMgKzIy NiwxMyBAQCBoYW5kbGVTdHJpbmc6CiAgICAgICAgICAgICAgICAgJF8gPSAiIjsgIyBEaXNjYXJk IHRoZSByZXN0IG9mIHRoZSBsaW5lCiAgICAgICAgICAgICB9IGVsc2lmICgkdG9rZW4gZXEgIici KSB7CiAgICAgICAgICAgICAgICAgaWYgKCFzLShbXlxcXXxcXC4pJy0tKSB7ICMnIDwtLSB0aGF0 IHNpbmdsZSBxdW90ZSBtYWtlcyB0aGUgUHJvamVjdCBCdWlsZGVyIGVkaXRvciBsZXNzIGNvbmZ1 c2VkCi0gICAgICAgICAgICAgICAgICAgIHByaW50ICIkZmlsZTokLjpFUlJPUjptaXNtYXRjaGVk IHNpbmdsZSBxdW90ZVxuIjsKKyAgICAgICAgICAgICAgICAgICAgcHJpbnQgIiRmaWxlOiQuOiBt aXNtYXRjaGVkIHNpbmdsZSBxdW90ZVxuIjsKICAgICAgICAgICAgICAgICAgICAgJHNhd0Vycm9y ID0gMTsKICAgICAgICAgICAgICAgICAgICAgJF8gPSAiIjsKICAgICAgICAgICAgICAgICB9CiAg ICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIGlmICgkZXhwZWN0ZWQgYW5kICRl eHBlY3RlZCBuZSAkdG9rZW4pIHsKLSAgICAgICAgICAgICAgICAgICAgcHJpbnQgIiRmaWxlOiQu OkVSUk9SOmZvdW5kICR0b2tlbiBidXQgZXhwZWN0ZWQgJGV4cGVjdGVkXG4iOworICAgICAgICAg ICAgICAgICAgICBwcmludCAiJGZpbGU6JC46IGZvdW5kICR0b2tlbiBidXQgZXhwZWN0ZWQgJGV4 cGVjdGVkXG4iOwogICAgICAgICAgICAgICAgICAgICAkc2F3RXJyb3IgPSAxOwogICAgICAgICAg ICAgICAgICAgICAkZXhwZWN0ZWQgPSAiIjsKICAgICAgICAgICAgICAgICB9CkBAIC0yNjgsNyAr MjY4LDcgQEAgaGFuZGxlU3RyaW5nOgogICAgIGdvdG8gaGFuZGxlU3RyaW5nIGlmIGRlZmluZWQg JHN0cmluZzsKICAgICAKICAgICBpZiAoJGV4cGVjdGVkKSB7Ci0gICAgICAgIHByaW50ICIkZmls ZTpFUlJPUjpyZWFjaGVkIGVuZCBvZiBmaWxlIGJ1dCBleHBlY3RlZCAkZXhwZWN0ZWRcbiI7Cisg ICAgICAgIHByaW50ICIkZmlsZTogcmVhY2hlZCBlbmQgb2YgZmlsZSBidXQgZXhwZWN0ZWQgJGV4 cGVjdGVkXG4iOwogICAgICAgICAkc2F3RXJyb3IgPSAxOwogICAgIH0KICAgICAKQEAgLTMxMCwy OSArMzEwLDI5IEBAIHN1YiBIYW5kbGVVSVN0cmluZwogICAgIG15ICRiYWQgPSAwOwogICAgICRz dHJpbmcgPSBVbmVzY2FwZUhleFNlcXVlbmNlKCRzdHJpbmcpOwogICAgIGlmICghZGVmaW5lZCgk c3RyaW5nKSkgewotICAgICAgICBwcmludCAiJGZpbGU6JGxpbmU6RVJST1I6c3RyaW5nIGhhcyBh biBpbGxlZ2FsIGhleGFkZWNpbWFsIGVzY2FwZSBzZXF1ZW5jZVxuIjsKKyAgICAgICAgcHJpbnQg IiRmaWxlOiRsaW5lOiBzdHJpbmcgaGFzIGFuIGlsbGVnYWwgaGV4YWRlY2ltYWwgZXNjYXBlIHNl cXVlbmNlXG4iOwogICAgICAgICAkYmFkID0gMTsKICAgICB9CiAgICAgJGtleSA9IFVuZXNjYXBl SGV4U2VxdWVuY2UoJGtleSk7CiAgICAgaWYgKCFkZWZpbmVkKCRrZXkpKSB7Ci0gICAgICAgIHBy aW50ICIkZmlsZTokbGluZTpFUlJPUjprZXkgaGFzIGFuIGlsbGVnYWwgaGV4YWRlY2ltYWwgZXNj YXBlIHNlcXVlbmNlXG4iOworICAgICAgICBwcmludCAiJGZpbGU6JGxpbmU6IGtleSBoYXMgYW4g aWxsZWdhbCBoZXhhZGVjaW1hbCBlc2NhcGUgc2VxdWVuY2VcbiI7CiAgICAgICAgICRiYWQgPSAx OwogICAgIH0KICAgICAkY29tbWVudCA9IFVuZXNjYXBlSGV4U2VxdWVuY2UoJGNvbW1lbnQpOwog ICAgIGlmICghZGVmaW5lZCgkY29tbWVudCkpIHsKLSAgICAgICAgcHJpbnQgIiRmaWxlOiRsaW5l OkVSUk9SOmNvbW1lbnQgaGFzIGFuIGlsbGVnYWwgaGV4YWRlY2ltYWwgZXNjYXBlIHNlcXVlbmNl XG4iOworICAgICAgICBwcmludCAiJGZpbGU6JGxpbmU6IGNvbW1lbnQgaGFzIGFuIGlsbGVnYWwg aGV4YWRlY2ltYWwgZXNjYXBlIHNlcXVlbmNlXG4iOwogICAgICAgICAkYmFkID0gMTsKICAgICB9 CiAgICAgaWYgKGdyZXAgeyAkXyA9PSAweEZGRkQgfSB1bnBhY2sgIlUqIiwgJHN0cmluZykgewot ICAgICAgICBwcmludCAiJGZpbGU6JGxpbmU6RVJST1I6c3RyaW5nIGZvciB0cmFuc2xhdGlvbiBo YXMgaWxsZWdhbCBVVEYtOCAtLSBtb3N0IGxpa2VseSBhIHByb2JsZW0gd2l0aCB0aGUgVGV4dCBF bmNvZGluZyBvZiB0aGUgc291cmNlIGZpbGVcbiI7CisgICAgICAgIHByaW50ICIkZmlsZTokbGlu ZTogc3RyaW5nIGZvciB0cmFuc2xhdGlvbiBoYXMgaWxsZWdhbCBVVEYtOCAtLSBtb3N0IGxpa2Vs eSBhIHByb2JsZW0gd2l0aCB0aGUgVGV4dCBFbmNvZGluZyBvZiB0aGUgc291cmNlIGZpbGVcbiI7 CiAgICAgICAgICRiYWQgPSAxOwogICAgIH0KICAgICBpZiAoJHN0cmluZyBuZSAka2V5ICYmIGdy ZXAgeyAkXyA9PSAweEZGRkQgfSB1bnBhY2sgIlUqIiwgJGtleSkgewotICAgICAgICBwcmludCAi JGZpbGU6JGxpbmU6RVJST1I6a2V5IGhhcyBpbGxlZ2FsIFVURi04IC0tIG1vc3QgbGlrZWx5IGEg cHJvYmxlbSB3aXRoIHRoZSBUZXh0IEVuY29kaW5nIG9mIHRoZSBzb3VyY2UgZmlsZVxuIjsKKyAg ICAgICAgcHJpbnQgIiRmaWxlOiRsaW5lOiBrZXkgaGFzIGlsbGVnYWwgVVRGLTggLS0gbW9zdCBs aWtlbHkgYSBwcm9ibGVtIHdpdGggdGhlIFRleHQgRW5jb2Rpbmcgb2YgdGhlIHNvdXJjZSBmaWxl XG4iOwogICAgICAgICAkYmFkID0gMTsKICAgICB9CiAgICAgaWYgKGdyZXAgeyAkXyA9PSAweEZG RkQgfSB1bnBhY2sgIlUqIiwgJGNvbW1lbnQpIHsKLSAgICAgICAgcHJpbnQgIiRmaWxlOiRsaW5l OkVSUk9SOmNvbW1lbnQgZm9yIHRyYW5zbGF0aW9uIGhhcyBpbGxlZ2FsIFVURi04IC0tIG1vc3Qg bGlrZWx5IGEgcHJvYmxlbSB3aXRoIHRoZSBUZXh0IEVuY29kaW5nIG9mIHRoZSBzb3VyY2UgZmls ZVxuIjsKKyAgICAgICAgcHJpbnQgIiRmaWxlOiRsaW5lOiBjb21tZW50IGZvciB0cmFuc2xhdGlv biBoYXMgaWxsZWdhbCBVVEYtOCAtLSBtb3N0IGxpa2VseSBhIHByb2JsZW0gd2l0aCB0aGUgVGV4 dCBFbmNvZGluZyBvZiB0aGUgc291cmNlIGZpbGVcbiI7CiAgICAgICAgICRiYWQgPSAxOwogICAg IH0KICAgICBpZiAoJGJhZCkgewpAQCAtMzQxLDE0ICszNDEsMTQgQEAgc3ViIEhhbmRsZVVJU3Ry aW5nCiAgICAgfQogICAgIAogICAgIGlmICgkc3RyaW5nQnlLZXl7JGtleX0gJiYgJHN0cmluZ0J5 S2V5eyRrZXl9IG5lICRzdHJpbmcpIHsKLSAgICAgICAgcHJpbnQgIiRmaWxlOiRsaW5lOmVuY291 bnRlcmVkIHRoZSBzYW1lIGtleSwgXCIka2V5XCIsIHR3aWNlLCB3aXRoIGRpZmZlcmVudCBzdHJp bmdzXG4iOwotICAgICAgICBwcmludCAiJGZpbGVCeUtleXska2V5fTokbGluZUJ5S2V5eyRrZXl9 OnByZXZpb3VzIG9jY3VycmVuY2VcbiI7CisgICAgICAgIHByaW50ICIkZmlsZTokbGluZTogd2Fy bmluZzogZW5jb3VudGVyZWQgdGhlIHNhbWUga2V5LCBcIiRrZXlcIiwgdHdpY2UsIHdpdGggZGlm ZmVyZW50IHN0cmluZ3NcbiI7CisgICAgICAgIHByaW50ICIkZmlsZUJ5S2V5eyRrZXl9OiRsaW5l QnlLZXl7JGtleX06IHdhcm5pbmc6IHByZXZpb3VzIG9jY3VycmVuY2VcbiI7CiAgICAgICAgICRr ZXlDb2xsaXNpb25Db3VudCsrOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIGlmICgkY29t bWVudEJ5S2V5eyRrZXl9ICYmICRjb21tZW50QnlLZXl7JGtleX0gbmUgJGNvbW1lbnQpIHsKLSAg ICAgICAgcHJpbnQgIiRmaWxlOiRsaW5lOmVuY291bnRlcmVkIHRoZSBzYW1lIGtleSwgXCIka2V5 XCIsIHR3aWNlLCB3aXRoIGRpZmZlcmVudCBjb21tZW50c1xuIjsKLSAgICAgICAgcHJpbnQgIiRm aWxlQnlLZXl7JGtleX06JGxpbmVCeUtleXska2V5fTpwcmV2aW91cyBvY2N1cnJlbmNlXG4iOwor ICAgICAgICBwcmludCAiJGZpbGU6JGxpbmU6IHdhcm5pbmc6IGVuY291bnRlcmVkIHRoZSBzYW1l IGtleSwgXCIka2V5XCIsIHR3aWNlLCB3aXRoIGRpZmZlcmVudCBjb21tZW50c1xuIjsKKyAgICAg ICAgcHJpbnQgIiRmaWxlQnlLZXl7JGtleX06JGxpbmVCeUtleXska2V5fTogd2FybmluZzogcHJl dmlvdXMgb2NjdXJyZW5jZVxuIjsKICAgICAgICAgJGtleUNvbGxpc2lvbkNvdW50Kys7CiAgICAg ICAgIHJldHVybjsKICAgICB9CkBAIC0zNjQsNyArMzY0LDcgQEAgcHJpbnQgIlxuIiBpZiAkc2F3 RXJyb3IgfHwgJG5vdExvY2FsaXplZAogbXkgQHVudXNlZEV4Y2VwdGlvbnMgPSBzb3J0IGdyZXAg eyAhJHVzZWRFeGNlcHRpb257JF99IH0ga2V5cyAlZXhjZXB0aW9uOwogaWYgKEB1bnVzZWRFeGNl cHRpb25zKSB7CiAgICAgZm9yIG15ICR1bnVzZWQgKEB1bnVzZWRFeGNlcHRpb25zKSB7Ci0gICAg ICAgIHByaW50ICIkZXhjZXB0aW9uc0ZpbGU6JGV4Y2VwdGlvbnskdW51c2VkfTpleGNlcHRpb24g JHVudXNlZCBub3QgdXNlZFxuIjsKKyAgICAgICAgcHJpbnQgIiRleGNlcHRpb25zRmlsZTokZXhj ZXB0aW9ueyR1bnVzZWR9OiB3YXJuaW5nOiBleGNlcHRpb24gJHVudXNlZCBub3QgdXNlZFxuIjsK ICAgICB9CiAgICAgcHJpbnQgIlxuIjsKIH0KQEAgLTM5Niw2ICszOTYsNyBAQCBpZiAoLWUgIiRm aWxlVG9VcGRhdGUiKSB7CiAgICAgICAgIG9wZW4gU1RSSU5HUywgJGZpbGVUb1VwZGF0ZSBvciBk aWU7CiAKICAgICAgICAgbXkgJGxhc3RDb21tZW50OworICAgICAgICBteSAkbGluZTsKIAogICAg ICAgICB3aGlsZSAoPFNUUklOR1M+KSB7CiAgICAgICAgICAgICBjaG9tcDsKQEAgLTQwOCwzNCAr NDA5LDM1IEBAIGlmICgtZSAiJGZpbGVUb1VwZGF0ZSIpIHsKICAgICAgICAgICAgIHsKICAgICAg ICAgICAgICAgICBteSAkc3RyaW5nID0gZGVsZXRlICRzdHJpbmdCeUtleXskMX07CiAgICAgICAg ICAgICAgICAgaWYgKCFkZWZpbmVkICRzdHJpbmcpIHsKLSAgICAgICAgICAgICAgICAgICAgcHJp bnQgImVycm9yOiAkZmlsZVRvVXBkYXRlIGNvbnRhaW5zIHVudXNlZCBrZXkgXCIkMVwiIChwcmVj ZWRpbmcgY29tbWVudDogLyogJGxhc3RDb21tZW50ICovKVxuIjsKKyAgICAgICAgICAgICAgICAg ICAgcHJpbnQgIiRmaWxlVG9VcGRhdGU6JC46IHVudXNlZCBrZXkgXCIkMVwiIChwcmVjZWRpbmcg Y29tbWVudDogLyogJGxhc3RDb21tZW50ICovKVxuIjsKICAgICAgICAgICAgICAgICAgICAgJHNh d0Vycm9yID0gMTsKICAgICAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgICAg ICBpZiAoISgkc3RyaW5nIGVxICQyKSkgewotICAgICAgICAgICAgICAgICAgICAgICAgcHJpbnQg ImVycm9yOiAkZmlsZVRvVXBkYXRlIGNvbnRhaW5zIHVuZXhwZWN0ZWQgdmFsdWUgXCIkMlwiIGZv ciBrZXkgXCIkMVwiIChleHBlY3RlZCBcIiRzdHJpbmdcIilcbiI7CisgICAgICAgICAgICAgICAg ICAgICAgICBwcmludCAiJGZpbGVUb1VwZGF0ZTokLjogdW5leHBlY3RlZCB2YWx1ZSBcIiQyXCIg Zm9yIGtleSBcIiQxXCIgKGV4cGVjdGVkIFwiJHN0cmluZ1wiKVxuIjsKICAgICAgICAgICAgICAg ICAgICAgICAgICRzYXdFcnJvciA9IDE7CiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAg ICAgICAgICAgICAgaWYgKCEoJGxhc3RDb21tZW50IGVxICRjb21tZW50QnlLZXl7JDF9KSkgewot ICAgICAgICAgICAgICAgICAgICAgICAgcHJpbnQgImVycm9yOiAkZmlsZVRvVXBkYXRlIGNvbnRh aW5zIHVuZXhwZWN0ZWQgY29tbWVudCAvKiAkbGFzdENvbW1lbnQgKi8gZm9yIGtleSBcIiQxXCIg KGV4cGVjdGVkIC8qICRjb21tZW50QnlLZXl7JDF9ICovKVxuIjsKKyAgICAgICAgICAgICAgICAg ICAgICAgIHByaW50ICIkZmlsZVRvVXBkYXRlOiQuOiB1bmV4cGVjdGVkIGNvbW1lbnQgLyogJGxh c3RDb21tZW50ICovIGZvciBrZXkgXCIkMVwiIChleHBlY3RlZCAvKiAkY29tbWVudEJ5S2V5eyQx fSAqLylcbiI7CisgICAgICAgICAgICAgICAgICAgICAgICAkc2F3RXJyb3IgPSAxOwogICAgICAg ICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfSBlbHNlIHsK LSAgICAgICAgICAgICAgICBwcmludCAiZXJyb3I6ICRmaWxlVG9VcGRhdGUgY29udGFpbnMgbGlu ZSB3aXRoIHVuZXhwZWN0ZWQgZm9ybWF0OiAkX1xuIjsKKyAgICAgICAgICAgICAgICBwcmludCAi JGZpbGVUb1VwZGF0ZTokLjogbGluZSB3aXRoIHVuZXhwZWN0ZWQgZm9ybWF0OiAkX1xuIjsKICAg ICAgICAgICAgICAgICAkc2F3RXJyb3IgPSAxOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAK ICAgICAgICAgZm9yIG15ICRtaXNzaW5nIChrZXlzICVzdHJpbmdCeUtleSkgewotICAgICAgICAg ICAgcHJpbnQgImVycm9yOiAkZmlsZVRvVXBkYXRlIGlzIG1pc3Npbmcga2V5IFwiJG1pc3Npbmdc IlxuIjsKKyAgICAgICAgICAgIHByaW50ICIkZmlsZUJ5S2V5eyRtaXNzaW5nfTokbGluZUJ5S2V5 eyRtaXNzaW5nfTogbWlzc2luZyBrZXkgXCIkbWlzc2luZ1wiXG4iOwogICAgICAgICAgICAgJHNh d0Vycm9yID0gMTsKICAgICAgICAgfQogCiAgICAgICAgIGlmICgkc2F3RXJyb3IpIHsKLSAgICAg ICAgICAgIHByaW50ICJcbmVycm9yOiAkZmlsZVRvVXBkYXRlIGlzIG5vdCB1cCB0byBkYXRlLlxu IjsKKyAgICAgICAgICAgIHByaW50ICJcbiRmaWxlVG9VcGRhdGU6MDogZmlsZSBpcyBub3QgdXAg dG8gZGF0ZS5cbiI7CiAgICAgICAgICAgICBleGl0IDE7CiAgICAgICAgIH0KICAgICB9CiB9IGVs c2UgewotICAgIHByaW50ICIkZmlsZVRvVXBkYXRlIGRvZXMgbm90IGV4aXN0XG4iOworICAgIHBy aW50ICJlcnJvcjogJGZpbGVUb1VwZGF0ZSBkb2VzIG5vdCBleGlzdFxuIjsKICAgICBleGl0IDE7 CiB9Cg==