47883 2010-10-18 22:46:26 -0700 webkit-patch stats the filesystem too many times 2010-10-19 08:21:27 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth abarth commit-queue eric oldest_to_newest 296006 0 abarth 2010-10-18 22:46:26 -0700 webkit-patch stats the filesystem too many times 296007 1 71133 abarth 2010-10-18 22:48:52 -0700 Created attachment 71133 Patch 296191 2 71133 eric 2010-10-19 08:02:47 -0700 Comment on attachment 71133 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=71133&action=review Seems OK. Thanks. > WebKitTools/Scripts/webkitpy/common/checkout/api.py:92 > absolute_paths = [os.path.join(self._scm.checkout_root, path) for path in changed_files] Seems we should just make a self._make_paths_absolute(paths) method, and then this entire _modified_files_matching_predicate function is redundant. > WebKitTools/Scripts/webkitpy/common/checkout/api.py:96 > + return self._modified_files_matching_predicate(git_commit, self._is_path_to_changelog, changed_files=changed_files) This then becomes: absolute_paths = self._make_paths_absolute(changed_files or self.scm.changed_files(git_commit)) return [path for path in absolute_paths if self._is_path_to_changelog(path)] > WebKitTools/Scripts/webkitpy/tool/steps/abstractstep.py:55 > _well_known_keys = { > - "diff": lambda self, state: self._tool.scm().create_patch(self._options.git_commit), > - "changelogs": lambda self, state: self._tool.checkout().modified_changelogs(self._options.git_commit), > "bug_title": lambda self, state: self._tool.bugs.fetch_bug(state["bug_id"]).title(), > + "changed_files": lambda self, state: self._tool.scm().changed_files(self._options.git_commit), > + "diff": lambda self, state: self._tool.scm().create_patch(self._options.git_commit, changed_files=self._changed_files(state)), > + "changelogs": lambda self, state: self._tool.checkout().modified_changelogs(self._options.git_commit, changed_files=self._changed_files(state)), It seems State needs to be its own object. These are just @property declarations for an object these days. > WebKitTools/Scripts/webkitpy/tool/steps/editchangelog.py:38 > + self.did_modify_checkout(state) We could be smart here and check if they actually modified the ChangeLog. :) 296205 3 71133 commit-queue 2010-10-19 08:21:22 -0700 Comment on attachment 71133 Patch Clearing flags on attachment: 71133 Committed r70059: <http://trac.webkit.org/changeset/70059> 296206 4 commit-queue 2010-10-19 08:21:27 -0700 All reviewed patches have been landed. Closing bug. 71133 2010-10-18 22:48:52 -0700 2010-10-19 08:21:22 -0700 Patch bug-47883-20101018224851.patch text/plain 9303 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA1MDBiNzdkN2Y2NmE3ZDUwYTdiMGE2NGI0YzViMmU1YjY3ZDRhZjMyLi4wNGRkMmQ3 ZWE4M2NlZWExYzc2YjhmODU0MDI4MjlhNmM3YWZlMWVhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAK KzIwMTAtMTAtMTggIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICB3ZWJraXQtcGF0Y2ggc3RhdHMg dGhlIGZpbGVzeXN0ZW0gdG9vIG1hbnkgdGltZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3ODgzCisKKyAgICAgICAgVGhpcyBwYXRjaCBhdHRlbXB0 cyB0byBjYWNoZSB0aGUgbGlzdCBvZiBjaGFuZ2VkIGZpbGVzIG1vcmUgYWdyZXNzaXZlbHkKKyAg ICAgICAgYW5kIHRvIHVzZSB0aGF0IGxpc3QgdG8gY29tcHV0ZSB0aGUgZGlmZiBpbnN0ZWFkIG9m IHN0YXRpbmcgdGhlIGZpbGUKKyAgICAgICAgc3lzdGVtIGFnYWluLgorCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvYXBpLnB5OgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L3Rvb2wvbW9ja3Rvb2wucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL3N0 ZXBzL2Fic3RyYWN0c3RlcC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3Rl cHMvZWRpdGNoYW5nZWxvZy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3Rl cHMvcHJlcGFyZWNoYW5nZWxvZy5weToKKwogMjAxMC0xMC0xOCAgRXJpYyBTZWlkZWwgIDxlcmlj QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdp dCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2FwaS5weSBi L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2FwaS5weQppbmRl eCA3ZGVhYzhmYjhlMzUyYzk0ZDkyNmM3M2JjYjg4MmNlZTNhZjc5MjYyLi43MmNhZDhkYzA4ZGZh NWYwYjQ5NDI1Mzk3NjJhODc3NzI5OTgxNzJlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9hcGkucHkKKysrIGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvYXBpLnB5CkBAIC04MywxOSArODMsMjAgQEAg Y2xhc3MgQ2hlY2tvdXQob2JqZWN0KToKICAgICBkZWYgYnVnX2lkX2Zvcl9yZXZpc2lvbihzZWxm LCByZXZpc2lvbik6CiAgICAgICAgIHJldHVybiBzZWxmLmNvbW1pdF9pbmZvX2Zvcl9yZXZpc2lv bihyZXZpc2lvbikuYnVnX2lkKCkKIAotICAgIGRlZiBfbW9kaWZpZWRfZmlsZXNfbWF0Y2hpbmdf cHJlZGljYXRlKHNlbGYsIGdpdF9jb21taXQsIHByZWRpY2F0ZSk6CisgICAgZGVmIF9tb2RpZmll ZF9maWxlc19tYXRjaGluZ19wcmVkaWNhdGUoc2VsZiwgZ2l0X2NvbW1pdCwgcHJlZGljYXRlLCBj aGFuZ2VkX2ZpbGVzPU5vbmUpOgogICAgICAgICAjIFNDTSByZXR1cm5zIHBhdGhzIHJlbGF0aXZl IHRvIHNjbS5jaGVja291dF9yb290CiAgICAgICAgICMgQ2FsbGVycyAoZXNwZWNpYWxseSB0aG9z ZSB1c2luZyB0aGUgQ2hhbmdlTG9nIGNsYXNzKSBtYXkKICAgICAgICAgIyBleHBlY3QgYWJzb2x1 dGUgcGF0aHMsIHNvIHRoaXMgbWV0aG9kIHJldHVybnMgYWJzb2x1dGUgcGF0aHMuCi0gICAgICAg IGNoYW5nZWRfZmlsZXMgPSBzZWxmLl9zY20uY2hhbmdlZF9maWxlcyhnaXRfY29tbWl0KQorICAg ICAgICBpZiBub3QgY2hhbmdlZF9maWxlczoKKyAgICAgICAgICAgIGNoYW5nZWRfZmlsZXMgPSBz ZWxmLl9zY20uY2hhbmdlZF9maWxlcyhnaXRfY29tbWl0KQogICAgICAgICBhYnNvbHV0ZV9wYXRo cyA9IFtvcy5wYXRoLmpvaW4oc2VsZi5fc2NtLmNoZWNrb3V0X3Jvb3QsIHBhdGgpIGZvciBwYXRo IGluIGNoYW5nZWRfZmlsZXNdCiAgICAgICAgIHJldHVybiBbcGF0aCBmb3IgcGF0aCBpbiBhYnNv bHV0ZV9wYXRocyBpZiBwcmVkaWNhdGUocGF0aCldCiAKLSAgICBkZWYgbW9kaWZpZWRfY2hhbmdl bG9ncyhzZWxmLCBnaXRfY29tbWl0KToKLSAgICAgICAgcmV0dXJuIHNlbGYuX21vZGlmaWVkX2Zp bGVzX21hdGNoaW5nX3ByZWRpY2F0ZShnaXRfY29tbWl0LCBzZWxmLl9pc19wYXRoX3RvX2NoYW5n ZWxvZykKKyAgICBkZWYgbW9kaWZpZWRfY2hhbmdlbG9ncyhzZWxmLCBnaXRfY29tbWl0LCBjaGFu Z2VkX2ZpbGVzPU5vbmUpOgorICAgICAgICByZXR1cm4gc2VsZi5fbW9kaWZpZWRfZmlsZXNfbWF0 Y2hpbmdfcHJlZGljYXRlKGdpdF9jb21taXQsIHNlbGYuX2lzX3BhdGhfdG9fY2hhbmdlbG9nLCBj aGFuZ2VkX2ZpbGVzPWNoYW5nZWRfZmlsZXMpCiAKLSAgICBkZWYgbW9kaWZpZWRfbm9uX2NoYW5n ZWxvZ3Moc2VsZiwgZ2l0X2NvbW1pdCk6Ci0gICAgICAgIHJldHVybiBzZWxmLl9tb2RpZmllZF9m aWxlc19tYXRjaGluZ19wcmVkaWNhdGUoZ2l0X2NvbW1pdCwgbGFtYmRhIHBhdGg6IG5vdCBzZWxm Ll9pc19wYXRoX3RvX2NoYW5nZWxvZyhwYXRoKSkKKyAgICBkZWYgbW9kaWZpZWRfbm9uX2NoYW5n ZWxvZ3Moc2VsZiwgZ2l0X2NvbW1pdCwgY2hhbmdlZF9maWxlcz1Ob25lKToKKyAgICAgICAgcmV0 dXJuIHNlbGYuX21vZGlmaWVkX2ZpbGVzX21hdGNoaW5nX3ByZWRpY2F0ZShnaXRfY29tbWl0LCBs YW1iZGEgcGF0aDogbm90IHNlbGYuX2lzX3BhdGhfdG9fY2hhbmdlbG9nKHBhdGgpLCBjaGFuZ2Vk X2ZpbGVzPWNoYW5nZWRfZmlsZXMpCiAKICAgICBkZWYgY29tbWl0X21lc3NhZ2VfZm9yX3RoaXNf Y29tbWl0KHNlbGYsIGdpdF9jb21taXQpOgogICAgICAgICBjaGFuZ2Vsb2dfcGF0aHMgPSBzZWxm Lm1vZGlmaWVkX2NoYW5nZWxvZ3MoZ2l0X2NvbW1pdCkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS5weSBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS5weQppbmRleCBhNzEyMDFlMmIzNDAw OGMyMGEwMTMyMjMwOGIwN2U3NWFlNzRmYjIzLi5iOTgyMzQ4ODc1YjZlNGY5ZTFmZTNiNTAxYTUw MjM4Yzc2NDMxMzc0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9jaGVja291dC9zY20ucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vY2hlY2tvdXQvc2NtLnB5CkBAIC0yNjAsNyArMjYwLDcgQEAgY2xhc3MgU0NNOgogICAg IGRlZiBkaXNwbGF5X25hbWUoc2VsZik6CiAgICAgICAgIHNlbGYuX3N1YmNsYXNzX211c3RfaW1w bGVtZW50KCkKIAotICAgIGRlZiBjcmVhdGVfcGF0Y2goc2VsZiwgZ2l0X2NvbW1pdD1Ob25lKToK KyAgICBkZWYgY3JlYXRlX3BhdGNoKHNlbGYsIGdpdF9jb21taXQ9Tm9uZSwgY2hhbmdlZF9maWxl cz1bXSk6CiAgICAgICAgIHNlbGYuX3N1YmNsYXNzX211c3RfaW1wbGVtZW50KCkKIAogICAgIGRl ZiBjb21taXR0ZXJfZW1haWxfZm9yX3JldmlzaW9uKHNlbGYsIHJldmlzaW9uKToKQEAgLTQ1Nywx MSArNDU3LDExIEBAIGNsYXNzIFNWTihTQ00pOgogICAgICAgICByZXR1cm4gInN2biIKIAogICAg ICMgRklYTUU6IFRoaXMgbWV0aG9kIHNob3VsZCBiZSBvbiBDaGVja291dC4KLSAgICBkZWYgY3Jl YXRlX3BhdGNoKHNlbGYsIGdpdF9jb21taXQ9Tm9uZSk6CisgICAgZGVmIGNyZWF0ZV9wYXRjaChz ZWxmLCBnaXRfY29tbWl0PU5vbmUsIGNoYW5nZWRfZmlsZXM9W10pOgogICAgICAgICAiIiJSZXR1 cm5zIGEgYnl0ZSBhcnJheSAoc3RyKCkpIHJlcHJlc2VudGluZyB0aGUgcGF0Y2ggZmlsZS4KICAg ICAgICAgUGF0Y2ggZmlsZXMgYXJlIGVmZmVjdGl2ZWx5IGJpbmFyeSBzaW5jZSB0aGV5IG1heSBj b250YWluCiAgICAgICAgIGZpbGVzIG9mIG11bHRpcGxlIGRpZmZlcmVudCBlbmNvZGluZ3MuIiIi Ci0gICAgICAgIHJldHVybiBzZWxmLnJ1bihbc2VsZi5zY3JpcHRfcGF0aCgic3ZuLWNyZWF0ZS1w YXRjaCIpXSwKKyAgICAgICAgcmV0dXJuIHNlbGYucnVuKFtzZWxmLnNjcmlwdF9wYXRoKCJzdm4t Y3JlYXRlLXBhdGNoIildICsgY2hhbmdlZF9maWxlcywKICAgICAgICAgICAgIGN3ZD1zZWxmLmNo ZWNrb3V0X3Jvb3QsIHJldHVybl9zdGRlcnI9RmFsc2UsCiAgICAgICAgICAgICBkZWNvZGVfb3V0 cHV0PUZhbHNlKQogCkBAIC02ODksMTIgKzY4OSwxMiBAQCBjbGFzcyBHaXQoU0NNKToKICAgICBk ZWYgZGlzcGxheV9uYW1lKHNlbGYpOgogICAgICAgICByZXR1cm4gImdpdCIKIAotICAgIGRlZiBj cmVhdGVfcGF0Y2goc2VsZiwgZ2l0X2NvbW1pdD1Ob25lKToKKyAgICBkZWYgY3JlYXRlX3BhdGNo KHNlbGYsIGdpdF9jb21taXQ9Tm9uZSwgY2hhbmdlZF9maWxlcz1bXSk6CiAgICAgICAgICIiIlJl dHVybnMgYSBieXRlIGFycmF5IChzdHIoKSkgcmVwcmVzZW50aW5nIHRoZSBwYXRjaCBmaWxlLgog ICAgICAgICBQYXRjaCBmaWxlcyBhcmUgZWZmZWN0aXZlbHkgYmluYXJ5IHNpbmNlIHRoZXkgbWF5 IGNvbnRhaW4KICAgICAgICAgZmlsZXMgb2YgbXVsdGlwbGUgZGlmZmVyZW50IGVuY29kaW5ncy4i IiIKICAgICAgICAgIyBGSVhNRTogVGhpcyBzaG91bGQgcHJvYmFibHkgdXNlIGN3ZD1zZWxmLmNo ZWNrb3V0X3Jvb3QKLSAgICAgICAgcmV0dXJuIHNlbGYucnVuKFsnZ2l0JywgJ2RpZmYnLCAnLS1i aW5hcnknLCAiLS1uby1leHQtZGlmZiIsICItLWZ1bGwtaW5kZXgiLCAiLU0iLCBzZWxmLm1lcmdl X2Jhc2UoZ2l0X2NvbW1pdCldLCBkZWNvZGVfb3V0cHV0PUZhbHNlKQorICAgICAgICByZXR1cm4g c2VsZi5ydW4oWydnaXQnLCAnZGlmZicsICctLWJpbmFyeScsICItLW5vLWV4dC1kaWZmIiwgIi0t ZnVsbC1pbmRleCIsICItTSIsIHNlbGYubWVyZ2VfYmFzZShnaXRfY29tbWl0KV0gKyBjaGFuZ2Vk X2ZpbGVzLCBkZWNvZGVfb3V0cHV0PUZhbHNlKQogCiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVm IGdpdF9jb21taXRfZnJvbV9zdm5fcmV2aXNpb24oY2xzLCByZXZpc2lvbik6CmRpZmYgLS1naXQg YS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbW9ja3Rvb2wucHkgYi9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbW9ja3Rvb2wucHkKaW5kZXggY2U1ZmEwMjM5MGM2 Yjk2N2JlOTc5ZWVkNzRiM2U3MDRjNGM0M2MyNy4uMTFiOWNhZGQ3Y2Y3NDNmMDBiZWNjZDM2MGY4 NWZjYmRlM2Y3YjdkMCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL21vY2t0b29sLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9t b2NrdG9vbC5weQpAQCAtNDI5LDcgKzQyOSw3IEBAIGNsYXNzIE1vY2tTQ00oTW9jayk6CiAgICAg ICAgICMgd2lsbCBhY3R1YWxseSBiZSB0aGUgcm9vdC4gIFNpbmNlIGdldGN3ZCgpIGlzIHdyb25n LCB1c2UgYSBnbG9iYWxseSBmYWtlIHJvb3QgZm9yIG5vdy4KICAgICAgICAgc2VsZi5jaGVja291 dF9yb290ID0gc2VsZi5mYWtlX2NoZWNrb3V0X3Jvb3QKIAotICAgIGRlZiBjcmVhdGVfcGF0Y2go c2VsZiwgZ2l0X2NvbW1pdCk6CisgICAgZGVmIGNyZWF0ZV9wYXRjaChzZWxmLCBnaXRfY29tbWl0 LCBjaGFuZ2VkX2ZpbGVzPU5vbmUpOgogICAgICAgICByZXR1cm4gIlBhdGNoMSIKIAogICAgIGRl ZiBjb21taXRfaWRzX2Zyb21fY29tbWl0aXNoX2FyZ3VtZW50cyhzZWxmLCBhcmdzKToKQEAgLTQ3 NSw3ICs0NzUsNyBAQCBjbGFzcyBNb2NrQ2hlY2tvdXQob2JqZWN0KToKICAgICBkZWYgcmVjZW50 X2NvbW1pdF9pbmZvc19mb3JfZmlsZXMoc2VsZiwgcGF0aHMpOgogICAgICAgICByZXR1cm4gW3Nl bGYuY29tbWl0X2luZm9fZm9yX3JldmlzaW9uKDMyKV0KIAotICAgIGRlZiBtb2RpZmllZF9jaGFu Z2Vsb2dzKHNlbGYsIGdpdF9jb21taXQpOgorICAgIGRlZiBtb2RpZmllZF9jaGFuZ2Vsb2dzKHNl bGYsIGdpdF9jb21taXQsIGNoYW5nZWRfZmlsZXM9Tm9uZSk6CiAgICAgICAgICMgSWRlYWxseSB3 ZSdkIHJldHVybiBzb21ldGhpbmcgbW9yZSBpbnRlcmVzdGluZyBoZXJlLiAgVGhlIHByb2JsZW0g aXMKICAgICAgICAgIyB0aGF0IExhbmREaWZmIHdpbGwgdHJ5IHRvIGFjdHVhbGx5IHJlYWQgdGhl IHBhdGNoIGZyb20gZGlzayEKICAgICAgICAgcmV0dXJuIFtdCmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvYWJzdHJhY3RzdGVwLnB5IGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL2Fic3RyYWN0c3RlcC5weQppbmRleCAw MmE4NzZhYTVkMDQyZWY5YTIzOGVlY2E4NTFkNmYzMDE2NWIxYjE5Li41NTI1ZWEwOGI1NjgxZDgx ZDg1YzBmYjU0MzQyMjNiZDAyZjAxNjMwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvc3RlcHMvYWJzdHJhY3RzdGVwLnB5CisrKyBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9hYnN0cmFjdHN0ZXAucHkKQEAgLTQ1LDEwICs0NSwx NCBAQCBjbGFzcyBBYnN0cmFjdFN0ZXAob2JqZWN0KToKICAgICAgICAgICAgIGNvbW1hbmQuZXh0 ZW5kKGFyZ3MpCiAgICAgICAgIHNlbGYuX3Rvb2wuZXhlY3V0aXZlLnJ1bl9hbmRfdGhyb3dfaWZf ZmFpbChjb21tYW5kLCBxdWlldCkKIAorICAgIGRlZiBfY2hhbmdlZF9maWxlcyhzZWxmLCBzdGF0 ZSk6CisgICAgICAgIHJldHVybiBzZWxmLmNhY2hlZF9sb29rdXAoc3RhdGUsICJjaGFuZ2VkX2Zp bGVzIikKKwogICAgIF93ZWxsX2tub3duX2tleXMgPSB7Ci0gICAgICAgICJkaWZmIjogbGFtYmRh IHNlbGYsIHN0YXRlOiBzZWxmLl90b29sLnNjbSgpLmNyZWF0ZV9wYXRjaChzZWxmLl9vcHRpb25z LmdpdF9jb21taXQpLAotICAgICAgICAiY2hhbmdlbG9ncyI6IGxhbWJkYSBzZWxmLCBzdGF0ZTog c2VsZi5fdG9vbC5jaGVja291dCgpLm1vZGlmaWVkX2NoYW5nZWxvZ3Moc2VsZi5fb3B0aW9ucy5n aXRfY29tbWl0KSwKICAgICAgICAgImJ1Z190aXRsZSI6IGxhbWJkYSBzZWxmLCBzdGF0ZTogc2Vs Zi5fdG9vbC5idWdzLmZldGNoX2J1ZyhzdGF0ZVsiYnVnX2lkIl0pLnRpdGxlKCksCisgICAgICAg ICJjaGFuZ2VkX2ZpbGVzIjogbGFtYmRhIHNlbGYsIHN0YXRlOiBzZWxmLl90b29sLnNjbSgpLmNo YW5nZWRfZmlsZXMoc2VsZi5fb3B0aW9ucy5naXRfY29tbWl0KSwKKyAgICAgICAgImRpZmYiOiBs YW1iZGEgc2VsZiwgc3RhdGU6IHNlbGYuX3Rvb2wuc2NtKCkuY3JlYXRlX3BhdGNoKHNlbGYuX29w dGlvbnMuZ2l0X2NvbW1pdCwgY2hhbmdlZF9maWxlcz1zZWxmLl9jaGFuZ2VkX2ZpbGVzKHN0YXRl KSksCisgICAgICAgICJjaGFuZ2Vsb2dzIjogbGFtYmRhIHNlbGYsIHN0YXRlOiBzZWxmLl90b29s LmNoZWNrb3V0KCkubW9kaWZpZWRfY2hhbmdlbG9ncyhzZWxmLl9vcHRpb25zLmdpdF9jb21taXQs IGNoYW5nZWRfZmlsZXM9c2VsZi5fY2hhbmdlZF9maWxlcyhzdGF0ZSkpLAogICAgIH0KIAogICAg IGRlZiBjYWNoZWRfbG9va3VwKHNlbGYsIHN0YXRlLCBrZXksIHByb21pc2U9Tm9uZSk6CkBAIC01 OSw2ICs2MywxMSBAQCBjbGFzcyBBYnN0cmFjdFN0ZXAob2JqZWN0KToKICAgICAgICAgc3RhdGVb a2V5XSA9IHByb21pc2Uoc2VsZiwgc3RhdGUpCiAgICAgICAgIHJldHVybiBzdGF0ZVtrZXldCiAK KyAgICBkZWYgZGlkX21vZGlmeV9jaGVja291dChzZWxmLCBzdGF0ZSk6CisgICAgICAgIHN0YXRl WyJkaWZmIl0gPSBOb25lCisgICAgICAgIHN0YXRlWyJjaGFuZ2Vsb2dzIl0gPSBOb25lCisgICAg ICAgIHN0YXRlWyJjaGFuZ2VkX2ZpbGVzIl0gPSBOb25lCisKICAgICBAY2xhc3NtZXRob2QKICAg ICBkZWYgb3B0aW9ucyhjbHMpOgogICAgICAgICByZXR1cm4gWwpkaWZmIC0tZ2l0IGEvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL2VkaXRjaGFuZ2Vsb2cucHkgYi9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvZWRpdGNoYW5nZWxvZy5weQppbmRl eCBkZTliNGU0MTk3OGVlNWNjZjYzZGM1ZGIzNzg5YzQyNDUxNDczZDFlLi40ZDk2NDZmN2UwODVl OTM3YWZmYzliZjNhNzdhZWFhOGI1OTMwYzMzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvZWRpdGNoYW5nZWxvZy5weQorKysgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvZWRpdGNoYW5nZWxvZy5weQpAQCAtMzUsMyAr MzUsNCBAQCBjbGFzcyBFZGl0Q2hhbmdlTG9nKEFic3RyYWN0U3RlcCk6CiAgICAgZGVmIHJ1bihz ZWxmLCBzdGF0ZSk6CiAgICAgICAgIG9zLmNoZGlyKHNlbGYuX3Rvb2wuc2NtKCkuY2hlY2tvdXRf cm9vdCkKICAgICAgICAgc2VsZi5fdG9vbC51c2VyLmVkaXRfY2hhbmdlbG9nKHNlbGYuY2FjaGVk X2xvb2t1cChzdGF0ZSwgImNoYW5nZWxvZ3MiKSkKKyAgICAgICAgc2VsZi5kaWRfbW9kaWZ5X2No ZWNrb3V0KHN0YXRlKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL3N0ZXBzL3ByZXBhcmVjaGFuZ2Vsb2cucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L3Rvb2wvc3RlcHMvcHJlcGFyZWNoYW5nZWxvZy5weQppbmRleCAwMzgyNzM4ODZkNjRmNTM2 Nzg5ZjhlZjhmYjMwZTgxYWI0NTdkYTRjLi4wOTlkZmUzNmUzMWFhYjQ2MjlhMWZiZDIxMDU0NTBk MDA0YTlkYjIzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv c3RlcHMvcHJlcGFyZWNoYW5nZWxvZy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L3Rvb2wvc3RlcHMvcHJlcGFyZWNoYW5nZWxvZy5weQpAQCAtNzQsNCArNzQsNCBAQCBjbGFz cyBQcmVwYXJlQ2hhbmdlTG9nKEFic3RyYWN0U3RlcCk6CiAgICAgICAgICAgICBzZWxmLl90b29s LmV4ZWN1dGl2ZS5ydW5fYW5kX3Rocm93X2lmX2ZhaWwoYXJncywgc2VsZi5fb3B0aW9ucy5xdWll dCkKICAgICAgICAgZXhjZXB0IFNjcmlwdEVycm9yLCBlOgogICAgICAgICAgICAgZXJyb3IoIlVu YWJsZSB0byBwcmVwYXJlIENoYW5nZUxvZ3MuIikKLSAgICAgICAgc3RhdGVbImRpZmYiXSA9IE5v bmUgIyBXZSd2ZSBjaGFuZ2VkIHRoZSBkaWZmCisgICAgICAgIHNlbGYuZGlkX21vZGlmeV9jaGVj a291dChzdGF0ZSkK