32979 2009-12-27 23:26:29 -0800 [bzt] Create an ASAD command for uploading a patch 2009-12-28 09:06:50 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth webkit-unassigned commit-queue eric mjs webkit.review.bot oldest_to_newest 175159 0 abarth 2009-12-27 23:26:29 -0800 [bzt] Create an ASAD commands for uploading a patch 175160 1 45543 abarth 2009-12-27 23:27:25 -0800 Created attachment 45543 Patch 175161 2 45543 abarth 2009-12-27 23:27:58 -0800 Comment on attachment 45543 Patch Wow, that was strange. Let me try again. 175164 3 45544 abarth 2009-12-27 23:35:22 -0800 Created attachment 45544 Patch 175165 4 webkit.review.bot 2009-12-27 23:36:58 -0800 style-queue ran check-webkit-style on attachment 45544 without any errors. 175173 5 45544 eric 2009-12-27 23:57:43 -0800 Comment on attachment 45544 Patch Kill --editor, EDITOR= does the same thing. edit shoudl be on the user moduel anyway. What about interacting with --non-interactive? Can we detect that and error out? something like if "non-interactive" in options? 175181 6 45549 abarth 2009-12-28 01:08:05 -0800 Created attachment 45549 Patch 175182 7 webkit.review.bot 2009-12-28 01:09:21 -0800 style-queue ran check-webkit-style on attachment 45549 without any errors. 175236 8 45549 eric 2009-12-28 08:54:44 -0800 Comment on attachment 45549 Patch Seems like we'll want some new class for this: 190 diff = state.get("diff") 191 if not diff: 192 diff = self._tool.scm().create_patch() 193 state["diff"] = diff Maybe a CachingState? with a .diff() method? Or just a .get_cached_value("diff", self._tool.scm().create_patch) command? Glad to see you've abstracted it at least for this one command. Looks like an OK start. 175239 9 45549 commit-queue 2009-12-28 09:06:44 -0800 Comment on attachment 45549 Patch Clearing flags on attachment: 45549 Committed r52599: <http://trac.webkit.org/changeset/52599> 175240 10 commit-queue 2009-12-28 09:06:50 -0800 All reviewed patches have been landed. Closing bug. 45543 2009-12-27 23:27:25 -0800 2009-12-27 23:35:18 -0800 Patch bug-32979-20091227232724.patch text/plain 4825 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBhOGQxMmEzLi4yNmQ0YTU2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDktMTIt MjcgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbYnp0XSBDcmVhdGUgYW4gQVNBRCBjb21tYW5k cyBmb3IgdXBsb2FkaW5nIGEgcGF0Y2gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTMyOTc5CisKKyAgIAorCisgICAgICAgICogU2NyaXB0cy9tb2R1bGVz L2J1aWxkc3RlcHMucHk6CisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3VwbG9h ZC5weToKKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvdXBsb2FkX3VuaXR0ZXN0 LnB5OgorCiAyMDA5LTEyLTI3ICBEYW5pZWwgQmF0ZXMgIDxkYmF0ZXNAd2Via2l0Lm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv U2NyaXB0cy9tb2R1bGVzL2J1aWxkc3RlcHMucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVs ZXMvYnVpbGRzdGVwcy5weQppbmRleCBlOGQxNTFiLi42MmQxMmJkIDEwMDY0NAotLS0gYS9XZWJL aXRUb29scy9TY3JpcHRzL21vZHVsZXMvYnVpbGRzdGVwcy5weQorKysgYi9XZWJLaXRUb29scy9T Y3JpcHRzL21vZHVsZXMvYnVpbGRzdGVwcy5weQpAQCAtNTksNiArNTksNyBAQCBjbGFzcyBDb21t YW5kT3B0aW9ucyhvYmplY3QpOgogICAgIGRlc2NyaXB0aW9uID0gbWFrZV9vcHRpb24oIi1tIiwg Ii0tZGVzY3JpcHRpb24iLCBhY3Rpb249InN0b3JlIiwgdHlwZT0ic3RyaW5nIiwgZGVzdD0iZGVz Y3JpcHRpb24iLCBoZWxwPSJEZXNjcmlwdGlvbiBzdHJpbmcgZm9yIHRoZSBhdHRhY2htZW50IChk ZWZhdWx0OiBcInBhdGNoXCIpIikKICAgICBjYyA9IG1ha2Vfb3B0aW9uKCItLWNjIiwgYWN0aW9u PSJzdG9yZSIsIHR5cGU9InN0cmluZyIsIGRlc3Q9ImNjIiwgaGVscD0iQ29tbWEtc2VwYXJhdGVk IGxpc3Qgb2YgZW1haWwgYWRkcmVzc2VzIHRvIGNhcmJvbi1jb3B5LiIpCiAgICAgY29tcG9uZW50 ID0gbWFrZV9vcHRpb24oIi0tY29tcG9uZW50IiwgYWN0aW9uPSJzdG9yZSIsIHR5cGU9InN0cmlu ZyIsIGRlc3Q9ImNvbXBvbmVudCIsIGhlbHA9IkNvbXBvbmVudCBmb3IgdGhlIG5ldyBidWcuIikK KyAgICBlZGl0b3IgPSBtYWtlX29wdGlvbigiLS1lZGl0b3IiLCBhY3Rpb249InN0b3JlIiwgdHlw ZT0ic3RyaW5nIiwgZGVzdD0iZWRpdG9yIiwgaGVscD0iRWRpdG9yIGZvciBlZGl0aW5nIGZpbGVz LiIpCiAKIAogY2xhc3MgQWJzdHJhY3RTdGVwKG9iamVjdCk6CkBAIC0xNjAsNiArMTYxLDIzIEBA IGNsYXNzIFByZXBhcmVDaGFuZ2VMb2dTdGVwKEFic3RyYWN0U3RlcCk6CiAgICAgICAgIHNlbGYu X3Rvb2wuZXhlY3V0aXZlLnJ1bl9hbmRfdGhyb3dfaWZfZmFpbChhcmdzLCBzZWxmLl9vcHRpb25z LnF1aWV0KQogCiAKK2NsYXNzIEVkaXRDaGFuZ2VMb2dTdGVwKEFic3RyYWN0U3RlcCk6CisgICAg QGNsYXNzbWV0aG9kCisgICAgZGVmIG9wdGlvbnMoY2xzKToKKyAgICAgICAgcmV0dXJuIFsKKyAg ICAgICAgICAgIENvbW1hbmRPcHRpb25zLmVkaXRvciwKKyAgICAgICAgXQorCisgICAgZGVmIHJ1 bihzZWxmLCBzdGF0ZSk6CisgICAgICAgIGVkaXRvcl9jb21tYW5kID0gc2VsZi5fb3B0aW9ucy5l ZGl0b3IKKyAgICAgICAgaWYgbm90IGVkaXRvcl9jb21tYW5kOgorICAgICAgICAgICAgZWRpdG9y X2NvbW1hbmQgPSBvcy5lbnZpcm9uLmdldCgiRURJVE9SIikKKyAgICAgICAgaWYgbm90IGVkaXRv cl9jb21tYW5kOgorICAgICAgICAgICAgZXJyb3IoIkNvdWxkIG5vdCBmaW5kIGFuIGVkaXRvci4g IFBsZWFzZSBwYXNzIC0tZWRpdG9yIG9yIHNldCB0aGUgRURJVE9SIGVudmlyb25tZW50IHZhcmlh YmxlLiIpCisgICAgICAgIGNoYW5nZWxvZ3MgPSBzZWxmLl90b29sLnNjbSgpLm1vZGlmaWVkX2No YW5nZWxvZ3MoKQorICAgICAgICBzZWxmLl90b29sLmV4ZWN1dGl2ZS5ydW5fYW5kX3Rocm93X2lm X2ZhaWwoW2VkaXRvcl9jb21tYW5kXSArIGNoYW5nZWxvZ3MpCisKKwogY2xhc3MgT2Jzb2xldGVQ YXRjaGVzT25CdWdTdGVwKEFic3RyYWN0U3RlcCk6CiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVm IG9wdGlvbnMoY2xzKToKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9j b21tYW5kcy91cGxvYWQucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMv dXBsb2FkLnB5CmluZGV4IGMwZTQ5MjcuLmVjMmM5YWEgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xz L1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy91cGxvYWQucHkKKysrIGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy9tb2R1bGVzL2NvbW1hbmRzL3VwbG9hZC5weQpAQCAtMzYsNyArMzYsNyBAQCBpbXBvcnQg c3lzCiBmcm9tIG9wdHBhcnNlIGltcG9ydCBtYWtlX29wdGlvbgogCiBmcm9tIG1vZHVsZXMuYnVn emlsbGEgaW1wb3J0IHBhcnNlX2J1Z19pZAotZnJvbSBtb2R1bGVzLmJ1aWxkc3RlcHMgaW1wb3J0 IFByZXBhcmVDaGFuZ2VMb2dTdGVwLCBDb21tYW5kT3B0aW9ucywgT2Jzb2xldGVQYXRjaGVzT25C dWdTdGVwLCBQb3N0RGlmZlRvQnVnU3RlcCwgUHJvbXB0Rm9yQnVnT3JUaXRsZVN0ZXAsIENyZWF0 ZUJ1Z1N0ZXAKK2Zyb20gbW9kdWxlcy5idWlsZHN0ZXBzIGltcG9ydCBQcmVwYXJlQ2hhbmdlTG9n U3RlcCwgRWRpdENoYW5nZUxvZ1N0ZXAsIENvbW1hbmRPcHRpb25zLCBPYnNvbGV0ZVBhdGNoZXNP bkJ1Z1N0ZXAsIFBvc3REaWZmVG9CdWdTdGVwLCBQcm9tcHRGb3JCdWdPclRpdGxlU3RlcCwgQ3Jl YXRlQnVnU3RlcAogZnJvbSBtb2R1bGVzLmNvbW1hbmRzLmRvd25sb2FkIGltcG9ydCBBYnN0cmFj dFNlcXVlbmNlZENvbW1tYW5kCiBmcm9tIG1vZHVsZXMuY29tbWVudHMgaW1wb3J0IGJ1Z19jb21t ZW50X2Zyb21fc3ZuX3JldmlzaW9uCiBmcm9tIG1vZHVsZXMuZ3JhbW1hciBpbXBvcnQgcGx1cmFs aXplCkBAIC0xMDQsNiArMTA0LDI0IEBAIGNsYXNzIFByZXBhcmVEaWZmKEFic3RyYWN0U2VxdWVu Y2VkQ29tbW1hbmQpOgogICAgICAgICByZXR1cm4geyAiYnVnX2lkIiA6IGJ1Z19pZCB9CiAKIAor Y2xhc3MgQ29kZVJldmlldyhBYnN0cmFjdFNlcXVlbmNlZENvbW1tYW5kKToKKyAgICBuYW1lID0g ImNvZGUtcmV2aWV3IgorICAgIGhlbHBfdGV4dCA9ICJDcmVhdGVzIGEgYnVnIChvciBwcm9tcHRz IGZvciBhbiBleGlzdGluZyBidWcpLCBwcmVwYXJlcyB0aGUgQ2hhbmdlTG9nLCBhbmQgdXBsb2Fk cyB0aGUgZGlmZiIKKyAgICBhcmd1bWVudF9uYW1lcyA9ICJbQlVHSURdIgorICAgIHN0ZXBzID0g WworICAgICAgICBQcm9tcHRGb3JCdWdPclRpdGxlU3RlcCwKKyAgICAgICAgQ3JlYXRlQnVnU3Rl cCwKKyAgICAgICAgUHJlcGFyZUNoYW5nZUxvZ1N0ZXAsCisgICAgICAgIEVkaXRDaGFuZ2VMb2dT dGVwLAorICAgICAgICBPYnNvbGV0ZVBhdGNoZXNPbkJ1Z1N0ZXAsCisgICAgICAgIFBvc3REaWZm VG9CdWdTdGVwLAorICAgIF0KKworICAgIGRlZiBfcHJlcGFyZV9zdGF0ZShzZWxmLCBvcHRpb25z LCBhcmdzLCB0b29sKToKKyAgICAgICAgYnVnX2lkID0gYXJncyBhbmQgYXJnc1swXQorICAgICAg ICByZXR1cm4geyAiYnVnX2lkIiA6IGJ1Z19pZCB9CisKKwogY2xhc3MgUG9zdENvbW1pdHMoQ29t bWFuZCk6CiAgICAgbmFtZSA9ICJwb3N0LWNvbW1pdHMiCiAgICAgc2hvd19pbl9tYWluX2hlbHAg PSBUcnVlCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMv dXBsb2FkX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRz L3VwbG9hZF91bml0dGVzdC5weQppbmRleCAxZGQwMWQxLi5mZWRjMWU0IDEwMDY0NAotLS0gYS9X ZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvdXBsb2FkX3VuaXR0ZXN0LnB5Cisr KyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy91cGxvYWRfdW5pdHRlc3Qu cHkKQEAgLTMwLDYgKzMwLDcgQEAgaW1wb3J0IHVuaXR0ZXN0CiAKIGZyb20gbW9kdWxlcy5jb21t YW5kcy5jb21tYW5kdGVzdCBpbXBvcnQgQ29tbWFuZHNUZXN0CiBmcm9tIG1vZHVsZXMuY29tbWFu ZHMudXBsb2FkIGltcG9ydCAqCitmcm9tIG1vZHVsZXMubW9jayBpbXBvcnQgTW9jawogCiBjbGFz cyBVcGxvYWRDb21tYW5kc1Rlc3QoQ29tbWFuZHNUZXN0KToKICAgICBkZWYgdGVzdF9vYnNvbGV0 ZV9hdHRhY2htZW50cyhzZWxmKToKQEAgLTQ1LDMgKzQ2LDkgQEAgY2xhc3MgVXBsb2FkQ29tbWFu ZHNUZXN0KENvbW1hbmRzVGVzdCk6CiAKICAgICBkZWYgdGVzdF9wcmVwYXJlX2RpZmYoc2VsZik6 CiAgICAgICAgIHNlbGYuYXNzZXJ0X2V4ZWN1dGVfb3V0cHV0cyhQcmVwYXJlRGlmZigpLCBbXSkK KworICAgIGRlZiB0ZXN0X2NvZGVfcmV2aWV3KHNlbGYpOgorICAgICAgICBvcHRpb25zID0gTW9j aygpCisgICAgICAgIG9wdGlvbnMuZWRpdG9yID0gInZpIgorICAgICAgICBleHBlY3RlZF9zdGRl cnIgPSAiT2Jzb2xldGluZyAyIG9sZCBwYXRjaGVzIG9uIGJ1ZyA0MlxuIgorICAgICAgICBzZWxm LmFzc2VydF9leGVjdXRlX291dHB1dHMoQ29kZVJldmlldygpLCBbNDJdLCBvcHRpb25zPW9wdGlv bnMsIGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCg== 45544 2009-12-27 23:35:22 -0800 2009-12-28 01:07:58 -0800 Patch bug-32979-20091227233521.patch text/plain 5794 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBhOGQxMmEzLi4yZTc3MDZiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMDktMTIt MjcgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbYnp0XSBDcmVhdGUgYW4gQVNBRCBjb21tYW5k IGZvciB1cGxvYWRpbmcgYSBwYXRjaAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzI5NzkKKworICAgICAgICBUaGUgY29kZS1yZXZpZXcgY29tbWFuZCBn b2VzIHRocm91Z2ggdGhlIHdob2xlIHByb2Nlc3Mgb2YgcHJlcGFyaW5nIGEKKyAgICAgICAgY29k ZSByZXZpZXcsIGluY2x1ZGluZyBjcmVhdGluZyBhIGJ1ZywgZWRpdGluZyB0aGUgQ2hhbmdlTG9n cywgYW5kCisgICAgICAgIHVwbG9hZGluZyB0aGUgcGF0Y2guICBJdCBpcyBpbmRlZWQgdGhlIEFs bCBTaW5nLCBBbGwgRGFuY2UgdXBsb2FkCisgICAgICAgIGNvbW1hbmQuCisKKyAgICAgICAgKiBT Y3JpcHRzL21vZHVsZXMvYnVpbGRzdGVwcy5weToKKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMv Y29tbWFuZHMvdXBsb2FkLnB5OgorICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy91 cGxvYWRfdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL2V4ZWN1dGl2ZS5w eToKKwogMjAwOS0xMi0yNyAgRGFuaWVsIEJhdGVzICA8ZGJhdGVzQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvbW9kdWxlcy9idWlsZHN0ZXBzLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVz L2J1aWxkc3RlcHMucHkKaW5kZXggZThkMTUxYi4uYzU3NDJmZCAxMDA2NDQKLS0tIGEvV2ViS2l0 VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1aWxkc3RlcHMucHkKKysrIGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy9tb2R1bGVzL2J1aWxkc3RlcHMucHkKQEAgLTU5LDYgKzU5LDcgQEAgY2xhc3MgQ29tbWFu ZE9wdGlvbnMob2JqZWN0KToKICAgICBkZXNjcmlwdGlvbiA9IG1ha2Vfb3B0aW9uKCItbSIsICIt LWRlc2NyaXB0aW9uIiwgYWN0aW9uPSJzdG9yZSIsIHR5cGU9InN0cmluZyIsIGRlc3Q9ImRlc2Ny aXB0aW9uIiwgaGVscD0iRGVzY3JpcHRpb24gc3RyaW5nIGZvciB0aGUgYXR0YWNobWVudCAoZGVm YXVsdDogXCJwYXRjaFwiKSIpCiAgICAgY2MgPSBtYWtlX29wdGlvbigiLS1jYyIsIGFjdGlvbj0i c3RvcmUiLCB0eXBlPSJzdHJpbmciLCBkZXN0PSJjYyIsIGhlbHA9IkNvbW1hLXNlcGFyYXRlZCBs aXN0IG9mIGVtYWlsIGFkZHJlc3NlcyB0byBjYXJib24tY29weS4iKQogICAgIGNvbXBvbmVudCA9 IG1ha2Vfb3B0aW9uKCItLWNvbXBvbmVudCIsIGFjdGlvbj0ic3RvcmUiLCB0eXBlPSJzdHJpbmci LCBkZXN0PSJjb21wb25lbnQiLCBoZWxwPSJDb21wb25lbnQgZm9yIHRoZSBuZXcgYnVnLiIpCisg ICAgZWRpdG9yID0gbWFrZV9vcHRpb24oIi0tZWRpdG9yIiwgYWN0aW9uPSJzdG9yZSIsIHR5cGU9 InN0cmluZyIsIGRlc3Q9ImVkaXRvciIsIGhlbHA9IkVkaXRvciBmb3IgZWRpdGluZyBmaWxlcy4i KQogCiAKIGNsYXNzIEFic3RyYWN0U3RlcChvYmplY3QpOgpAQCAtMTYwLDYgKzE2MSwyMyBAQCBj bGFzcyBQcmVwYXJlQ2hhbmdlTG9nU3RlcChBYnN0cmFjdFN0ZXApOgogICAgICAgICBzZWxmLl90 b29sLmV4ZWN1dGl2ZS5ydW5fYW5kX3Rocm93X2lmX2ZhaWwoYXJncywgc2VsZi5fb3B0aW9ucy5x dWlldCkKIAogCitjbGFzcyBFZGl0Q2hhbmdlTG9nU3RlcChBYnN0cmFjdFN0ZXApOgorICAgIEBj bGFzc21ldGhvZAorICAgIGRlZiBvcHRpb25zKGNscyk6CisgICAgICAgIHJldHVybiBbCisgICAg ICAgICAgICBDb21tYW5kT3B0aW9ucy5lZGl0b3IsCisgICAgICAgIF0KKworICAgIGRlZiBydW4o c2VsZiwgc3RhdGUpOgorICAgICAgICBlZGl0b3JfY29tbWFuZCA9IHNlbGYuX29wdGlvbnMuZWRp dG9yCisgICAgICAgIGlmIG5vdCBlZGl0b3JfY29tbWFuZDoKKyAgICAgICAgICAgIGVkaXRvcl9j b21tYW5kID0gb3MuZW52aXJvbi5nZXQoIkVESVRPUiIpCisgICAgICAgIGlmIG5vdCBlZGl0b3Jf Y29tbWFuZDoKKyAgICAgICAgICAgIGVycm9yKCJDb3VsZCBub3QgZmluZCBhbiBlZGl0b3IuICBQ bGVhc2UgcGFzcyAtLWVkaXRvciBvciBzZXQgdGhlIEVESVRPUiBlbnZpcm9ubWVudCB2YXJpYWJs ZS4iKQorICAgICAgICBjaGFuZ2Vsb2dzID0gc2VsZi5fdG9vbC5zY20oKS5tb2RpZmllZF9jaGFu Z2Vsb2dzKCkKKyAgICAgICAgc2VsZi5fdG9vbC5leGVjdXRpdmUuY2FsbChbZWRpdG9yX2NvbW1h bmRdICsgY2hhbmdlbG9ncykKKworCiBjbGFzcyBPYnNvbGV0ZVBhdGNoZXNPbkJ1Z1N0ZXAoQWJz dHJhY3RTdGVwKToKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgb3B0aW9ucyhjbHMpOgpkaWZm IC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3VwbG9hZC5weSBi L1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy91cGxvYWQucHkKaW5kZXggYzBl NDkyNy4uZWMyYzlhYSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2Nv bW1hbmRzL3VwbG9hZC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFu ZHMvdXBsb2FkLnB5CkBAIC0zNiw3ICszNiw3IEBAIGltcG9ydCBzeXMKIGZyb20gb3B0cGFyc2Ug aW1wb3J0IG1ha2Vfb3B0aW9uCiAKIGZyb20gbW9kdWxlcy5idWd6aWxsYSBpbXBvcnQgcGFyc2Vf YnVnX2lkCi1mcm9tIG1vZHVsZXMuYnVpbGRzdGVwcyBpbXBvcnQgUHJlcGFyZUNoYW5nZUxvZ1N0 ZXAsIENvbW1hbmRPcHRpb25zLCBPYnNvbGV0ZVBhdGNoZXNPbkJ1Z1N0ZXAsIFBvc3REaWZmVG9C dWdTdGVwLCBQcm9tcHRGb3JCdWdPclRpdGxlU3RlcCwgQ3JlYXRlQnVnU3RlcAorZnJvbSBtb2R1 bGVzLmJ1aWxkc3RlcHMgaW1wb3J0IFByZXBhcmVDaGFuZ2VMb2dTdGVwLCBFZGl0Q2hhbmdlTG9n U3RlcCwgQ29tbWFuZE9wdGlvbnMsIE9ic29sZXRlUGF0Y2hlc09uQnVnU3RlcCwgUG9zdERpZmZU b0J1Z1N0ZXAsIFByb21wdEZvckJ1Z09yVGl0bGVTdGVwLCBDcmVhdGVCdWdTdGVwCiBmcm9tIG1v ZHVsZXMuY29tbWFuZHMuZG93bmxvYWQgaW1wb3J0IEFic3RyYWN0U2VxdWVuY2VkQ29tbW1hbmQK IGZyb20gbW9kdWxlcy5jb21tZW50cyBpbXBvcnQgYnVnX2NvbW1lbnRfZnJvbV9zdm5fcmV2aXNp b24KIGZyb20gbW9kdWxlcy5ncmFtbWFyIGltcG9ydCBwbHVyYWxpemUKQEAgLTEwNCw2ICsxMDQs MjQgQEAgY2xhc3MgUHJlcGFyZURpZmYoQWJzdHJhY3RTZXF1ZW5jZWRDb21tbWFuZCk6CiAgICAg ICAgIHJldHVybiB7ICJidWdfaWQiIDogYnVnX2lkIH0KIAogCitjbGFzcyBDb2RlUmV2aWV3KEFi c3RyYWN0U2VxdWVuY2VkQ29tbW1hbmQpOgorICAgIG5hbWUgPSAiY29kZS1yZXZpZXciCisgICAg aGVscF90ZXh0ID0gIkNyZWF0ZXMgYSBidWcgKG9yIHByb21wdHMgZm9yIGFuIGV4aXN0aW5nIGJ1 ZyksIHByZXBhcmVzIHRoZSBDaGFuZ2VMb2csIGFuZCB1cGxvYWRzIHRoZSBkaWZmIgorICAgIGFy Z3VtZW50X25hbWVzID0gIltCVUdJRF0iCisgICAgc3RlcHMgPSBbCisgICAgICAgIFByb21wdEZv ckJ1Z09yVGl0bGVTdGVwLAorICAgICAgICBDcmVhdGVCdWdTdGVwLAorICAgICAgICBQcmVwYXJl Q2hhbmdlTG9nU3RlcCwKKyAgICAgICAgRWRpdENoYW5nZUxvZ1N0ZXAsCisgICAgICAgIE9ic29s ZXRlUGF0Y2hlc09uQnVnU3RlcCwKKyAgICAgICAgUG9zdERpZmZUb0J1Z1N0ZXAsCisgICAgXQor CisgICAgZGVmIF9wcmVwYXJlX3N0YXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgorICAg ICAgICBidWdfaWQgPSBhcmdzIGFuZCBhcmdzWzBdCisgICAgICAgIHJldHVybiB7ICJidWdfaWQi IDogYnVnX2lkIH0KKworCiBjbGFzcyBQb3N0Q29tbWl0cyhDb21tYW5kKToKICAgICBuYW1lID0g InBvc3QtY29tbWl0cyIKICAgICBzaG93X2luX21haW5faGVscCA9IFRydWUKZGlmZiAtLWdpdCBh L1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy91cGxvYWRfdW5pdHRlc3QucHkg Yi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvdXBsb2FkX3VuaXR0ZXN0LnB5 CmluZGV4IDFkZDAxZDEuLmZlZGMxZTQgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMv bW9kdWxlcy9jb21tYW5kcy91cGxvYWRfdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy9tb2R1bGVzL2NvbW1hbmRzL3VwbG9hZF91bml0dGVzdC5weQpAQCAtMzAsNiArMzAsNyBA QCBpbXBvcnQgdW5pdHRlc3QKIAogZnJvbSBtb2R1bGVzLmNvbW1hbmRzLmNvbW1hbmR0ZXN0IGlt cG9ydCBDb21tYW5kc1Rlc3QKIGZyb20gbW9kdWxlcy5jb21tYW5kcy51cGxvYWQgaW1wb3J0ICoK K2Zyb20gbW9kdWxlcy5tb2NrIGltcG9ydCBNb2NrCiAKIGNsYXNzIFVwbG9hZENvbW1hbmRzVGVz dChDb21tYW5kc1Rlc3QpOgogICAgIGRlZiB0ZXN0X29ic29sZXRlX2F0dGFjaG1lbnRzKHNlbGYp OgpAQCAtNDUsMyArNDYsOSBAQCBjbGFzcyBVcGxvYWRDb21tYW5kc1Rlc3QoQ29tbWFuZHNUZXN0 KToKIAogICAgIGRlZiB0ZXN0X3ByZXBhcmVfZGlmZihzZWxmKToKICAgICAgICAgc2VsZi5hc3Nl cnRfZXhlY3V0ZV9vdXRwdXRzKFByZXBhcmVEaWZmKCksIFtdKQorCisgICAgZGVmIHRlc3RfY29k ZV9yZXZpZXcoc2VsZik6CisgICAgICAgIG9wdGlvbnMgPSBNb2NrKCkKKyAgICAgICAgb3B0aW9u cy5lZGl0b3IgPSAidmkiCisgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJPYnNvbGV0aW5nIDIg b2xkIHBhdGNoZXMgb24gYnVnIDQyXG4iCisgICAgICAgIHNlbGYuYXNzZXJ0X2V4ZWN1dGVfb3V0 cHV0cyhDb2RlUmV2aWV3KCksIFs0Ml0sIG9wdGlvbnM9b3B0aW9ucywgZXhwZWN0ZWRfc3RkZXJy PWV4cGVjdGVkX3N0ZGVycikKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxl cy9leGVjdXRpdmUucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvZXhlY3V0aXZlLnB5 CmluZGV4IDhmMjk0YWEuLmM4NDYwM2UgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMv bW9kdWxlcy9leGVjdXRpdmUucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2V4 ZWN1dGl2ZS5weQpAQCAtOTgsNiArOTgsMTAgQEAgY2xhc3MgRXhlY3V0aXZlKG9iamVjdCk6CiAg ICAgICAgIGlmIGV4aXRfY29kZToKICAgICAgICAgICAgIHJhaXNlIFNjcmlwdEVycm9yKHNjcmlw dF9hcmdzPWFyZ3MsIGV4aXRfY29kZT1leGl0X2NvZGUsIG91dHB1dD1jaGlsZF9vdXRwdXQpCiAK KyAgICAjIFdlIGNhbGwgc3VicHJvY2Vzcy5jYWxsIGluZGlyZWN0bHkgc28gd2UgY2FuIG1vY2sg aXQgb3V0IGR1cmluZyB1bml0IHRlc3RpbmcuCisgICAgZGVmIGNhbGwoc2VsZiwgYXJncyk6Cisg ICAgICAgIHJldHVybiBzdWJwcm9jZXNzLmNhbGwoYXJncykKKwogICAgICMgRXJyb3IgaGFuZGxl cnMgZG8gbm90IG5lZWQgdG8gYmUgc3RhdGljIG1ldGhvZHMgb25jZSBhbGwgY2FsbGVycyBhcmUg dXBkYXRlZCB0byB1c2UgYW4gRXhlY3V0aXZlIG9iamVjdC4KICAgICBAc3RhdGljbWV0aG9kCiAg ICAgZGVmIGRlZmF1bHRfZXJyb3JfaGFuZGxlcihlcnJvcik6Cg== 45549 2009-12-28 01:08:05 -0800 2009-12-28 09:06:43 -0800 Patch bug-32979-20091228010803.patch text/plain 7658 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAzMTBlZWY0Li44MmRkNjdlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMgQEAKIDIwMDktMTIt MjggIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbYnp0XSBDcmVhdGUgYW4gQVNBRCBjb21tYW5k IGZvciB1cGxvYWRpbmcgYSBwYXRjaAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzI5NzkKKworICAgICAgICBUaGUgY3JlYXRlLXJldmlldyBjb21tYW5k IGdvZXMgdGhyb3VnaCB0aGUgd2hvbGUgcHJvY2VzcyBvZiBwcmVwYXJpbmcgYQorICAgICAgICBj b2RlIHJldmlldywgaW5jbHVkaW5nIGNyZWF0aW5nIGEgYnVnLCBlZGl0aW5nIHRoZSBDaGFuZ2VM b2dzLCBhbmQKKyAgICAgICAgdXBsb2FkaW5nIHRoZSBwYXRjaC4gIEl0IGlzIGluZGVlZCB0aGUg QWxsIFNpbmcsIEFsbCBEYW5jZSB1cGxvYWQKKyAgICAgICAgY29tbWFuZC4KKworICAgICAgICAq IFNjcmlwdHMvbW9kdWxlcy9idWlsZHN0ZXBzLnB5OgorICAgICAgICAqIFNjcmlwdHMvbW9kdWxl cy9jb21tYW5kcy91cGxvYWQucHk6CisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRz L3VwbG9hZF91bml0dGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMvbW9ja19idWd6 aWxsYXRvb2wucHk6CisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL3VzZXIucHk6CisKKzIwMDkt MTItMjggIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKwogICAgICAgICBVbnJldmll d2VkICJidWlsZCIgZml4ICh3aXRoIHRlc3QhKS4KIAogICAgICAgICAqIFNjcmlwdHMvbW9kdWxl cy9idWd6aWxsYS5weToKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9i dWlsZHN0ZXBzLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1aWxkc3RlcHMucHkK aW5kZXggZThkMTUxYi4uMzM4Mzc2ZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9t b2R1bGVzL2J1aWxkc3RlcHMucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1 aWxkc3RlcHMucHkKQEAgLTU5LDYgKzU5LDcgQEAgY2xhc3MgQ29tbWFuZE9wdGlvbnMob2JqZWN0 KToKICAgICBkZXNjcmlwdGlvbiA9IG1ha2Vfb3B0aW9uKCItbSIsICItLWRlc2NyaXB0aW9uIiwg YWN0aW9uPSJzdG9yZSIsIHR5cGU9InN0cmluZyIsIGRlc3Q9ImRlc2NyaXB0aW9uIiwgaGVscD0i RGVzY3JpcHRpb24gc3RyaW5nIGZvciB0aGUgYXR0YWNobWVudCAoZGVmYXVsdDogXCJwYXRjaFwi KSIpCiAgICAgY2MgPSBtYWtlX29wdGlvbigiLS1jYyIsIGFjdGlvbj0ic3RvcmUiLCB0eXBlPSJz dHJpbmciLCBkZXN0PSJjYyIsIGhlbHA9IkNvbW1hLXNlcGFyYXRlZCBsaXN0IG9mIGVtYWlsIGFk ZHJlc3NlcyB0byBjYXJib24tY29weS4iKQogICAgIGNvbXBvbmVudCA9IG1ha2Vfb3B0aW9uKCIt LWNvbXBvbmVudCIsIGFjdGlvbj0ic3RvcmUiLCB0eXBlPSJzdHJpbmciLCBkZXN0PSJjb21wb25l bnQiLCBoZWxwPSJDb21wb25lbnQgZm9yIHRoZSBuZXcgYnVnLiIpCisgICAgY29uZmlybSA9IG1h a2Vfb3B0aW9uKCItLW5vLWNvbmZpcm0iLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0iY29u ZmlybSIsIGRlZmF1bHQ9VHJ1ZSwgaGVscD0iU2tpcCBjb25maXJtYXRpb24gc3RlcHMuIikKIAog CiBjbGFzcyBBYnN0cmFjdFN0ZXAob2JqZWN0KToKQEAgLTE2MCw2ICsxNjEsMTEgQEAgY2xhc3Mg UHJlcGFyZUNoYW5nZUxvZ1N0ZXAoQWJzdHJhY3RTdGVwKToKICAgICAgICAgc2VsZi5fdG9vbC5l eGVjdXRpdmUucnVuX2FuZF90aHJvd19pZl9mYWlsKGFyZ3MsIHNlbGYuX29wdGlvbnMucXVpZXQp CiAKIAorY2xhc3MgRWRpdENoYW5nZUxvZ1N0ZXAoQWJzdHJhY3RTdGVwKToKKyAgICBkZWYgcnVu KHNlbGYsIHN0YXRlKToKKyAgICAgICAgc2VsZi5fdG9vbC51c2VyLmVkaXQoc2VsZi5fdG9vbC5z Y20oKS5tb2RpZmllZF9jaGFuZ2Vsb2dzKCkpCisKKwogY2xhc3MgT2Jzb2xldGVQYXRjaGVzT25C dWdTdGVwKEFic3RyYWN0U3RlcCk6CiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIG9wdGlvbnMo Y2xzKToKQEAgLTE3OSw3ICsxODUsMzIgQEAgY2xhc3MgT2Jzb2xldGVQYXRjaGVzT25CdWdTdGVw KEFic3RyYWN0U3RlcCk6CiAgICAgICAgICAgICBzZWxmLl90b29sLmJ1Z3Mub2Jzb2xldGVfYXR0 YWNobWVudChwYXRjaFsiaWQiXSkKIAogCi1jbGFzcyBQb3N0RGlmZlRvQnVnU3RlcChBYnN0cmFj dFN0ZXApOgorY2xhc3MgQWJzdHJhY3REaWZmU3RlcChBYnN0cmFjdFN0ZXApOgorICAgIGRlZiBk aWZmKHNlbGYsIHN0YXRlKToKKyAgICAgICAgZGlmZiA9IHN0YXRlLmdldCgiZGlmZiIpCisgICAg ICAgIGlmIG5vdCBkaWZmOgorICAgICAgICAgICAgZGlmZiA9IHNlbGYuX3Rvb2wuc2NtKCkuY3Jl YXRlX3BhdGNoKCkKKyAgICAgICAgICAgIHN0YXRlWyJkaWZmIl0gPSBkaWZmCisgICAgICAgIHJl dHVybiBkaWZmCisKKworY2xhc3MgQ29uZmlybURpZmZTdGVwKEFic3RyYWN0RGlmZlN0ZXApOgor ICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBvcHRpb25zKGNscyk6CisgICAgICAgIHJldHVybiBb CisgICAgICAgICAgICBDb21tYW5kT3B0aW9ucy5jb25maXJtLAorICAgICAgICBdCisKKyAgICBk ZWYgcnVuKHNlbGYsIHN0YXRlKToKKyAgICAgICAgaWYgbm90IHNlbGYuX29wdGlvbnMuY29uZmly bToKKyAgICAgICAgICAgIHJldHVybgorICAgICAgICBkaWZmID0gc2VsZi5kaWZmKHN0YXRlKQor ICAgICAgICBzZWxmLl90b29sLnVzZXIucGFnZShkaWZmKQorICAgICAgICBpZiBub3Qgc2VsZi5f dG9vbC51c2VyLmNvbmZpcm0oKToKKyAgICAgICAgICAgIGVycm9yKCJVc2VyIGRlY2xpbmVkIHRv IGNvbnRpbnVlLiIpCisKKworY2xhc3MgUG9zdERpZmZUb0J1Z1N0ZXAoQWJzdHJhY3REaWZmU3Rl cCk6CiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIG9wdGlvbnMoY2xzKToKICAgICAgICAgcmV0 dXJuIFsKQEAgLTE4OSw3ICsyMjAsNyBAQCBjbGFzcyBQb3N0RGlmZlRvQnVnU3RlcChBYnN0cmFj dFN0ZXApOgogICAgICAgICBdCiAKICAgICBkZWYgcnVuKHNlbGYsIHN0YXRlKToKLSAgICAgICAg ZGlmZiA9IHN0YXRlLmdldCgiZGlmZiIpIG9yIHNlbGYuX3Rvb2wuc2NtKCkuY3JlYXRlX3BhdGNo KCkKKyAgICAgICAgZGlmZiA9IHNlbGYuZGlmZihzdGF0ZSkKICAgICAgICAgZGlmZl9maWxlID0g U3RyaW5nSU8uU3RyaW5nSU8oZGlmZikgIyBhZGRfcGF0Y2hfdG9fYnVnIGV4cGVjdHMgYSBmaWxl LWxpa2Ugb2JqZWN0CiAgICAgICAgIGRlc2NyaXB0aW9uID0gc2VsZi5fb3B0aW9ucy5kZXNjcmlw dGlvbiBvciAiUGF0Y2giCiAgICAgICAgIHNlbGYuX3Rvb2wuYnVncy5hZGRfcGF0Y2hfdG9fYnVn KHN0YXRlWyJidWdfaWQiXSwgZGlmZl9maWxlLCBkZXNjcmlwdGlvbiwgbWFya19mb3JfcmV2aWV3 PXNlbGYuX29wdGlvbnMucmV2aWV3LCBtYXJrX2Zvcl9jb21taXRfcXVldWU9c2VsZi5fb3B0aW9u cy5yZXF1ZXN0X2NvbW1pdCkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxl cy9jb21tYW5kcy91cGxvYWQucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFu ZHMvdXBsb2FkLnB5CmluZGV4IDk4ZDNlZTkuLmE4NjE5YzAgMTAwNjQ0Ci0tLSBhL1dlYktpdFRv b2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy91cGxvYWQucHkKKysrIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3VwbG9hZC5weQpAQCAtMzYsNyArMzYsNyBAQCBpbXBv cnQgc3lzCiBmcm9tIG9wdHBhcnNlIGltcG9ydCBtYWtlX29wdGlvbgogCiBmcm9tIG1vZHVsZXMu YnVnemlsbGEgaW1wb3J0IHBhcnNlX2J1Z19pZAotZnJvbSBtb2R1bGVzLmJ1aWxkc3RlcHMgaW1w b3J0IFByZXBhcmVDaGFuZ2VMb2dTdGVwLCBDb21tYW5kT3B0aW9ucywgT2Jzb2xldGVQYXRjaGVz T25CdWdTdGVwLCBQb3N0RGlmZlRvQnVnU3RlcCwgUHJvbXB0Rm9yQnVnT3JUaXRsZVN0ZXAsIENy ZWF0ZUJ1Z1N0ZXAKK2Zyb20gbW9kdWxlcy5idWlsZHN0ZXBzIGltcG9ydCBQcmVwYXJlQ2hhbmdl TG9nU3RlcCwgRWRpdENoYW5nZUxvZ1N0ZXAsIENvbmZpcm1EaWZmU3RlcCwgQ29tbWFuZE9wdGlv bnMsIE9ic29sZXRlUGF0Y2hlc09uQnVnU3RlcCwgUG9zdERpZmZUb0J1Z1N0ZXAsIFByb21wdEZv ckJ1Z09yVGl0bGVTdGVwLCBDcmVhdGVCdWdTdGVwCiBmcm9tIG1vZHVsZXMuY29tbWFuZHMuZG93 bmxvYWQgaW1wb3J0IEFic3RyYWN0U2VxdWVuY2VkQ29tbW1hbmQKIGZyb20gbW9kdWxlcy5jb21t ZW50cyBpbXBvcnQgYnVnX2NvbW1lbnRfZnJvbV9zdm5fcmV2aXNpb24KIGZyb20gbW9kdWxlcy5n cmFtbWFyIGltcG9ydCBwbHVyYWxpemUKQEAgLTcyLDYgKzcyLDcgQEAgY2xhc3MgUG9zdERpZmYo QWJzdHJhY3RTZXF1ZW5jZWRDb21tbWFuZCk6CiAgICAgYXJndW1lbnRfbmFtZXMgPSAiW0JVR0lE XSIKICAgICBzaG93X2luX21haW5faGVscCA9IFRydWUKICAgICBzdGVwcyA9IFsKKyAgICAgICAg Q29uZmlybURpZmZTdGVwLAogICAgICAgICBPYnNvbGV0ZVBhdGNoZXNPbkJ1Z1N0ZXAsCiAgICAg ICAgIFBvc3REaWZmVG9CdWdTdGVwLAogICAgIF0KQEAgLTEwNCw2ICsxMDUsMjUgQEAgY2xhc3Mg UHJlcGFyZURpZmYoQWJzdHJhY3RTZXF1ZW5jZWRDb21tbWFuZCk6CiAgICAgICAgIHJldHVybiB7 ICJidWdfaWQiIDogYnVnX2lkIH0KIAogCitjbGFzcyBDcmVhdGVSZXZpZXcoQWJzdHJhY3RTZXF1 ZW5jZWRDb21tbWFuZCk6CisgICAgbmFtZSA9ICJjcmVhdGUtcmV2aWV3IgorICAgIGhlbHBfdGV4 dCA9ICJBZGRzIGEgQ2hhbmdlTG9nIHRvIHRoZSBjdXJyZW50IGRpZmYgYW5kIHBvc3RzIGl0IHRv IGEgKHBvc3NpYmx5IG5ldykgYnVnIgorICAgIGFyZ3VtZW50X25hbWVzID0gIltCVUdJRF0iCisg ICAgc3RlcHMgPSBbCisgICAgICAgIFByb21wdEZvckJ1Z09yVGl0bGVTdGVwLAorICAgICAgICBD cmVhdGVCdWdTdGVwLAorICAgICAgICBQcmVwYXJlQ2hhbmdlTG9nU3RlcCwKKyAgICAgICAgRWRp dENoYW5nZUxvZ1N0ZXAsCisgICAgICAgIENvbmZpcm1EaWZmU3RlcCwKKyAgICAgICAgT2Jzb2xl dGVQYXRjaGVzT25CdWdTdGVwLAorICAgICAgICBQb3N0RGlmZlRvQnVnU3RlcCwKKyAgICBdCisK KyAgICBkZWYgX3ByZXBhcmVfc3RhdGUoc2VsZiwgb3B0aW9ucywgYXJncywgdG9vbCk6CisgICAg ICAgIGJ1Z19pZCA9IGFyZ3MgYW5kIGFyZ3NbMF0KKyAgICAgICAgcmV0dXJuIHsgImJ1Z19pZCIg OiBidWdfaWQgfQorCisKIGNsYXNzIFBvc3RDb21taXRzKENvbW1hbmQpOgogICAgIG5hbWUgPSAi cG9zdC1jb21taXRzIgogICAgIHNob3dfaW5fbWFpbl9oZWxwID0gVHJ1ZQpkaWZmIC0tZ2l0IGEv V2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3VwbG9hZF91bml0dGVzdC5weSBi L1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy91cGxvYWRfdW5pdHRlc3QucHkK aW5kZXggMWRkMDFkMS4uMzdmMmQ0ZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9t b2R1bGVzL2NvbW1hbmRzL3VwbG9hZF91bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3Jp cHRzL21vZHVsZXMvY29tbWFuZHMvdXBsb2FkX3VuaXR0ZXN0LnB5CkBAIC00NSwzICs0NSw3IEBA IGNsYXNzIFVwbG9hZENvbW1hbmRzVGVzdChDb21tYW5kc1Rlc3QpOgogCiAgICAgZGVmIHRlc3Rf cHJlcGFyZV9kaWZmKHNlbGYpOgogICAgICAgICBzZWxmLmFzc2VydF9leGVjdXRlX291dHB1dHMo UHJlcGFyZURpZmYoKSwgW10pCisKKyAgICBkZWYgdGVzdF9jcmVhdGVfcmV2aWV3KHNlbGYpOgor ICAgICAgICBleHBlY3RlZF9zdGRlcnIgPSAiT2Jzb2xldGluZyAyIG9sZCBwYXRjaGVzIG9uIGJ1 ZyA0MlxuIgorICAgICAgICBzZWxmLmFzc2VydF9leGVjdXRlX291dHB1dHMoQ3JlYXRlUmV2aWV3 KCksIFs0Ml0sIGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCmRpZmYgLS1naXQgYS9X ZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvbW9ja19idWd6aWxsYXRvb2wucHkgYi9XZWJLaXRU b29scy9TY3JpcHRzL21vZHVsZXMvbW9ja19idWd6aWxsYXRvb2wucHkKaW5kZXggMjlhNGYwNS4u MGYzOTZkMCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL21vY2tfYnVn emlsbGF0b29sLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9tb2NrX2J1Z3pp bGxhdG9vbC5weQpAQCAtMTQ3LDYgKzE0NywxNSBAQCBjbGFzcyBNb2NrVXNlcihvYmplY3QpOgog ICAgIGRlZiBwcm9tcHQoc2VsZiwgbWVzc2FnZSk6CiAgICAgICAgIHJldHVybiAiTW9jayB1c2Vy IHJlc3BvbnNlIgogCisgICAgZGVmIGVkaXQoc2VsZiwgZmlsZXMpOgorICAgICAgICBwYXNzCisK KyAgICBkZWYgcGFnZShzZWxmLCBtZXNzYWdlKToKKyAgICAgICAgcGFzcworCisgICAgZGVmIGNv bmZpcm0oc2VsZik6CisgICAgICAgIHJldHVybiBUcnVlCisKIAogY2xhc3MgTW9ja1N0YXR1c0Jv dChvYmplY3QpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmKToKZGlmZiAtLWdpdCBhL1dlYktpdFRv b2xzL1NjcmlwdHMvbW9kdWxlcy91c2VyLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVz L3VzZXIucHkKaW5kZXggMWIwMjNmNC4uOGI3MjY3MyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy9tb2R1bGVzL3VzZXIucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVz L3VzZXIucHkKQEAgLTI2LDYgKzI2LDIyIEBACiAjIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBP VEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQogIyBPRiBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LgogCitpbXBvcnQgb3MKK2ltcG9ydCBzdWJwcm9jZXNzCisKIGNsYXNzIFVzZXIob2JqZWN0KToK ICAgICBkZWYgcHJvbXB0KHNlbGYsIG1lc3NhZ2UpOgogICAgICAgICByZXR1cm4gcmF3X2lucHV0 KG1lc3NhZ2UpCisKKyAgICBkZWYgZWRpdChzZWxmLCBmaWxlcyk6CisgICAgICAgIGVkaXRvciA9 IG9zLmVudmlyb24uZ2V0KCJFRElUT1IiKSBvciAidmkiCisgICAgICAgIHN1YnByb2Nlc3MuY2Fs bChbZWRpdG9yXSArIGZpbGVzKQorCisgICAgZGVmIHBhZ2Uoc2VsZiwgbWVzc2FnZSk6CisgICAg ICAgIHBhZ2VyID0gb3MuZW52aXJvbi5nZXQoIlBBR0VSIikgb3IgImxlc3MiCisgICAgICAgIGNo aWxkX3Byb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKFtwYWdlcl0sIHN0ZGluPXN1YnByb2Nlc3Mu UElQRSkKKyAgICAgICAgY2hpbGRfcHJvY2Vzcy5jb21tdW5pY2F0ZShpbnB1dD1tZXNzYWdlKQor CisgICAgZGVmIGNvbmZpcm0oc2VsZik6CisgICAgICAgIHJlc3BvbnNlID0gcmF3X2lucHV0KCJc bkNvbnRpbnVlPyBbWS9uXTogIikKKyAgICAgICAgcmV0dXJuIG5vdCByZXNwb25zZSBvciByZXNw b25zZS5sb3dlcigpID09ICJ5Igo=