73230 2011-11-28 11:01:46 -0800 ews bots should pass --force to update-webkit-chromium 2011-11-28 14:53:08 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tony tony abarth maruel ojan webkit.review.bot oldest_to_newest 509967 0 tony 2011-11-28 11:01:46 -0800 ews bots should pass --force to update-webkit-chromium 509970 1 116785 tony 2011-11-28 11:04:59 -0800 Created attachment 116785 Patch 509975 2 116785 abarth 2011-11-28 11:10:28 -0800 Comment on attachment 116785 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116785&action=review > Tools/Scripts/webkitdirs.pm:970 > + if ($isChromium) { > + $forceChromiumUpdate = checkForArgumentAndRemoveFromARGV("--force"); > + } Should we use a more specific flag name? Some script that calls determineIsChromium() might use --force for something else. > Tools/Scripts/webkitdirs.pm:2020 > - system("perl", "Tools/Scripts/update-webkit-chromium") == 0 or die $!; > + system("perl", "Tools/Scripts/update-webkit-chromium", "--force") == 0 or die $!; Should this be conditional on forceChromiumUpdate() ? > Tools/Scripts/webkitpy/tool/steps/update.py:51 > + update_command = self._tool.port().update_webkit_command() > + if self._options.non_interactive and "--chromium" in update_command: > + update_command.append("--force") Generally we like to encapsulate knowledge about the various ports behind the port abstraction. Can we pass a bool to update_webkit_command and have the ChromiumPort add this flag? 510017 3 116792 tony 2011-11-28 11:37:43 -0800 Created attachment 116792 Patch 510021 4 tony 2011-11-28 11:39:59 -0800 (In reply to comment #2) > (From update of attachment 116785 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=116785&action=review > > > Tools/Scripts/webkitdirs.pm:970 > > + if ($isChromium) { > > + $forceChromiumUpdate = checkForArgumentAndRemoveFromARGV("--force"); > > + } > > Should we use a more specific flag name? Some script that calls determineIsChromium() might use --force for something else. Sure, renamed to --force-update. > > Tools/Scripts/webkitdirs.pm:2020 > > - system("perl", "Tools/Scripts/update-webkit-chromium") == 0 or die $!; > > + system("perl", "Tools/Scripts/update-webkit-chromium", "--force") == 0 or die $!; > > Should this be conditional on forceChromiumUpdate() ? No, this is for when someone calls build-webkit --chromium --update-chromium, which doesn't call determineIsChromium(). Even if it did, it would then need to be build-webkit --chromium --update-chromium --force-update, which seems redundant. > > Tools/Scripts/webkitpy/tool/steps/update.py:51 > > + update_command = self._tool.port().update_webkit_command() > > + if self._options.non_interactive and "--chromium" in update_command: > > + update_command.append("--force") > > Generally we like to encapsulate knowledge about the various ports behind the port abstraction. Can we pass a bool to update_webkit_command and have the ChromiumPort add this flag? Done. 510024 5 116792 abarth 2011-11-28 11:42:28 -0800 Comment on attachment 116792 Patch Great! Thanks. 510080 6 116792 webkit.review.bot 2011-11-28 12:36:37 -0800 Comment on attachment 116792 Patch Rejecting attachment 116792 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: Usage: update-webkit [options] --chromium also update dependencies of the chromium port --make generate the Makefile-based build system (Chromium only) --chromium-android also update dependencies of the chromium port for Android -h|--help show the help message -q|--quiet pass -q to svn update for quiet updates --gyp generate project files from gyp after update --wincairo also update dependencies of the WinCairo port Full output: http://queues.webkit.org/results/10643469 510103 7 tony 2011-11-28 13:06:57 -0800 It looks like a version with the patch applied was run against code without the patch applied. Adam, is that expected? Should I just land this patch by hand? 510142 8 abarth 2011-11-28 13:52:35 -0800 Yeah, you might need to land it by hand. I haven't thought throw the transition issues, but if we have trouble we can kick things. 510150 9 tony 2011-11-28 13:59:54 -0800 Committed r101279: <http://trac.webkit.org/changeset/101279> 510212 10 tony 2011-11-28 14:53:08 -0800 Committed r101285: <http://trac.webkit.org/changeset/101285> 116785 2011-11-28 11:04:59 -0800 2011-11-28 11:37:40 -0800 Patch bug-73230-20111128110502.patch text/plain 7465 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxMjYzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGY1MTUyMWMwYTAzODRmYjMxOWZkMTI0NDlhNzQwNWMx NjI5ZTVkMC4uNjE1ZGE0NGVkOGM5OThkNDBiZDQxMGExYTkxMDExNzJhNThhYjQwOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDExLTExLTI4ICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgZXdzIGJvdHMgc2hvdWxkIHBhc3MgLS1mb3JjZSB0byB1cGRhdGUtd2Via2l0LWNocm9taXVt CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MzIzMAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgbWFr ZXMgaXQgbGVzcyBsaWtlbHkgZm9yIGdjbGllbnQgY2hhbmdlcyB0byBicmVhayB0aGUgYm90cyAo ZS5nLiwKKyAgICAgICAgaWYgYSBERVBTIHJlcG9zaXRvcnkgbW92ZXMgb3IgaXMgc3dpdGNoZWQg dG8gYSBicmFuY2gpLgorCisgICAgICAgIEFsc28gcGFzcyAtLWZvcmNlIHdoZW4gdXNpbmcgfGJ1 aWxkLXdlYmtpdCAtLXVwZGF0ZS1jaHJvbWl1bXwgc2luY2UgdGhpcworICAgICAgICBhcHBlYXJz IHRvIG9ubHkgYmUgdXNlZCBieSB0aGUgYm90cy4KKworICAgICAgICAqIFNjcmlwdHMvdXBkYXRl LXdlYmtpdDoKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRl cm1pbmVJc0Nocm9taXVtKTogQWRkIC0tZm9yY2UgdG8gdXBkYXRlLXdlYmtpdCAtLWNocm9taXVt LgorICAgICAgICAoZm9yY2VDaHJvbWl1bVVwZGF0ZSk6CisgICAgICAgIChidWlsZENocm9taXVt KTogUGFzcyAtLWZvcmNlIHRvIHVwZGF0ZS13ZWJraXQtY2hyb21pdW0uCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3VwZGF0ZS5weToKKyAgICAgICAgKFVwZGF0ZS5ydW4p OiBBZGQgLS1mb3JjZSBpZiBub24taW50ZXJhY3RpdmUgKGkuZS4sIGJvdHMpLgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy91cGRhdGVfdW5pdHRlc3QucHk6CisKIDIwMTEt MTEtMjggIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgogCiAgICAg ICAgIFtRdF0gQnVpbGQgc3lzdGVtIGZpeGVzIGFnYWluc3QgVjguCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQgYi9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQKaW5k ZXggNWM5MDJkNzg0MzU4NGI1MjgyYWVhYjkxMTA2OGUxNzViNzcyN2Q5OS4uZmI5Zjc5ODMzN2Fm MmJiNjM2YmQ2YzQwNDYwYzM4NTQ1YzBmZjYxZiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy91 cGRhdGUtd2Via2l0CisrKyBiL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdApAQCAtMTA4LDYg KzEwOCw3IEBAIGlmICgtZCAiLi4vSW50ZXJuYWwiKSB7CiAKICAgICBteSBAY2hyb21pdW1VcGRh dGVBcmdzID0gKCJwZXJsIiwgIlRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJvbWl1bSIp OwogICAgIHB1c2ggQGNocm9taXVtVXBkYXRlQXJncywgIi0tY2hyb21pdW0tYW5kcm9pZCIgaWYg aXNDaHJvbWl1bUFuZHJvaWQoKTsKKyAgICBwdXNoIEBjaHJvbWl1bVVwZGF0ZUFyZ3MsICItLWZv cmNlIiBpZiBmb3JjZUNocm9taXVtVXBkYXRlKCk7CiAgICAgc3lzdGVtKEBjaHJvbWl1bVVwZGF0 ZUFyZ3MpID09IDAgb3IgZGllICQhOwogfSBlbHNpZiAoaXNBcHBsZVdpbldlYktpdCgpKSB7CiAg ICAgc3lzdGVtKCJwZXJsIiwgIlRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1hdXhpbGlhcnkt bGlicyIpID09IDAgb3IgZGllOwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJz LnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IDliYTQwNTg2YTRlY2JlM2U1 NWRmYzFlMDA0ZjBlMjA2OWRkMDVlNTguLjJmY2ZiNDk1NmVhNzFiN2U4YTUwMmFlODMyNDE1YWRm ZWQ3NGE0MjYgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTkyLDYgKzkyLDcgQEAgbXkgJGlzQmxhY2tC ZXJyeTsKIG15ICRpc0Nocm9taXVtOwogbXkgJGlzQ2hyb21pdW1BbmRyb2lkOwogbXkgJGlzQ2hy b21pdW1NYWNNYWtlOworbXkgJGZvcmNlQ2hyb21pdW1VcGRhdGU7CiBteSAkaXNJbnNwZWN0b3JG cm9udGVuZDsKIG15ICRpc1dLMjsKIApAQCAtOTY0LDYgKzk2NSw5IEBAIHN1YiBkZXRlcm1pbmVJ c0Nocm9taXVtKCkKIHsKICAgICByZXR1cm4gaWYgZGVmaW5lZCgkaXNDaHJvbWl1bSk7CiAgICAg JGlzQ2hyb21pdW0gPSBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tY2hyb21p dW0iKTsKKyAgICBpZiAoJGlzQ2hyb21pdW0pIHsKKyAgICAgICAgJGZvcmNlQ2hyb21pdW1VcGRh dGUgPSBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tZm9yY2UiKTsKKyAgICB9 CiB9CiAKIHN1YiBpc0Nocm9taXVtQW5kcm9pZCgpCkBAIC05OTksNiArMTAwMywxMSBAQCBzdWIg ZGV0ZXJtaW5lSXNDaHJvbWl1bU1hY01ha2UoKQogICAgICRpc0Nocm9taXVtTWFjTWFrZSA9IGlz RGFyd2luKCkgJiYgJGhhc1VwVG9EYXRlTWFrZWZpbGU7CiB9CiAKK3N1YiBmb3JjZUNocm9taXVt VXBkYXRlKCkKK3sKKyAgICBkZXRlcm1pbmVJc0Nocm9taXVtKCk7CisgICAgcmV0dXJuICRmb3Jj ZUNocm9taXVtVXBkYXRlOworfQogCiBzdWIgaXNXaW5DYWlybygpCiB7CkBAIC0yMDA4LDcgKzIw MTcsNyBAQCBzdWIgYnVpbGRDaHJvbWl1bSgkQCkKIAogICAgICMgV2UgbWlnaHQgbmVlZCB0byB1 cGRhdGUgREVQUyBvciByZS1ydW4gR1lQIGlmIHRoaW5ncyBoYXZlIGNoYW5nZWQuCiAgICAgaWYg KGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQXJyYXlSZWYoIi0tdXBkYXRlLWNocm9taXVt IiwgXEBvcHRpb25zKSkgewotICAgICAgICBzeXN0ZW0oInBlcmwiLCAiVG9vbHMvU2NyaXB0cy91 cGRhdGUtd2Via2l0LWNocm9taXVtIikgPT0gMCBvciBkaWUgJCE7CisgICAgICAgIHN5c3RlbSgi cGVybCIsICJUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtY2hyb21pdW0iLCAiLS1mb3JjZSIp ID09IDAgb3IgZGllICQhOwogICAgIH0KIAogICAgIG15ICRyZXN1bHQgPSAxOwpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3VwZGF0ZS5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy91cGRhdGUucHkKaW5kZXggMzUyZTg0ZGY4MTNiMjgw MWZhMDM3MjNmYTMwMzUwOWY0ZDg4ZjAxNS4uN2RjODAxMDIyMzNkMWVkMmQ3MzdhZjUwNzgxMWZh NWIxZjNkMzZiNCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBz L3VwZGF0ZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvdXBkYXRl LnB5CkBAIC00Myw0ICs0MywxMCBAQCBjbGFzcyBVcGRhdGUoQWJzdHJhY3RTdGVwKToKICAgICAg ICAgaWYgbm90IHNlbGYuX29wdGlvbnMudXBkYXRlOgogICAgICAgICAgICAgcmV0dXJuCiAgICAg ICAgIGxvZygiVXBkYXRpbmcgd29ya2luZyBkaXJlY3RvcnkiKQotICAgICAgICBzZWxmLl90b29s LmV4ZWN1dGl2ZS5ydW5fYW5kX3Rocm93X2lmX2ZhaWwoc2VsZi5fdG9vbC5wb3J0KCkudXBkYXRl X3dlYmtpdF9jb21tYW5kKCksIHF1aWV0PXNlbGYuX29wdGlvbnMucXVpZXQsIGN3ZD1zZWxmLl90 b29sLnNjbSgpLmNoZWNrb3V0X3Jvb3QpCisgICAgICAgIHNlbGYuX3Rvb2wuZXhlY3V0aXZlLnJ1 bl9hbmRfdGhyb3dfaWZfZmFpbChzZWxmLl91cGRhdGVfY29tbWFuZCgpLCBxdWlldD1zZWxmLl9v cHRpb25zLnF1aWV0LCBjd2Q9c2VsZi5fdG9vbC5zY20oKS5jaGVja291dF9yb290KQorCisgICAg ZGVmIF91cGRhdGVfY29tbWFuZChzZWxmKToKKyAgICAgICAgdXBkYXRlX2NvbW1hbmQgPSBzZWxm Ll90b29sLnBvcnQoKS51cGRhdGVfd2Via2l0X2NvbW1hbmQoKQorICAgICAgICBpZiBzZWxmLl9v cHRpb25zLm5vbl9pbnRlcmFjdGl2ZSBhbmQgIi0tY2hyb21pdW0iIGluIHVwZGF0ZV9jb21tYW5k OgorICAgICAgICAgICAgdXBkYXRlX2NvbW1hbmQuYXBwZW5kKCItLWZvcmNlIikKKyAgICAgICAg cmV0dXJuIHVwZGF0ZV9jb21tYW5kCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3Rvb2wvc3RlcHMvdXBkYXRlX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL3N0ZXBzL3VwZGF0ZV91bml0dGVzdC5weQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wMTkwZWY1ZDUzMTdiNDJi MTU2ZjE2OGYwOWZjMWQ3MzBmMDE3OGEzCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL3N0ZXBzL3VwZGF0ZV91bml0dGVzdC5weQpAQCAtMCwwICsxLDYwIEBA CisjIENvcHlyaWdodCAoQykgMjAxMSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor IworIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3 aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQorIyBtZXQ6CisjCisjICAgICAqIFJlZGlz dHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0 CisjIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlz Y2xhaW1lci4KKyMgICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVw cm9kdWNlIHRoZSBhYm92ZQorIyBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0 aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCisjIGluIHRoZSBkb2N1bWVudGF0aW9u IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyMgZGlzdHJpYnV0aW9u LgorIyAgICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFtZXMg b2YgaXRzCisjIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUg cHJvZHVjdHMgZGVyaXZlZCBmcm9tCisjIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBw cmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisjCisjIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQg QlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyMgIkFTIElTIiBBTkQg QU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKKyMg TElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5E IEZJVE5FU1MgRk9SCisjIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBO TyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisjIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBM SUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAorIyBTUEVDSUFMLCBF WEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCisj IExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7 IExPU1MgT0YgVVNFLAorIyBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJ T04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyMgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hF VEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorIyAoSU5DTFVESU5H IE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBV U0UKKyMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElU WSBPRiBTVUNIIERBTUFHRS4KKworaW1wb3J0IHVuaXR0ZXN0CisKK2Zyb20gd2Via2l0cHkuY29t bW9uLmNvbmZpZy5wb3J0cyBpbXBvcnQgQ2hyb21pdW1Qb3J0LCBDaHJvbWl1bVhWRkJQb3J0Citm cm9tIHdlYmtpdHB5LnRvb2wubW9ja3Rvb2wgaW1wb3J0IE1vY2tPcHRpb25zLCBNb2NrVG9vbAor ZnJvbSB3ZWJraXRweS50b29sLnN0ZXBzLnVwZGF0ZSBpbXBvcnQgVXBkYXRlCisKKworY2xhc3Mg VXBkYXRlVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CisKKyAgICBkZWYgdGVzdF91cGRhdGVfY29t bWFuZF9ub25faW50ZXJhY3RpdmUoc2VsZik6CisgICAgICAgIHRvb2wgPSBNb2NrVG9vbCgpCisg ICAgICAgIG9wdGlvbnMgPSBNb2NrT3B0aW9ucyhub25faW50ZXJhY3RpdmU9VHJ1ZSkKKyAgICAg ICAgc3RlcCA9IFVwZGF0ZSh0b29sLCBvcHRpb25zKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFs KFsibW9jay11cGRhdGUtd2Via2l0Il0sIHN0ZXAuX3VwZGF0ZV9jb21tYW5kKCkpCisKKyAgICAg ICAgdG9vbC5fZGVwcmVjYXRlZF9wb3J0ID0gQ2hyb21pdW1Qb3J0KCkKKyAgICAgICAgc2VsZi5h c3NlcnRFcXVhbChbIlRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdCIsICItLWNocm9taXVtIiwg Ii0tZm9yY2UiXSwgc3RlcC5fdXBkYXRlX2NvbW1hbmQoKSkKKworICAgICAgICB0b29sLl9kZXBy ZWNhdGVkX3BvcnQgPSBDaHJvbWl1bVhWRkJQb3J0KCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChbIlRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdCIsICItLWNocm9taXVtIiwgIi0tZm9yY2Ui XSwgc3RlcC5fdXBkYXRlX2NvbW1hbmQoKSkKKworICAgIGRlZiB0ZXN0X3VwZGF0ZV9jb21tYW5k X2ludGVyYWN0aXZlKHNlbGYpOgorICAgICAgICB0b29sID0gTW9ja1Rvb2woKQorICAgICAgICBv cHRpb25zID0gTW9ja09wdGlvbnMobm9uX2ludGVyYWN0aXZlPUZhbHNlKQorICAgICAgICBzdGVw ID0gVXBkYXRlKHRvb2wsIG9wdGlvbnMpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoWyJtb2Nr LXVwZGF0ZS13ZWJraXQiXSwgc3RlcC5fdXBkYXRlX2NvbW1hbmQoKSkKKworICAgICAgICB0b29s Ll9kZXByZWNhdGVkX3BvcnQgPSBDaHJvbWl1bVBvcnQoKQorICAgICAgICBzZWxmLmFzc2VydEVx dWFsKFsiVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0IiwgIi0tY2hyb21pdW0iXSwgc3RlcC5f dXBkYXRlX2NvbW1hbmQoKSkKKworICAgICAgICB0b29sLl9kZXByZWNhdGVkX3BvcnQgPSBDaHJv bWl1bVhWRkJQb3J0KCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChbIlRvb2xzL1NjcmlwdHMv dXBkYXRlLXdlYmtpdCIsICItLWNocm9taXVtIl0sIHN0ZXAuX3VwZGF0ZV9jb21tYW5kKCkpCg== 116792 2011-11-28 11:37:43 -0800 2011-11-28 12:36:36 -0800 Patch bug-73230-20111128113747.patch text/plain 9167 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxMjYzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGY1MTUyMWMwYTAzODRmYjMxOWZkMTI0NDlhNzQwNWMx NjI5ZTVkMC4uYjRlNzEyODAyNGVkMmJhMjJiYjIyZWEyZjFjNWZkYmM5YWVlODFkYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDExLTExLTI4ICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgZXdzIGJvdHMgc2hvdWxkIHBhc3MgLS1mb3JjZSB0byB1cGRhdGUtd2Via2l0LWNocm9taXVt CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MzIzMAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgbWFr ZXMgaXQgbGVzcyBsaWtlbHkgZm9yIGdjbGllbnQgY2hhbmdlcyB0byBicmVhayB0aGUgYm90cyAo ZS5nLiwKKyAgICAgICAgaWYgYSBERVBTIHJlcG9zaXRvcnkgbW92ZXMgb3IgaXMgc3dpdGNoZWQg dG8gYSBicmFuY2gpLgorCisgICAgICAgIEFsc28gcGFzcyAtLWZvcmNlIHdoZW4gdXNpbmcgfGJ1 aWxkLXdlYmtpdCAtLXVwZGF0ZS1jaHJvbWl1bXwgc2luY2UgdGhpcworICAgICAgICBhcHBlYXJz IHRvIG9ubHkgYmUgdXNlZCBieSB0aGUgYm90cy4KKworICAgICAgICAqIFNjcmlwdHMvdXBkYXRl LXdlYmtpdDoKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRl cm1pbmVJc0Nocm9taXVtKTogQWRkIC0tZm9yY2UtdXBkYXRlIHRvIHVwZGF0ZS13ZWJraXQgLS1j aHJvbWl1bS4KKyAgICAgICAgKGZvcmNlQ2hyb21pdW1VcGRhdGUpOgorICAgICAgICAoYnVpbGRD aHJvbWl1bSk6IFBhc3MgLS1mb3JjZSB0byB1cGRhdGUtd2Via2l0LWNocm9taXVtLgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy91cGRhdGUucHk6CisgICAgICAgIChVcGRh dGUucnVuKTogQWRkIC0tZm9yY2UtdXBkYXRlIGlmIG5vbi1pbnRlcmFjdGl2ZSAoaS5lLiwgYm90 cykuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3VwZGF0ZV91bml0dGVz dC5weToKKwogMjAxMS0xMS0yOCAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tp YS5jb20+CiAKICAgICAgICAgW1F0XSBCdWlsZCBzeXN0ZW0gZml4ZXMgYWdhaW5zdCBWOC4KZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdCBiL1Rvb2xzL1NjcmlwdHMvdXBk YXRlLXdlYmtpdAppbmRleCA1YzkwMmQ3ODQzNTg0YjUyODJhZWFiOTExMDY4ZTE3NWI3NzI3ZDk5 Li5mYjlmNzk4MzM3YWYyYmI2MzZiZDZjNDA0NjBjMzg1NDVjMGZmNjFmIDEwMDc1NQotLS0gYS9U b29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQKKysrIGIvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Vi a2l0CkBAIC0xMDgsNiArMTA4LDcgQEAgaWYgKC1kICIuLi9JbnRlcm5hbCIpIHsKIAogICAgIG15 IEBjaHJvbWl1bVVwZGF0ZUFyZ3MgPSAoInBlcmwiLCAiVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Vi a2l0LWNocm9taXVtIik7CiAgICAgcHVzaCBAY2hyb21pdW1VcGRhdGVBcmdzLCAiLS1jaHJvbWl1 bS1hbmRyb2lkIiBpZiBpc0Nocm9taXVtQW5kcm9pZCgpOworICAgIHB1c2ggQGNocm9taXVtVXBk YXRlQXJncywgIi0tZm9yY2UiIGlmIGZvcmNlQ2hyb21pdW1VcGRhdGUoKTsKICAgICBzeXN0ZW0o QGNocm9taXVtVXBkYXRlQXJncykgPT0gMCBvciBkaWUgJCE7CiB9IGVsc2lmIChpc0FwcGxlV2lu V2ViS2l0KCkpIHsKICAgICBzeXN0ZW0oInBlcmwiLCAiVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Vi a2l0LWF1eGlsaWFyeS1saWJzIikgPT0gMCBvciBkaWU7CmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggOWJh NDA1ODZhNGVjYmUzZTU1ZGZjMWUwMDRmMGUyMDY5ZGQwNWU1OC4uZWEyYzZiZmU0YzZhNzgzY2I1 N2I5ZDcxZDBjNjQ3ZTBmNzZmNmM0OSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRk aXJzLnBtCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtOTIsNiArOTIsNyBA QCBteSAkaXNCbGFja0JlcnJ5OwogbXkgJGlzQ2hyb21pdW07CiBteSAkaXNDaHJvbWl1bUFuZHJv aWQ7CiBteSAkaXNDaHJvbWl1bU1hY01ha2U7CitteSAkZm9yY2VDaHJvbWl1bVVwZGF0ZTsKIG15 ICRpc0luc3BlY3RvckZyb250ZW5kOwogbXkgJGlzV0syOwogCkBAIC05NjQsNiArOTY1LDkgQEAg c3ViIGRldGVybWluZUlzQ2hyb21pdW0oKQogewogICAgIHJldHVybiBpZiBkZWZpbmVkKCRpc0No cm9taXVtKTsKICAgICAkaXNDaHJvbWl1bSA9IGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9t QVJHVigiLS1jaHJvbWl1bSIpOworICAgIGlmICgkaXNDaHJvbWl1bSkgeworICAgICAgICAkZm9y Y2VDaHJvbWl1bVVwZGF0ZSA9IGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS1m b3JjZS11cGRhdGUiKTsKKyAgICB9CiB9CiAKIHN1YiBpc0Nocm9taXVtQW5kcm9pZCgpCkBAIC05 OTksNiArMTAwMywxMSBAQCBzdWIgZGV0ZXJtaW5lSXNDaHJvbWl1bU1hY01ha2UoKQogICAgICRp c0Nocm9taXVtTWFjTWFrZSA9IGlzRGFyd2luKCkgJiYgJGhhc1VwVG9EYXRlTWFrZWZpbGU7CiB9 CiAKK3N1YiBmb3JjZUNocm9taXVtVXBkYXRlKCkKK3sKKyAgICBkZXRlcm1pbmVJc0Nocm9taXVt KCk7CisgICAgcmV0dXJuICRmb3JjZUNocm9taXVtVXBkYXRlOworfQogCiBzdWIgaXNXaW5DYWly bygpCiB7CkBAIC0yMDA4LDcgKzIwMTcsNyBAQCBzdWIgYnVpbGRDaHJvbWl1bSgkQCkKIAogICAg ICMgV2UgbWlnaHQgbmVlZCB0byB1cGRhdGUgREVQUyBvciByZS1ydW4gR1lQIGlmIHRoaW5ncyBo YXZlIGNoYW5nZWQuCiAgICAgaWYgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQXJyYXlS ZWYoIi0tdXBkYXRlLWNocm9taXVtIiwgXEBvcHRpb25zKSkgewotICAgICAgICBzeXN0ZW0oInBl cmwiLCAiVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtIikgPT0gMCBvciBkaWUg JCE7CisgICAgICAgIHN5c3RlbSgicGVybCIsICJUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQt Y2hyb21pdW0iLCAiLS1mb3JjZSIpID09IDAgb3IgZGllICQhOwogICAgIH0KIAogICAgIG15ICRy ZXN1bHQgPSAxOwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29u ZmlnL3BvcnRzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRz LnB5CmluZGV4IGExNmFkYWVhNTkxZjczMTZkM2RmZTg1ZjlhOTVlYTAwN2ExZDI2ZTIuLmE4NTA2 ZjNkOWE3YjBlNzRkMDRiNmU4Y2VlMDNhYTI4YjdiM2I1ZjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHMucHkKQEAgLTgwLDcgKzgwLDcgQEAgY2xhc3Mg V2ViS2l0UG9ydChvYmplY3QpOgogICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yKCJz dWJjbGFzc2VzIG11c3QgaW1wbGVtZW50IikKIAogICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiB1 cGRhdGVfd2Via2l0X2NvbW1hbmQoY2xzKToKKyAgICBkZWYgdXBkYXRlX3dlYmtpdF9jb21tYW5k KGNscywgbm9uX2ludGVyYWN0aXZlPUZhbHNlKToKICAgICAgICAgcmV0dXJuIGNscy5zY3JpcHRf c2hlbGxfY29tbWFuZCgidXBkYXRlLXdlYmtpdCIpCiAKICAgICBAY2xhc3NtZXRob2QKQEAgLTIy NSw5ICsyMjUsMTEgQEAgY2xhc3MgQ2hyb21pdW1Qb3J0KFdlYktpdFBvcnQpOgogICAgICAgICBy ZXR1cm4gIi0tcG9ydD1jaHJvbWl1bSIKIAogICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiB1cGRh dGVfd2Via2l0X2NvbW1hbmQoY2xzKToKLSAgICAgICAgY29tbWFuZCA9IFdlYktpdFBvcnQudXBk YXRlX3dlYmtpdF9jb21tYW5kKCkKKyAgICBkZWYgdXBkYXRlX3dlYmtpdF9jb21tYW5kKGNscywg bm9uX2ludGVyYWN0aXZlPUZhbHNlKToKKyAgICAgICAgY29tbWFuZCA9IFdlYktpdFBvcnQudXBk YXRlX3dlYmtpdF9jb21tYW5kKG5vbl9pbnRlcmFjdGl2ZT1ub25faW50ZXJhY3RpdmUpCiAgICAg ICAgIGNvbW1hbmQuYXBwZW5kKCItLWNocm9taXVtIikKKyAgICAgICAgaWYgbm9uX2ludGVyYWN0 aXZlOgorICAgICAgICAgICAgY29tbWFuZC5hcHBlbmQoIi0tZm9yY2UtdXBkYXRlIikKICAgICAg ICAgcmV0dXJuIGNvbW1hbmQKIAogICAgIEBjbGFzc21ldGhvZApkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzX21vY2sucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHNfbW9jay5weQppbmRleCBjNjQxNTI1Mzlj OGMxMWNlZWRiZjgyNDgyNWExNThiMzZhYjIxYjhiLi42NWRkNDQyZDM3NWJkODU0OTk0ZTNhYWQ1 ZTBhOTU5MWU4MDJmZTc3IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jb25maWcvcG9ydHNfbW9jay5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jb25maWcvcG9ydHNfbW9jay5weQpAQCAtMzcsNyArMzcsNyBAQCBjbGFzcyBNb2NrUG9ydChv YmplY3QpOgogICAgIGRlZiBjaGVja193ZWJraXRfc3R5bGVfY29tbWFuZChzZWxmKToKICAgICAg ICAgcmV0dXJuIFsibW9jay1jaGVjay13ZWJraXQtc3R5bGUiXQogCi0gICAgZGVmIHVwZGF0ZV93 ZWJraXRfY29tbWFuZChzZWxmKToKKyAgICBkZWYgdXBkYXRlX3dlYmtpdF9jb21tYW5kKHNlbGYs IG5vbl9pbnRlcmFjdGl2ZT1GYWxzZSk6CiAgICAgICAgIHJldHVybiBbIm1vY2stdXBkYXRlLXdl YmtpdCJdCiAKICAgICBkZWYgYnVpbGRfd2Via2l0X2NvbW1hbmQoc2VsZiwgYnVpbGRfc3R5bGU9 Tm9uZSk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvdXBk YXRlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3VwZGF0ZS5weQppbmRl eCAzNTJlODRkZjgxM2IyODAxZmEwMzcyM2ZhMzAzNTA5ZjRkODhmMDE1Li5kZGQ3MjFiODYzYzk5 OTFjOWRmMWYxY2ZkNTE1NDI3ZmNhODAzYzA4IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3Rvb2wvc3RlcHMvdXBkYXRlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv dG9vbC9zdGVwcy91cGRhdGUucHkKQEAgLTQzLDQgKzQzLDggQEAgY2xhc3MgVXBkYXRlKEFic3Ry YWN0U3RlcCk6CiAgICAgICAgIGlmIG5vdCBzZWxmLl9vcHRpb25zLnVwZGF0ZToKICAgICAgICAg ICAgIHJldHVybgogICAgICAgICBsb2coIlVwZGF0aW5nIHdvcmtpbmcgZGlyZWN0b3J5IikKLSAg ICAgICAgc2VsZi5fdG9vbC5leGVjdXRpdmUucnVuX2FuZF90aHJvd19pZl9mYWlsKHNlbGYuX3Rv b2wucG9ydCgpLnVwZGF0ZV93ZWJraXRfY29tbWFuZCgpLCBxdWlldD1zZWxmLl9vcHRpb25zLnF1 aWV0LCBjd2Q9c2VsZi5fdG9vbC5zY20oKS5jaGVja291dF9yb290KQorICAgICAgICBzZWxmLl90 b29sLmV4ZWN1dGl2ZS5ydW5fYW5kX3Rocm93X2lmX2ZhaWwoc2VsZi5fdXBkYXRlX2NvbW1hbmQo KSwgcXVpZXQ9c2VsZi5fb3B0aW9ucy5xdWlldCwgY3dkPXNlbGYuX3Rvb2wuc2NtKCkuY2hlY2tv dXRfcm9vdCkKKworICAgIGRlZiBfdXBkYXRlX2NvbW1hbmQoc2VsZik6CisgICAgICAgIHVwZGF0 ZV9jb21tYW5kID0gc2VsZi5fdG9vbC5wb3J0KCkudXBkYXRlX3dlYmtpdF9jb21tYW5kKHNlbGYu X29wdGlvbnMubm9uX2ludGVyYWN0aXZlKQorICAgICAgICByZXR1cm4gdXBkYXRlX2NvbW1hbmQK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy91cGRhdGVfdW5p dHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvdXBkYXRlX3VuaXR0 ZXN0LnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLjE5ZWY5NDlkYTgzMzg3NDI5OTI5NTYyZDBjYmI3ZjQ5ZDAzYzQw NzAKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMv dXBkYXRlX3VuaXR0ZXN0LnB5CkBAIC0wLDAgKzEsNjAgQEAKKyMgQ29weXJpZ2h0IChDKSAyMDEx IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlzdHJpYnV0aW9uIGFu ZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorIyBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMgYXJlCisjIG1ldDoKKyMKKyMgICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBj b2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgbm90aWNlLCB0aGlzIGxpc3Qg b2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorIyAgICAgKiBSZWRp c3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisjIGNv cHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIKKyMgaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFs cyBwcm92aWRlZCB3aXRoIHRoZQorIyBkaXN0cmlidXRpb24uCisjICAgICAqIE5laXRoZXIgdGhl IG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyMgY29udHJpYnV0b3Jz IG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20K KyMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lv bi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERF UlMgQU5EIENPTlRSSUJVVE9SUworIyAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVE IFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBUSEUgSU1QTElF RCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKyMgQSBQQVJU SUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZ UklHSFQKKyMgT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwg SU5ESVJFQ1QsIElOQ0lERU5UQUwsCisjIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVO VElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyMgTElNSVRFRCBUTywgUFJPQ1VSRU1F TlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisjIERBVEEs IE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5E IE9OIEFOWQorIyBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJ Q1QgTElBQklMSVRZLCBPUiBUT1JUCisjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJ U0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorIyBPRiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorCitp bXBvcnQgdW5pdHRlc3QKKworZnJvbSB3ZWJraXRweS5jb21tb24uY29uZmlnLnBvcnRzIGltcG9y dCBDaHJvbWl1bVBvcnQsIENocm9taXVtWFZGQlBvcnQKK2Zyb20gd2Via2l0cHkudG9vbC5tb2Nr dG9vbCBpbXBvcnQgTW9ja09wdGlvbnMsIE1vY2tUb29sCitmcm9tIHdlYmtpdHB5LnRvb2wuc3Rl cHMudXBkYXRlIGltcG9ydCBVcGRhdGUKKworCitjbGFzcyBVcGRhdGVUZXN0KHVuaXR0ZXN0LlRl c3RDYXNlKToKKworICAgIGRlZiB0ZXN0X3VwZGF0ZV9jb21tYW5kX25vbl9pbnRlcmFjdGl2ZShz ZWxmKToKKyAgICAgICAgdG9vbCA9IE1vY2tUb29sKCkKKyAgICAgICAgb3B0aW9ucyA9IE1vY2tP cHRpb25zKG5vbl9pbnRlcmFjdGl2ZT1UcnVlKQorICAgICAgICBzdGVwID0gVXBkYXRlKHRvb2ws IG9wdGlvbnMpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoWyJtb2NrLXVwZGF0ZS13ZWJraXQi XSwgc3RlcC5fdXBkYXRlX2NvbW1hbmQoKSkKKworICAgICAgICB0b29sLl9kZXByZWNhdGVkX3Bv cnQgPSBDaHJvbWl1bVBvcnQoKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKFsiVG9vbHMvU2Ny aXB0cy91cGRhdGUtd2Via2l0IiwgIi0tY2hyb21pdW0iLCAiLS1mb3JjZS11cGRhdGUiXSwgc3Rl cC5fdXBkYXRlX2NvbW1hbmQoKSkKKworICAgICAgICB0b29sLl9kZXByZWNhdGVkX3BvcnQgPSBD aHJvbWl1bVhWRkJQb3J0KCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChbIlRvb2xzL1Njcmlw dHMvdXBkYXRlLXdlYmtpdCIsICItLWNocm9taXVtIiwgIi0tZm9yY2UtdXBkYXRlIl0sIHN0ZXAu X3VwZGF0ZV9jb21tYW5kKCkpCisKKyAgICBkZWYgdGVzdF91cGRhdGVfY29tbWFuZF9pbnRlcmFj dGl2ZShzZWxmKToKKyAgICAgICAgdG9vbCA9IE1vY2tUb29sKCkKKyAgICAgICAgb3B0aW9ucyA9 IE1vY2tPcHRpb25zKG5vbl9pbnRlcmFjdGl2ZT1GYWxzZSkKKyAgICAgICAgc3RlcCA9IFVwZGF0 ZSh0b29sLCBvcHRpb25zKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKFsibW9jay11cGRhdGUt d2Via2l0Il0sIHN0ZXAuX3VwZGF0ZV9jb21tYW5kKCkpCisKKyAgICAgICAgdG9vbC5fZGVwcmVj YXRlZF9wb3J0ID0gQ2hyb21pdW1Qb3J0KCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChbIlRv b2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdCIsICItLWNocm9taXVtIl0sIHN0ZXAuX3VwZGF0ZV9j b21tYW5kKCkpCisKKyAgICAgICAgdG9vbC5fZGVwcmVjYXRlZF9wb3J0ID0gQ2hyb21pdW1YVkZC UG9ydCgpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoWyJUb29scy9TY3JpcHRzL3VwZGF0ZS13 ZWJraXQiLCAiLS1jaHJvbWl1bSJdLCBzdGVwLl91cGRhdGVfY29tbWFuZCgpKQo=