26734 2009-06-25 14:55:02 -0700 bugzilla-tool land-and-update needs to fix reviewers in ChangeLogs 2009-06-29 13:44:15 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned levin mrowe vestbo oldest_to_newest 128282 0 eric 2009-06-25 14:55:02 -0700 bugzilla-tool land-and-update needs to fix reviewers in ChangeLogs Right now it just tries to commit and update the bug, but doesn't fix up the ChangeLogs to have a reviewer. This command is meant for when you're landing your own patches which have been reviewed and are already in your tree (possibly with reviewer-suggested modifications). It would be easy to grab the reviewer off the patch on the bug (assuming there is only one patch). We can error-out if there is more than one patch I guess. 128604 1 eric 2009-06-26 17:57:00 -0700 Ok. I've changed "land-and-update" to the shorter "land-diff". I've also made land-diff know how to build and test before actually committing. I've also made land-diff's bug_id parameter optional (since sometimes you want to land changes which don't have a bug, but you do want to do want the automated goodness of reviewer setting and one more final build and test before landing.) 128606 2 31962 eric 2009-06-26 18:02:36 -0700 Created attachment 31962 First attempt 128778 3 31962 levin 2009-06-28 23:03:52 -0700 Comment on attachment 31962 First attempt A few minor things to fix. Free to fix up and submit (unless you do larger changes and want another review of it). > diff --git a/WebKitTools/Scripts/bugzilla-tool b/WebKitTools/Scripts/bugzilla-tool > @@ -86,6 +87,11 @@ def latest_changelog_entry(changelog_path): > +def set_reviewer_in_changelog(changelog_path, reviewer): > + # inplace=1 creates a backup file and re-directs stdout to the file > + for line in fileinput.FileInput(changelog_path, inplace=1): > + print line.replace("NOBODY (OOPS!)", reviewer), Two comments: 1. Indent off by one space ("print line....") 2. Why is there a comma at the end of this line? (Can it be removed?) > class LandAndUpdateBug(Command): > def execute(self, options, args, tool): > + self.update_changelogs_with_reviewer(options.reviewer, bug_id, tool) > + It seems like it should update the date in the changelog as well. Could be a fix me for now. > + else: > + log(comment_text) If the comment contains characters like \n, then I think it will mess up the output. Maybe the log function should be updated to look like this def log(string): print >> sys.stderr, "%s" % string 128876 4 eric 2009-06-29 13:39:08 -0700 (In reply to comment #3) > (From update of attachment 31962 [review]) > A few minor things to fix. Free to fix up and submit (unless you do larger > changes and want another review of it). Thanks! > > diff --git a/WebKitTools/Scripts/bugzilla-tool b/WebKitTools/Scripts/bugzilla-tool > > @@ -86,6 +87,11 @@ def latest_changelog_entry(changelog_path): > > +def set_reviewer_in_changelog(changelog_path, reviewer): > > + # inplace=1 creates a backup file and re-directs stdout to the file > > + for line in fileinput.FileInput(changelog_path, inplace=1): > > + print line.replace("NOBODY (OOPS!)", reviewer), > > Two comments: > 1. Indent off by one space ("print line....") > 2. Why is there a comma at the end of this line? (Can it be removed?) 1. Fixed 2. To make print not add a newline when printing: http://www.python.org/doc/2.4.4/ref/print.html A "\n" character is written at the end, unless the print statement ends with a comma. This is the only action if the statement contains just the keyword print. > > class LandAndUpdateBug(Command): > > def execute(self, options, args, tool): > > + self.update_changelogs_with_reviewer(options.reviewer, bug_id, tool) > > + > > It seems like it should update the date in the changelog as well. Could be a > fix me for now. Yeah. Will add a FIXME for now. > > + else: > > + log(comment_text) > > If the comment contains characters like \n, then I think it will mess up the > output. Maybe the log function should be updated to look like this > > def log(string): > print >> sys.stderr, "%s" % string log("foo\nbar") seems to work just fine? Thanks for the review! 128878 5 eric 2009-06-29 13:44:15 -0700 Git got upset with itself. But this landed as r45351. 31962 2009-06-26 18:02:36 -0700 2009-06-28 23:03:52 -0700 First attempt bugzilla_requires_a_filename.patch text/plain 7432 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA0NjE3NTNlLi43NzQ1YWU3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMDktMDYt MjYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbmFtZSBsYW5kLWFuZC11cGRhdGUgdG8gbGFu ZC1kaWZmIGFuZCBtYWtlIGl0IGF3ZXNvbWUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yNjczNAorCisgICAgICAgIFJlbmFtZWQgbGFuZC1hbmQtdXBk YXRlIHRvIGxhbmQtZGlmZgorICAgICAgICBNYWRlIHRoZSBCVUdJRCBhcmd1bWVudCBvcHRpb25h bC4KKyAgICAgICAgQWRkZWQgb3B0aW9uYWwgc3VwcG9ydCBmb3IgYnVpbGRpbmcgYW5kIHRlc3Rp bmcgYmVmb3JlIGxhbmRpbmcuCisKKyAgICAgICAgbGFuZC1kaWZmIFtvcHRpb25zXSBbQlVHSURd ICAgIExhbmRzIHRoZSBjdXJyZW50IHdvcmtpbmcgZGlyZWN0b3J5IGRpZmYgYW5kIHVwZGF0ZXMg dGhlIGJ1ZyBpZiBwcm92aWRlZC4KKyAgICAgICAgICBPcHRpb25zOgorICAgICAgICAgICAgLXIg UkVWSUVXRVIsIC0tcmV2aWV3ZXI9UkVWSUVXRVIKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFVwZGF0ZSBDaGFuZ2VMb2dzIHRvIHNheSBSZXZpZXdlZCBieSBSRVZJRVdFUi4KKyAgICAg ICAgICAgIC0tbm8tY2xvc2UgICAgICAgIExlYXZlIGJ1ZyBvcGVuIGFmdGVyIGxhbmRpbmcuCisg ICAgICAgICAgICAtLW5vLWJ1aWxkICAgICAgICBDb21taXQgd2l0aG91dCBidWlsZGluZyBmaXJz dCwgaW1wbGllcyAtLW5vLXRlc3QuCisgICAgICAgICAgICAtLW5vLXRlc3QgICAgICAgICBDb21t aXQgd2l0aG91dCBydW5uaW5nIHJ1bi13ZWJraXQtdGVzdHMuCisKKyAgICAgICAgKiBTY3JpcHRz L2J1Z3ppbGxhLXRvb2w6CisKIDIwMDktMDYtMjYgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBw bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcKZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbCBiL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVn emlsbGEtdG9vbAppbmRleCA0NDMzMDdlLi5lMDA0ZjNkIDEwMDc1NQotLS0gYS9XZWJLaXRUb29s cy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxs YS10b29sCkBAIC0yOSw2ICsyOSw3IEBACiAjCiAjIEEgdG9vbCBmb3IgYXV0b21hdGluZyBkZWFs aW5nIHdpdGggYnVnemlsbGEsIHBvc3RpbmcgcGF0Y2hlcywgY29tbWl0dGluZyBwYXRjaGVzLCBl dGMuCiAKK2ltcG9ydCBmaWxlaW5wdXQgIyBpbnBsYWNlIGZpbGUgZWRpdGluZyBmb3Igc2V0X3Jl dmlld2VyX2luX2NoYW5nZWxvZwogaW1wb3J0IG9zCiBpbXBvcnQgcmUKIGltcG9ydCBzdWJwcm9j ZXNzCkBAIC04Niw2ICs4NywxMSBAQCBkZWYgbGF0ZXN0X2NoYW5nZWxvZ19lbnRyeShjaGFuZ2Vs b2dfcGF0aCk6CiAgICAgIyBXZSBuZXZlciBmb3VuZCBhIGRhdGUgbGluZSEKICAgICByZXR1cm4g Tm9uZQogCitkZWYgc2V0X3Jldmlld2VyX2luX2NoYW5nZWxvZyhjaGFuZ2Vsb2dfcGF0aCwgcmV2 aWV3ZXIpOgorICAgICMgaW5wbGFjZT0xIGNyZWF0ZXMgYSBiYWNrdXAgZmlsZSBhbmQgcmUtZGly ZWN0cyBzdGRvdXQgdG8gdGhlIGZpbGUKKyAgICBmb3IgbGluZSBpbiBmaWxlaW5wdXQuRmlsZUlu cHV0KGNoYW5nZWxvZ19wYXRoLCBpbnBsYWNlPTEpOgorICAgICAgIHByaW50IGxpbmUucmVwbGFj ZSgiTk9CT0RZIChPT1BTISkiLCByZXZpZXdlciksCisKIGRlZiBtb2RpZmllZF9jaGFuZ2Vsb2dz KHNjbSk6CiAgICAgY2hhbmdlbG9nX3BhdGhzID0gW10KICAgICBwYXRocyA9IHNjbS5jaGFuZ2Vk X2ZpbGVzKCkKQEAgLTk3LDcgKzEwMyw5IEBAIGRlZiBtb2RpZmllZF9jaGFuZ2Vsb2dzKHNjbSk6 CiBkZWYgY29tbWl0X21lc3NhZ2VfZm9yX3RoaXNfY29tbWl0KHNjbSk6CiAgICAgY2hhbmdlbG9n X3BhdGhzID0gbW9kaWZpZWRfY2hhbmdlbG9ncyhzY20pCiAgICAgaWYgbm90IGxlbihjaGFuZ2Vs b2dfcGF0aHMpOgotICAgICAgICBlcnJvcigiRm91bmQgbm8gbW9kaWZpZWQgQ2hhbmdlTG9ncywg Y2FuJ3QgY3JlYXRlIGEgY29tbWl0IG1lc3NhZ2UuIikKKyAgICAgICAgZXJyb3IoIkZvdW5kIG5v IG1vZGlmaWVkIENoYW5nZUxvZ3MsIGNhbm5vdCBjcmVhdGUgYSBjb21taXQgbWVzc2FnZS5cbiIK KyAgICAgICAgICAgICAgIkFsbCBjaGFuZ2VzIHJlcXVpcmUgYSBDaGFuZ2VMb2cuICBTZWU6XG4i CisgICAgICAgICAgICAgICJodHRwOi8vd2Via2l0Lm9yZy9jb2RpbmcvY29udHJpYnV0aW5nLmh0 bWwiKQogCiAgICAgY2hhbmdlbG9nX21lc3NhZ2VzID0gW10KICAgICBmb3IgcGF0aCBpbiBjaGFu Z2Vsb2dfcGF0aHM6CkBAIC0yMTEsMTYgKzIxOSw1NyBAQCBkZWYgYnVnX2NvbW1lbnRfZnJvbV9j b21taXRfdGV4dChjb21taXRfdGV4dCk6CiAKIGNsYXNzIExhbmRBbmRVcGRhdGVCdWcoQ29tbWFu ZCk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYpOgotICAgICAgICBDb21tYW5kLl9faW5pdF9fKHNl bGYsICdMYW5kcyB0aGUgY3VycmVudCB3b3JraW5nIGRpcmVjdG9yeSBkaWZmIGFuZCB1cGRhdGVz IHRoZSBidWcuJywgJ0JVR0lEJykKKyAgICAgICAgb3B0aW9ucyA9IFsKKyAgICAgICAgICAgIG1h a2Vfb3B0aW9uKCItciIsICItLXJldmlld2VyIiwgYWN0aW9uPSJzdG9yZSIsIHR5cGU9InN0cmlu ZyIsIGRlc3Q9InJldmlld2VyIiwgaGVscD0iVXBkYXRlIENoYW5nZUxvZ3MgdG8gc2F5IFJldmll d2VkIGJ5IFJFVklFV0VSLiIpLAorICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0tbm8tY2xvc2Ui LCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0iY2xvc2VfYnVnIiwgZGVmYXVsdD1UcnVlLCBo ZWxwPSJMZWF2ZSBidWcgb3BlbiBhZnRlciBsYW5kaW5nLiIpLAorICAgICAgICAgICAgbWFrZV9v cHRpb24oIi0tbm8tYnVpbGQiLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwgZGVzdD0iYnVpbGQiLCBk ZWZhdWx0PVRydWUsIGhlbHA9IkNvbW1pdCB3aXRob3V0IGJ1aWxkaW5nIGZpcnN0LCBpbXBsaWVz IC0tbm8tdGVzdC4iKSwKKyAgICAgICAgICAgIG1ha2Vfb3B0aW9uKCItLW5vLXRlc3QiLCBhY3Rp b249InN0b3JlX2ZhbHNlIiwgZGVzdD0idGVzdCIsIGRlZmF1bHQ9VHJ1ZSwgaGVscD0iQ29tbWl0 IHdpdGhvdXQgcnVubmluZyBydW4td2Via2l0LXRlc3RzLiIpLAorICAgICAgICBdCisgICAgICAg IENvbW1hbmQuX19pbml0X18oc2VsZiwgJ0xhbmRzIHRoZSBjdXJyZW50IHdvcmtpbmcgZGlyZWN0 b3J5IGRpZmYgYW5kIHVwZGF0ZXMgdGhlIGJ1ZyBpZiBwcm92aWRlZC4nLCAnW0JVR0lEXScsIG9w dGlvbnM9b3B0aW9ucykKKworICAgIGRlZiBndWVzc19yZXZpZXdlcl9mcm9tX2J1ZyhzZWxmLCBi dWdzLCBidWdfaWQpOgorICAgICAgICBwYXRjaGVzID0gYnVncy5mZXRjaF9yZXZpZXdlZF9wYXRj aGVzX2Zyb21fYnVnKGJ1Z19pZCkKKyAgICAgICAgaWYgbGVuKHBhdGNoZXMpICE9IDE6CisgICAg ICAgICAgICBsb2coIiVzIG9uIGJ1ZyAlcywgY2Fubm90IGluZmVyIHJldmlld2VyLiIgJSAocGx1 cmFsaXplKCJyZXZpZXdlZCBwYXRjaCIsIGxlbihwYXRjaGVzKSksIGJ1Z19pZCkpCisgICAgICAg ICAgICByZXR1cm4gTm9uZQorICAgICAgICBwYXRjaCA9IHBhdGNoZXNbMF0KKyAgICAgICAgcmV2 aWV3ZXIgPSBwYXRjaFsncmV2aWV3ZXInXQorICAgICAgICBsb2coJ0d1ZXNzaW5nICIlcyIgYXMg cmV2aWV3ZXIgZnJvbSBhdHRhY2htZW50ICVzIG9uIGJ1ZyAlcy4nICUgKHJldmlld2VyLCBwYXRj aFsnaWQnXSwgYnVnX2lkKSkKKyAgICAgICAgcmV0dXJuIHJldmlld2VyCisKKyAgICBkZWYgdXBk YXRlX2NoYW5nZWxvZ3Nfd2l0aF9yZXZpZXdlcihzZWxmLCByZXZpZXdlciwgYnVnX2lkLCB0b29s KToKKyAgICAgICAgaWYgbm90IHJldmlld2VyOgorICAgICAgICAgICAgaWYgbm90IGJ1Z19pZDoK KyAgICAgICAgICAgICAgICBsb2coIk5vIGJ1ZyBpZCBwcm92aWRlZCBhbmQgLS1yZXZpZXdlcj0g bm90IHByb3ZpZGVkLiAgTm90IHVwZGF0aW5nIENoYW5nZUxvZ3Mgd2l0aCByZXZpZXdlci4iKQor ICAgICAgICAgICAgICAgIHJldHVybgorICAgICAgICAgICAgcmV2aWV3ZXIgPSBzZWxmLmd1ZXNz X3Jldmlld2VyX2Zyb21fYnVnKHRvb2wuYnVncywgYnVnX2lkKQorCisgICAgICAgIGlmIG5vdCBy ZXZpZXdlcjoKKyAgICAgICAgICAgIGxvZygiRmFpbGVkIHRvIGd1ZXNzIHJldmlld2VyIGZyb20g YnVnICVzIGFuZCAtLXJldmlld2VyPSBub3QgcHJvdmlkZWQuICBOb3QgdXBkYXRpbmcgQ2hhbmdl TG9ncyB3aXRoIHJldmlld2VyLiIgJSBidWdfaWQpCisgICAgICAgICAgICByZXR1cm4KKworICAg ICAgICBjaGFuZ2Vsb2dzID0gbW9kaWZpZWRfY2hhbmdlbG9ncyh0b29sLnNjbSgpKQorICAgICAg ICBmb3IgY2hhbmdlbG9nIGluIGNoYW5nZWxvZ3M6CisgICAgICAgICAgICBzZXRfcmV2aWV3ZXJf aW5fY2hhbmdlbG9nKGNoYW5nZWxvZywgcmV2aWV3ZXIpCiAKICAgICBkZWYgZXhlY3V0ZShzZWxm LCBvcHRpb25zLCBhcmdzLCB0b29sKToKLSAgICAgICAgYnVnX2lkID0gYXJnc1swXQorICAgICAg ICBidWdfaWQgPSBhcmdzWzBdIGlmIGxlbihhcmdzKSBlbHNlIE5vbmUKICAgICAgICAgb3MuY2hk aXIodG9vbC5zY20oKS5jaGVja291dF9yb290KQotICAgICAgICBjb21taXRfbWVzc2FnZSA9IGNv bW1pdF9tZXNzYWdlX2Zvcl90aGlzX2NvbW1pdCh0b29sLnNjbSgpKQotICAgICAgICBjb21taXRf bG9nID0gdG9vbC5zY20oKS5jb21taXRfd2l0aF9tZXNzYWdlKGNvbW1pdF9tZXNzYWdlKQotICAg ICAgICBjb21tZW50X3RleHQgPSBidWdfY29tbWVudF9mcm9tX2NvbW1pdF90ZXh0KGNvbW1pdF9s b2cpCi0gICAgICAgIHRvb2wuYnVncy5jbG9zZV9idWdfYXNfZml4ZWQoYnVnX2lkLCBjb21tZW50 X3RleHQpCiAKKyAgICAgICAgc2VsZi51cGRhdGVfY2hhbmdlbG9nc193aXRoX3Jldmlld2VyKG9w dGlvbnMucmV2aWV3ZXIsIGJ1Z19pZCwgdG9vbCkKKworICAgICAgICBjb21tZW50X3RleHQgPSBM YW5kUGF0Y2hlc0Zyb21CdWdzLmJ1aWxkX2FuZF9jb21taXQodG9vbC5zY20oKSwgb3B0aW9ucykK KyAgICAgICAgaWYgYnVnX2lkOgorICAgICAgICAgICAgbG9nKCJVcGRhdGluZyBidWcgJXMiLCBi dWdfaWQpCisgICAgICAgICAgICBpZiBvcHRpb25zLmNsb3NlOgorICAgICAgICAgICAgICAgIHRv b2wuYnVncy5jbG9zZV9idWdfYXNfZml4ZWQoYnVnX2lkLCBjb21tZW50X3RleHQpCisgICAgICAg ICAgICBlbHNlOgorICAgICAgICAgICAgICAgICMgRklYTUU6IFdlIHNob3VsZCBhIHNtYXJ0IHdh eSB0byBmaWd1cmUgb3V0IGlmIHRoZSBwYXRjaCBpcyBhdHRhY2hlZAorICAgICAgICAgICAgICAg ICMgdG8gdGhlIGJ1ZywgYW5kIGlmIHNvIG9ic29sZXRlIGl0LgorICAgICAgICAgICAgICAgIHRv b2wuYnVncy5wb3N0X2NvbW1lbnRfdG9fYnVnKGJ1Z19pZCwgY29tbWVudF90ZXh0KQorICAgICAg ICBlbHNlOgorICAgICAgICAgICAgbG9nKGNvbW1lbnRfdGV4dCkKKyAgICAgICAgICAgIGxvZygi Tm8gYnVnIGlkIHByb3ZpZGVkLiIpCiAKIGNsYXNzIExhbmRQYXRjaGVzRnJvbUJ1Z3MoQ29tbWFu ZCk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYpOgpAQCAtMjI4LDcgKzI3Nyw3IEBAIGNsYXNzIExh bmRQYXRjaGVzRnJvbUJ1Z3MoQ29tbWFuZCk6CiAgICAgICAgICAgICBtYWtlX29wdGlvbigiLS1m b3JjZS1jbGVhbiIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlc3Q9ImZvcmNlX2NsZWFuIiwgZGVm YXVsdD1GYWxzZSwgaGVscD0iQ2xlYW4gd29ya2luZyBkaXJlY3RvcnkgYmVmb3JlIGFwcGx5aW5n IHBhdGNoZXMgKHJlbW92ZXMgbG9jYWwgY2hhbmdlcyBhbmQgY29tbWl0cykiKSwKICAgICAgICAg ICAgIG1ha2Vfb3B0aW9uKCItLW5vLWNsZWFuIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9 ImNsZWFuIiwgZGVmYXVsdD1UcnVlLCBoZWxwPSJEb24ndCBjaGVjayBpZiB0aGUgd29ya2luZyBk aXJlY3RvcnkgaXMgY2xlYW4gYmVmb3JlIGFwcGx5aW5nIHBhdGNoZXMiKSwKICAgICAgICAgICAg IG1ha2Vfb3B0aW9uKCItLW5vLWJ1aWxkIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9ImJ1 aWxkIiwgZGVmYXVsdD1UcnVlLCBoZWxwPSJDb21taXQgd2l0aG91dCBidWlsZGluZyBmaXJzdCwg aW1wbGllcyAtLW5vLXRlc3QuIiksCi0gICAgICAgICAgICBtYWtlX29wdGlvbigiLS1uby10ZXN0 IiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9InRlc3QiLCBkZWZhdWx0PVRydWUsIGhlbHA9 IkNvbW1pdCB3aXRob3V0IHJ1bm5uaW5nIHJ1bi13ZWJraXQtdGVzdHMuIiksCisgICAgICAgICAg ICBtYWtlX29wdGlvbigiLS1uby10ZXN0IiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9InRl c3QiLCBkZWZhdWx0PVRydWUsIGhlbHA9IkNvbW1pdCB3aXRob3V0IHJ1bm5pbmcgcnVuLXdlYmtp dC10ZXN0cy4iKSwKICAgICAgICAgXQogICAgICAgICBDb21tYW5kLl9faW5pdF9fKHNlbGYsICdM YW5kcyBhbGwgcGF0Y2hlcyBvbiBhIGJ1ZyBvcHRpb25hbGx5IHRlc3RpbmcgdGhlbSBmaXJzdCcs ICdCVUdJRCcsIG9wdGlvbnM9b3B0aW9ucykKIApAQCAtNDE5LDcgKzQ2OCw3IEBAIGNsYXNzIEJ1 Z3ppbGxhVG9vbDoKICAgICAgICAgICAgIHsgJ25hbWUnIDogJ3BhdGNoZXMtdG8tY29tbWl0Jywg J29iamVjdCcgOiBQYXRjaGVzSW5Db21taXRRdWV1ZSgpIH0sCiAgICAgICAgICAgICB7ICduYW1l JyA6ICdyZXZpZXdlZC1wYXRjaGVzJywgJ29iamVjdCcgOiBSZXZpZXdlZFBhdGNoZXNPbkJ1Zygp IH0sCiAgICAgICAgICAgICB7ICduYW1lJyA6ICdhcHBseS1wYXRjaGVzJywgJ29iamVjdCcgOiBB cHBseVBhdGNoZXNGcm9tQnVnKCkgfSwKLSAgICAgICAgICAgIHsgJ25hbWUnIDogJ2xhbmQtYW5k LXVwZGF0ZScsICdvYmplY3QnIDogTGFuZEFuZFVwZGF0ZUJ1ZygpIH0sCisgICAgICAgICAgICB7 ICduYW1lJyA6ICdsYW5kLWRpZmYnLCAnb2JqZWN0JyA6IExhbmRBbmRVcGRhdGVCdWcoKSB9LAog ICAgICAgICAgICAgeyAnbmFtZScgOiAnbGFuZC1wYXRjaGVzJywgJ29iamVjdCcgOiBMYW5kUGF0 Y2hlc0Zyb21CdWdzKCkgfSwKICAgICAgICAgICAgIHsgJ25hbWUnIDogJ2NvbW1pdC1tZXNzYWdl JywgJ29iamVjdCcgOiBDb21taXRNZXNzYWdlRm9yQ3VycmVudERpZmYoKSB9LAogICAgICAgICAg ICAgeyAnbmFtZScgOiAnb2Jzb2xldGUtYXR0YWNobWVudHMnLCAnb2JqZWN0JyA6IE9ic29sZXRl QXR0YWNobWVudHNPbkJ1ZygpIH0sCg==