32073 2009-12-02 09:59:52 -0800 We have two mark-fixed commands 2009-12-15 03:13:01 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 abarth webkit-unassigned aroben ddkilzer eric oldest_to_newest 168041 0 abarth 2009-12-02 09:59:52 -0800 There should be only one! It seems like we're been favoring putting more commands into bugzilla-tool, where they can share a bunch of infrastructure. What do you think? Should we port the extra functionality from mark-bug-fixed to bugzilla-tool mark-fixed, or should we kill the bugzilla-tool command? 168044 1 eric 2009-12-02 10:01:51 -0800 I never intended for there to be 2. We could easily just delete the bzt one. I think some of the apple folks who use the mark-as-fixed command prefer it to be a stand-alone command, so we should kill the bzt one. However, we could/should consider replacing the guts of mark-as-fixed with a python implementation which uses all our nifty infrastructure. :) 168046 2 abarth 2009-12-02 10:06:58 -0800 mark-bug-fixed does use Python! Go look at it. :) The problem is that it's been left behind in the march of bugzilla-tool technology. It's using stone knives and bear skins. 168064 3 ddkilzer 2009-12-02 10:57:50 -0800 The mark-BUG-fixed script was moved to a separate script so that it would be less...confusing...to developers who didn't like deciphering the cacophony of subcommands in bugzilla-tool --help. However, I don't think that this experiment was a success, and since the script was not updated with the other bugzilla-tool refactoring, and because bugzilla-tool now has help for individual sub-commands, I'm slightly in favor of it being rolled back into bugzilla-tool. 168081 4 eric 2009-12-02 11:11:16 -0800 We can make it easy to make any Command object into an individual script. Something like this: mark-as-fixed #!/bin/python from modules.commands.mark_as_fixed import MarkAsFixed if __name__ == "__main__": MarkAsFixed().check_arguments_and_execute(sys.argv, None) That won't work out of the box yet, because Commands don't deal well with tool being None, but that can easily be fixed. We'd probably want to call some special run_as_stand_alone_command(sys.argv) call instead of check_arguments_and_execute directly anyway. 168082 5 eric 2009-12-02 11:12:11 -0800 Heck, we could even write a script to auto-gen individual command wrapper files from bugzilla-tool sub-commands if necessary. :) 168086 6 eric 2009-12-02 11:17:13 -0800 (In reply to comment #2) > mark-bug-fixed does use Python! Go look at it. :) > > The problem is that it's been left behind in the march of bugzilla-tool > technology. It's using stone knives and bear skins. Wow, yeah, I *totally* forgot about bug 28910! 171788 7 44858 abarth 2009-12-15 03:06:28 -0800 Created attachment 44858 Patch 171790 8 44858 eric 2009-12-15 03:08:41 -0800 Comment on attachment 44858 Patch Hmm.. OK. Assuming it still works. This seems like a only semi-useful stop-gap measure. 171791 9 abarth 2009-12-15 03:10:42 -0800 Committed r52142: <http://trac.webkit.org/changeset/52142> 171795 10 abarth 2009-12-15 03:13:01 -0800 (In reply to comment #9) > Committed r52142: <http://trac.webkit.org/changeset/52142> Actually committed in r52148 44858 2009-12-15 03:06:28 -0800 2009-12-15 03:08:40 -0800 Patch bug-32073-20091215030626.patch text/plain 12547 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA4MzNkOWNiLi4wMzI1OTc2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAKIDIwMDktMTIt MTUgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBoYXZlIHR3byBtYXJrLWZpeGVkIGNvbW1h bmRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjA3 MworCisgICAgICAgICogU2NyaXB0cy9tYXJrLWJ1Zy1maXhlZDogUmVtb3ZlZC4KKyAgICAgICAg KiBTY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvdXBsb2FkLnB5OgorICAgICAgICAqIFNjcmlwdHMv bW9kdWxlcy9jb21tYW5kcy91cGxvYWRfdW5pdHRlc3QucHk6CisKKzIwMDktMTItMTUgIEFkYW0g QmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNl aWRlbC4KIAogICAgICAgICBzY21fdW5pdHRlc3QucHkgaXMgdG9vIHNsb3cKZGlmZiAtLWdpdCBh L1dlYktpdFRvb2xzL1NjcmlwdHMvbWFyay1idWctZml4ZWQgYi9XZWJLaXRUb29scy9TY3JpcHRz L21hcmstYnVnLWZpeGVkCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDc1NQppbmRleCBjNzA4NmMyLi4w MDAwMDAwCi0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbWFyay1idWctZml4ZWQKKysrIC9kZXYv bnVsbApAQCAtMSwxNDEgKzAsMCBAQAotIyEvdXNyL2Jpbi9lbnYgcHl0aG9uCi0KLSMgQ29weXJp Z2h0IChDKSAyMDA5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSMKLSMgUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0Ci0jIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xs b3dpbmcgY29uZGl0aW9ucwotIyBhcmUgbWV0OgotIwotIyAxLiAgUmVkaXN0cmlidXRpb25zIG9m IHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSMgICAgIG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4g Ci0jIDIuICBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhl IGFib3ZlIGNvcHlyaWdodAotIyAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQotIyAgICAgZG9jdW1lbnRhdGlvbiBh bmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4gCi0j Ci0jIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgQU5EIElUUyBDT05UUklCVVRP UlMgIkFTIElTIiBBTkQgQU5ZCi0jIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNM VURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFIElNUExJRUQKLSMgV0FSUkFOVElFUyBPRiBN RVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRQot IyBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBPUiBJVFMgQ09OVFJJQlVUT1JT IEJFIExJQUJMRSBGT1IgQU5ZCi0jIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJ QUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTCi0jIChJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJW SUNFUzsKLSMgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVS UlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5ECi0jIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZ LCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCi0jIChJTkNM VURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0Yg VEhFIFVTRSBPRgotIyBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJ QklMSVRZIE9GIFNVQ0ggREFNQUdFLgotCi0jIE1hcmsgYSBidWcgYXMgZml4ZWQgb24gYnVncy53 ZWJraXQub3JnLgotCi1pbXBvcnQgb3MKLWltcG9ydCByZQotaW1wb3J0IHN5cwotCi1mcm9tIG9w dHBhcnNlIGltcG9ydCBPcHRpb25QYXJzZXIKLQotZnJvbSBtb2R1bGVzLmJ1Z3ppbGxhIGltcG9y dCBCdWd6aWxsYSwgcGFyc2VfYnVnX2lkCi1mcm9tIG1vZHVsZXMuY29tbWVudHMgaW1wb3J0IGJ1 Z19jb21tZW50X2Zyb21fc3ZuX3JldmlzaW9uCi1mcm9tIG1vZHVsZXMubG9nZ2luZyBpbXBvcnQg ZXJyb3IsIGxvZwotZnJvbSBtb2R1bGVzLnNjbSBpbXBvcnQgU0NNLCBkZXRlY3Rfc2NtX3N5c3Rl bQotCi0KLWNsYXNzIE1hcmtCdWdGaXhlZFRvb2w6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYpOgot ICAgICAgICBzZWxmLmJ1Z3MgPSBCdWd6aWxsYSgpCi0gICAgICAgIHNlbGYuY2FjaGVkX3NjbSA9 IE5vbmUKLSAgICAgICAgc2VsZi5vcHRpb25fcGFyc2VyID0gT3B0aW9uUGFyc2VyKHVzYWdlPSJ1 c2FnZTogJXByb2cgW29wdGlvbnNdIFtyTk5OTk5dIikKLSAgICAgICAgc2VsZi5vcHRpb25fcGFy c2VyLmFkZF9vcHRpb24oIi1iIiwgIi0tYnVnLWlkIiwgYWN0aW9uPSJzdG9yZSIsIHR5cGU9InN0 cmluZyIsIGRlc3Q9ImJ1Z19pZCIsIGhlbHA9IlNwZWNpZnkgYnVnIGlkIGlmIG5vIFVSTCBpcyBw cm92aWRlZCBpbiB0aGUgY29tbWl0IGxvZy4iKQotICAgICAgICBzZWxmLm9wdGlvbl9wYXJzZXIu YWRkX29wdGlvbigiLW0iLCAiLS1jb21tZW50IiwgYWN0aW9uPSJzdG9yZSIsIHR5cGU9InN0cmlu ZyIsIGRlc3Q9ImNvbW1lbnQiLCBoZWxwPSJUZXh0IHRvIGluY2x1ZGUgaW4gYnVnIGNvbW1lbnQu IikKLSAgICAgICAgc2VsZi5vcHRpb25fcGFyc2VyLmFkZF9vcHRpb24oIi1vIiwgIi0tb3BlbiIs IGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlZmF1bHQ9RmFsc2UsIGRlc3Q9Im9wZW5fYnVnIiwgaGVs cD0iT3BlbiBidWcgaW4gZGVmYXVsdCB3ZWIgYnJvd3NlciAoTWFjIG9ubHkpLiIpCi0gICAgICAg IHNlbGYub3B0aW9uX3BhcnNlci5hZGRfb3B0aW9uKCItdSIsICItLXVwZGF0ZS1vbmx5IiwgYWN0 aW9uPSJzdG9yZV90cnVlIiwgZGVmYXVsdD1GYWxzZSwgZGVzdD0idXBkYXRlX29ubHkiLCBoZWxw PSJBZGQgY29tbWVudCB0byB0aGUgYnVnLCBidXQgZG8gbm90IGNsb3NlIGl0LiIpCi0KLSAgICBk ZWYgc2NtKHNlbGYpOgotICAgICAgICAjIExhemlseSBpbml0aWFsaXplIFNDTSB0byBub3QgZXJy b3Itb3V0IGJlZm9yZSBjb21tYW5kIGxpbmUgcGFyc2luZyAob3Igd2hlbiBydW5uaW5nIG5vbi1z Y20gY29tbWFuZHMpLgotICAgICAgICBpZiBub3Qgc2VsZi5jYWNoZWRfc2NtOgotICAgICAgICAg ICAgb3JpZ2luYWxfY3dkID0gb3MucGF0aC5hYnNwYXRoKCcuJykKLSAgICAgICAgICAgIHNlbGYu Y2FjaGVkX3NjbSA9IGRldGVjdF9zY21fc3lzdGVtKG9yaWdpbmFsX2N3ZCkKLSAgICAgICAgcmV0 dXJuIHNlbGYuY2FjaGVkX3NjbQotCi0gICAgZGVmIF9mZXRjaF9jb21taXRfbG9nKHNlbGYsIHNj bSwgc3ZuX3JldmlzaW9uKToKLSAgICAgICAgaWYgbm90IHN2bl9yZXZpc2lvbjoKLSAgICAgICAg ICAgIHJldHVybiBzY20ubGFzdF9zdm5fY29tbWl0X2xvZygpCi0gICAgICAgIHJldHVybiBzY20u c3ZuX2NvbW1pdF9sb2coc3ZuX3JldmlzaW9uKQotCi0gICAgZGVmIF9kZXRlcm1pbmVfYnVnX2lk X2FuZF9zdm5fcmV2aXNpb24oc2VsZiwgYnVnX2lkLCBzdm5fcmV2aXNpb24pOgotICAgICAgICBj b21taXRfbG9nID0gc2VsZi5fZmV0Y2hfY29tbWl0X2xvZyhzZWxmLnNjbSgpLCBzdm5fcmV2aXNp b24pCi0KLSAgICAgICAgaWYgbm90IGJ1Z19pZDoKLSAgICAgICAgICAgIGJ1Z19pZCA9IHBhcnNl X2J1Z19pZChjb21taXRfbG9nKQotCi0gICAgICAgIGlmIG5vdCBzdm5fcmV2aXNpb246Ci0gICAg ICAgICAgICBtYXRjaCA9IHJlLnNlYXJjaCgiXnIoP1A8c3ZuX3JldmlzaW9uPlxkKykgXHwiLCBj b21taXRfbG9nLCByZS5NVUxUSUxJTkUpCi0gICAgICAgICAgICBpZiBtYXRjaDoKLSAgICAgICAg ICAgICAgICBzdm5fcmV2aXNpb24gPSBtYXRjaC5ncm91cCgnc3ZuX3JldmlzaW9uJykKLQotICAg ICAgICBpZiBub3QgYnVnX2lkIG9yIG5vdCBzdm5fcmV2aXNpb246Ci0gICAgICAgICAgICBub3Rf Zm91bmQgPSBbXQotICAgICAgICAgICAgaWYgbm90IGJ1Z19pZDoKLSAgICAgICAgICAgICAgICBu b3RfZm91bmQuYXBwZW5kKCJidWcgaWQiKQotICAgICAgICAgICAgaWYgbm90IHN2bl9yZXZpc2lv bjoKLSAgICAgICAgICAgICAgICBub3RfZm91bmQuYXBwZW5kKCJzdm4gcmV2aXNpb24iKQotICAg ICAgICAgICAgZXJyb3IoIkNvdWxkIG5vdCBmaW5kICVzIG9uIGNvbW1hbmQtbGluZSBvciBpbiAl cy4iCi0gICAgICAgICAgICAgICAgICAlICgiIG9yICIuam9pbihub3RfZm91bmQpLCAiciVzIiAl IHN2bl9yZXZpc2lvbiBpZiBzdm5fcmV2aXNpb24gZWxzZSAibGFzdCBjb21taXQiKSkKLQotICAg ICAgICByZXR1cm4gKGJ1Z19pZCwgc3ZuX3JldmlzaW9uKQotCi0gICAgZGVmIF9vcGVuX2J1Z19p bl93ZWJfYnJvd3NlcihzZWxmLCBidWdfaWQpOgotICAgICAgICBpZiBzeXMucGxhdGZvcm0gPT0g ImRhcndpbiI6Ci0gICAgICAgICAgICBTQ00ucnVuX2NvbW1hbmQoWyJvcGVuIiwgc2VsZi5idWdz LnNob3J0X2J1Z191cmxfZm9yX2J1Z19pZChidWdfaWQpXSkKLSAgICAgICAgICAgIHJldHVybgot ICAgICAgICBsb2coIldBUk5JTkc6IC1vfC0tb3BlbiBpcyBvbmx5IHN1cHBvcnRlZCBvbiBNYWMg T1MgWC4iKQotCi0gICAgZGVmIF9wcm9tcHRfdXNlcl9mb3JfY29ycmVjdG5lc3Moc2VsZiwgYnVn X2lkLCBzdm5fcmV2aXNpb24pOgotICAgICAgICBhbnN3ZXIgPSByYXdfaW5wdXQoIklzIHRoaXMg Y29ycmVjdCAoeS9OKT8gIikKLSAgICAgICAgaWYgbm90IHJlLm1hdGNoKCJeXHMqeShlcyk/Iiwg YW5zd2VyLCByZS5JR05PUkVDQVNFKToKLSAgICAgICAgICAgIGV4aXQoMSkKLQotICAgIGRlZiBt YWluKHNlbGYpOgotICAgICAgICAob3B0aW9ucywgYXJncykgPSBzZWxmLm9wdGlvbl9wYXJzZXIu cGFyc2VfYXJncyhzeXMuYXJndlsxOl0pCi0KLSAgICAgICAgaWYgbGVuKGFyZ3MpID4gMToKLSAg ICAgICAgICAgIGVycm9yKCJPbmx5IG9uZSByZXZpc2lvbiBtYXkgYmUgc3BlY2lmaWVkLiIpCi0K LSAgICAgICAgYnVnX2lkID0gb3B0aW9ucy5idWdfaWQKLQotICAgICAgICBzdm5fcmV2aXNpb24g PSBhcmdzWzBdIGlmIGxlbihhcmdzKSA9PSAxIGVsc2UgTm9uZQotICAgICAgICBpZiBzdm5fcmV2 aXNpb246Ci0gICAgICAgICAgICBpZiByZS5tYXRjaCgiXnJbMC05XSskIiwgc3ZuX3JldmlzaW9u LCByZS5JR05PUkVDQVNFKToKLSAgICAgICAgICAgICAgICBzdm5fcmV2aXNpb24gPSBzdm5fcmV2 aXNpb25bMTpdCi0gICAgICAgICAgICBpZiBub3QgcmUubWF0Y2goIl5bMC05XSskIiwgc3ZuX3Jl dmlzaW9uKToKLSAgICAgICAgICAgICAgICBlcnJvcigiSW52YWxpZCBzdm4gcmV2aXNpb246ICcl cyciICUgc3ZuX3JldmlzaW9uKQotCi0gICAgICAgIG5lZWRzX3Byb21wdCA9IEZhbHNlCi0gICAg ICAgIGlmIG5vdCBidWdfaWQgb3Igbm90IHN2bl9yZXZpc2lvbjoKLSAgICAgICAgICAgIG5lZWRz X3Byb21wdCA9IFRydWUKLSAgICAgICAgICAgIChidWdfaWQsIHN2bl9yZXZpc2lvbikgPSBzZWxm Ll9kZXRlcm1pbmVfYnVnX2lkX2FuZF9zdm5fcmV2aXNpb24oYnVnX2lkLCBzdm5fcmV2aXNpb24p Ci0KLSAgICAgICAgbG9nKCJCdWc6IDwlcz4gJXMiICUgKHNlbGYuYnVncy5zaG9ydF9idWdfdXJs X2Zvcl9idWdfaWQoYnVnX2lkKSwgc2VsZi5idWdzLmZldGNoX3RpdGxlX2Zyb21fYnVnKGJ1Z19p ZCkpKQotICAgICAgICBsb2coIlJldmlzaW9uOiAlcyIgJSBzdm5fcmV2aXNpb24pCi0KLSAgICAg ICAgaWYgb3B0aW9ucy5vcGVuX2J1ZzoKLSAgICAgICAgICAgIHNlbGYuX29wZW5fYnVnX2luX3dl Yl9icm93c2VyKGJ1Z19pZCkKLQotICAgICAgICBpZiBuZWVkc19wcm9tcHQ6Ci0gICAgICAgICAg ICBzZWxmLl9wcm9tcHRfdXNlcl9mb3JfY29ycmVjdG5lc3MoYnVnX2lkLCBzdm5fcmV2aXNpb24p Ci0KLSAgICAgICAgYnVnX2NvbW1lbnQgPSBidWdfY29tbWVudF9mcm9tX3N2bl9yZXZpc2lvbihz dm5fcmV2aXNpb24pCi0gICAgICAgIGlmIG9wdGlvbnMuY29tbWVudDoKLSAgICAgICAgICAgIGJ1 Z19jb21tZW50ID0gIiVzXG5cbiVzIiAlIChvcHRpb25zLmNvbW1lbnQsIGJ1Z19jb21tZW50KQot Ci0gICAgICAgIGlmIG9wdGlvbnMudXBkYXRlX29ubHk6Ci0gICAgICAgICAgICBsb2coIkFkZGlu ZyBjb21tZW50IHRvIEJ1ZyAlcy4iICUgYnVnX2lkKQotICAgICAgICAgICAgc2VsZi5idWdzLnBv c3RfY29tbWVudF90b19idWcoYnVnX2lkLCBidWdfY29tbWVudCkKLSAgICAgICAgZWxzZToKLSAg ICAgICAgICAgIGxvZygiQWRkaW5nIGNvbW1lbnQgdG8gQnVnICVzIGFuZCBtYXJraW5nIGFzIFJl c29sdmVkL0ZpeGVkLiIgJSBidWdfaWQpCi0gICAgICAgICAgICBzZWxmLmJ1Z3MuY2xvc2VfYnVn X2FzX2ZpeGVkKGJ1Z19pZCwgYnVnX2NvbW1lbnQpCi0KLQotZGVmIG1haW4oKToKLSAgICB0b29s ID0gTWFya0J1Z0ZpeGVkVG9vbCgpCi0gICAgcmV0dXJuIHRvb2wubWFpbigpCi0KLWlmIF9fbmFt ZV9fID09ICJfX21haW5fXyI6Ci0gICAgbWFpbigpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL21vZHVsZXMvY29tbWFuZHMvdXBsb2FkLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9t b2R1bGVzL2NvbW1hbmRzL3VwbG9hZC5weQppbmRleCAxZjg5MmExLi4yZTUyNDg0IDEwMDY0NAot LS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvdXBsb2FkLnB5CisrKyBi L1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy91cGxvYWQucHkKQEAgLTI5LDEy ICsyOSwxNCBAQAogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBP U1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCiBpbXBvcnQgb3MKK2ltcG9ydCByZQogaW1wb3J0 IFN0cmluZ0lPCiBpbXBvcnQgc3lzCiAKIGZyb20gb3B0cGFyc2UgaW1wb3J0IG1ha2Vfb3B0aW9u CiAKIGZyb20gbW9kdWxlcy5idWd6aWxsYSBpbXBvcnQgcGFyc2VfYnVnX2lkCitmcm9tIG1vZHVs ZXMuY29tbWVudHMgaW1wb3J0IGJ1Z19jb21tZW50X2Zyb21fc3ZuX3JldmlzaW9uCiBmcm9tIG1v ZHVsZXMuZ3JhbW1hciBpbXBvcnQgcGx1cmFsaXplCiBmcm9tIG1vZHVsZXMubG9nZ2luZyBpbXBv cnQgZXJyb3IsIGxvZwogZnJvbSBtb2R1bGVzLm11bHRpY29tbWFuZHRvb2wgaW1wb3J0IENvbW1h bmQKQEAgLTE1NiwxNCArMTU4LDkxIEBAIGNsYXNzIFBvc3RDb21taXRzKENvbW1hbmQpOgogICAg ICAgICAgICAgdG9vbC5idWdzLmFkZF9wYXRjaF90b19idWcoYnVnX2lkLCBkaWZmX2ZpbGUsIGRl c2NyaXB0aW9uLCBjb21tZW50X3RleHQsIG1hcmtfZm9yX3Jldmlldz1vcHRpb25zLnJldmlldywg bWFya19mb3JfY29tbWl0X3F1ZXVlPW9wdGlvbnMucmVxdWVzdF9jb21taXQpCiAKIAotY2xhc3Mg TWFya0ZpeGVkKENvbW1hbmQpOgotICAgIG5hbWUgPSAibWFyay1maXhlZCIKLSAgICBzaG93X2lu X21haW5faGVscCA9IEZhbHNlCisjIEZJWE1FOiBSZXF1aXJlcyB1bml0IHRlc3QuICBCbG9ja2lu ZyBpc3N1ZTogdG9vIGNvbXBsZXggZm9yIG5vdy4KK2NsYXNzIE1hcmtCdWdGaXhlZChDb21tYW5k KToKKyAgICBuYW1lID0gIm1hcmstYnVnLWZpeGVkIgorICAgIHNob3dfaW5fbWFpbl9oZWxwID0g VHJ1ZQogICAgIGRlZiBfX2luaXRfXyhzZWxmKToKLSAgICAgICAgQ29tbWFuZC5fX2luaXRfXyhz ZWxmLCAiTWFyayB0aGUgc3BlY2lmaWVkIGJ1ZyBhcyBmaXhlZCIsICJCVUdfSUQgUkVBU09OIikK KyAgICAgICAgb3B0aW9ucyA9IFsKKyAgICAgICAgICAgIG1ha2Vfb3B0aW9uKCItLWJ1Zy1pZCIs IGFjdGlvbj0ic3RvcmUiLCB0eXBlPSJzdHJpbmciLCBkZXN0PSJidWdfaWQiLCBoZWxwPSJTcGVj aWZ5IGJ1ZyBpZCBpZiBubyBVUkwgaXMgcHJvdmlkZWQgaW4gdGhlIGNvbW1pdCBsb2cuIiksCisg ICAgICAgICAgICBtYWtlX29wdGlvbigiLS1jb21tZW50IiwgYWN0aW9uPSJzdG9yZSIsIHR5cGU9 InN0cmluZyIsIGRlc3Q9ImNvbW1lbnQiLCBoZWxwPSJUZXh0IHRvIGluY2x1ZGUgaW4gYnVnIGNv bW1lbnQuIiksCisgICAgICAgICAgICBtYWtlX29wdGlvbigiLS1vcGVuIiwgYWN0aW9uPSJzdG9y ZV90cnVlIiwgZGVmYXVsdD1GYWxzZSwgZGVzdD0ib3Blbl9idWciLCBoZWxwPSJPcGVuIGJ1ZyBp biBkZWZhdWx0IHdlYiBicm93c2VyIChNYWMgb25seSkuIiksCisgICAgICAgICAgICBtYWtlX29w dGlvbigiLS11cGRhdGUtb25seSIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlZmF1bHQ9RmFsc2Us IGRlc3Q9InVwZGF0ZV9vbmx5IiwgaGVscD0iQWRkIGNvbW1lbnQgdG8gdGhlIGJ1ZywgYnV0IGRv IG5vdCBjbG9zZSBpdC4iKSwKKyAgICAgICAgXQorICAgICAgICBDb21tYW5kLl9faW5pdF9fKHNl bGYsICJNYXJrIHRoZSBzcGVjaWZpZWQgYnVnIGFzIGZpeGVkIiwgIltTVk5fUkVWSVNJT05dIiwg b3B0aW9ucz1vcHRpb25zKQorCisgICAgZGVmIF9mZXRjaF9jb21taXRfbG9nKHNlbGYsIHRvb2ws IHN2bl9yZXZpc2lvbik6CisgICAgICAgIGlmIG5vdCBzdm5fcmV2aXNpb246CisgICAgICAgICAg ICByZXR1cm4gdG9vbC5zY20oKS5sYXN0X3N2bl9jb21taXRfbG9nKCkKKyAgICAgICAgcmV0dXJu IHRvb2wuc2NtKCkuc3ZuX2NvbW1pdF9sb2coc3ZuX3JldmlzaW9uKQorCisgICAgZGVmIF9kZXRl cm1pbmVfYnVnX2lkX2FuZF9zdm5fcmV2aXNpb24oc2VsZiwgdG9vbCwgYnVnX2lkLCBzdm5fcmV2 aXNpb24pOgorICAgICAgICBjb21taXRfbG9nID0gc2VsZi5fZmV0Y2hfY29tbWl0X2xvZyh0b29s LCBzdm5fcmV2aXNpb24pCisKKyAgICAgICAgaWYgbm90IGJ1Z19pZDoKKyAgICAgICAgICAgIGJ1 Z19pZCA9IHBhcnNlX2J1Z19pZChjb21taXRfbG9nKQorCisgICAgICAgIGlmIG5vdCBzdm5fcmV2 aXNpb246CisgICAgICAgICAgICBtYXRjaCA9IHJlLnNlYXJjaCgiXnIoP1A8c3ZuX3JldmlzaW9u PlxkKykgXHwiLCBjb21taXRfbG9nLCByZS5NVUxUSUxJTkUpCisgICAgICAgICAgICBpZiBtYXRj aDoKKyAgICAgICAgICAgICAgICBzdm5fcmV2aXNpb24gPSBtYXRjaC5ncm91cCgnc3ZuX3Jldmlz aW9uJykKKworICAgICAgICBpZiBub3QgYnVnX2lkIG9yIG5vdCBzdm5fcmV2aXNpb246CisgICAg ICAgICAgICBub3RfZm91bmQgPSBbXQorICAgICAgICAgICAgaWYgbm90IGJ1Z19pZDoKKyAgICAg ICAgICAgICAgICBub3RfZm91bmQuYXBwZW5kKCJidWcgaWQiKQorICAgICAgICAgICAgaWYgbm90 IHN2bl9yZXZpc2lvbjoKKyAgICAgICAgICAgICAgICBub3RfZm91bmQuYXBwZW5kKCJzdm4gcmV2 aXNpb24iKQorICAgICAgICAgICAgZXJyb3IoIkNvdWxkIG5vdCBmaW5kICVzIG9uIGNvbW1hbmQt bGluZSBvciBpbiAlcy4iCisgICAgICAgICAgICAgICAgICAlICgiIG9yICIuam9pbihub3RfZm91 bmQpLCAiciVzIiAlIHN2bl9yZXZpc2lvbiBpZiBzdm5fcmV2aXNpb24gZWxzZSAibGFzdCBjb21t aXQiKSkKKworICAgICAgICByZXR1cm4gKGJ1Z19pZCwgc3ZuX3JldmlzaW9uKQorCisgICAgZGVm IF9vcGVuX2J1Z19pbl93ZWJfYnJvd3NlcihzZWxmLCB0b29sLCBidWdfaWQpOgorICAgICAgICBp ZiBzeXMucGxhdGZvcm0gPT0gImRhcndpbiI6CisgICAgICAgICAgICB0b29sLmV4ZWN1dGl2ZS5y dW5fY29tbWFuZChbIm9wZW4iLCBzZWxmLmJ1Z3Muc2hvcnRfYnVnX3VybF9mb3JfYnVnX2lkKGJ1 Z19pZCldKQorICAgICAgICAgICAgcmV0dXJuCisgICAgICAgIGxvZygiV0FSTklORzogLS1vcGVu IGlzIG9ubHkgc3VwcG9ydGVkIG9uIE1hYyBPUyBYLiIpCisKKyAgICBkZWYgX3Byb21wdF91c2Vy X2Zvcl9jb3JyZWN0bmVzcyhzZWxmLCBidWdfaWQsIHN2bl9yZXZpc2lvbik6CisgICAgICAgIGFu c3dlciA9IHJhd19pbnB1dCgiSXMgdGhpcyBjb3JyZWN0ICh5L04pPyAiKQorICAgICAgICBpZiBu b3QgcmUubWF0Y2goIl5ccyp5KGVzKT8iLCBhbnN3ZXIsIHJlLklHTk9SRUNBU0UpOgorICAgICAg ICAgICAgZXhpdCgxKQogCiAgICAgZGVmIGV4ZWN1dGUoc2VsZiwgb3B0aW9ucywgYXJncywgdG9v bCk6Ci0gICAgICAgIHRvb2wuYnVncy5jbG9zZV9idWdfYXNfZml4ZWQoYXJnc1swXSwgYXJnc1sx XSkKKyAgICAgICAgYnVnX2lkID0gb3B0aW9ucy5idWdfaWQKKworICAgICAgICBzdm5fcmV2aXNp b24gPSBhcmdzICYgYXJnc1swXQorICAgICAgICBpZiBzdm5fcmV2aXNpb246CisgICAgICAgICAg ICBpZiByZS5tYXRjaCgiXnJbMC05XSskIiwgc3ZuX3JldmlzaW9uLCByZS5JR05PUkVDQVNFKToK KyAgICAgICAgICAgICAgICBzdm5fcmV2aXNpb24gPSBzdm5fcmV2aXNpb25bMTpdCisgICAgICAg ICAgICBpZiBub3QgcmUubWF0Y2goIl5bMC05XSskIiwgc3ZuX3JldmlzaW9uKToKKyAgICAgICAg ICAgICAgICBlcnJvcigiSW52YWxpZCBzdm4gcmV2aXNpb246ICclcyciICUgc3ZuX3JldmlzaW9u KQorCisgICAgICAgIG5lZWRzX3Byb21wdCA9IEZhbHNlCisgICAgICAgIGlmIG5vdCBidWdfaWQg b3Igbm90IHN2bl9yZXZpc2lvbjoKKyAgICAgICAgICAgIG5lZWRzX3Byb21wdCA9IFRydWUKKyAg ICAgICAgICAgIChidWdfaWQsIHN2bl9yZXZpc2lvbikgPSBzZWxmLl9kZXRlcm1pbmVfYnVnX2lk X2FuZF9zdm5fcmV2aXNpb24odG9vbCwgYnVnX2lkLCBzdm5fcmV2aXNpb24pCisKKyAgICAgICAg bG9nKCJCdWc6IDwlcz4gJXMiICUgKHRvb2wuYnVncy5zaG9ydF9idWdfdXJsX2Zvcl9idWdfaWQo YnVnX2lkKSwgdG9vbC5idWdzLmZldGNoX3RpdGxlX2Zyb21fYnVnKGJ1Z19pZCkpKQorICAgICAg ICBsb2coIlJldmlzaW9uOiAlcyIgJSBzdm5fcmV2aXNpb24pCisKKyAgICAgICAgaWYgb3B0aW9u cy5vcGVuX2J1ZzoKKyAgICAgICAgICAgIHNlbGYuX29wZW5fYnVnX2luX3dlYl9icm93c2VyKHRv b2wsIGJ1Z19pZCkKKworICAgICAgICBpZiBuZWVkc19wcm9tcHQ6CisgICAgICAgICAgICBzZWxm Ll9wcm9tcHRfdXNlcl9mb3JfY29ycmVjdG5lc3MoYnVnX2lkLCBzdm5fcmV2aXNpb24pCisKKyAg ICAgICAgYnVnX2NvbW1lbnQgPSBidWdfY29tbWVudF9mcm9tX3N2bl9yZXZpc2lvbihzdm5fcmV2 aXNpb24pCisgICAgICAgIGlmIG9wdGlvbnMuY29tbWVudDoKKyAgICAgICAgICAgIGJ1Z19jb21t ZW50ID0gIiVzXG5cbiVzIiAlIChvcHRpb25zLmNvbW1lbnQsIGJ1Z19jb21tZW50KQorCisgICAg ICAgIGlmIG9wdGlvbnMudXBkYXRlX29ubHk6CisgICAgICAgICAgICBsb2coIkFkZGluZyBjb21t ZW50IHRvIEJ1ZyAlcy4iICUgYnVnX2lkKQorICAgICAgICAgICAgc2VsZi5idWdzLnBvc3RfY29t bWVudF90b19idWcoYnVnX2lkLCBidWdfY29tbWVudCkKKyAgICAgICAgZWxzZToKKyAgICAgICAg ICAgIGxvZygiQWRkaW5nIGNvbW1lbnQgdG8gQnVnICVzIGFuZCBtYXJraW5nIGFzIFJlc29sdmVk L0ZpeGVkLiIgJSBidWdfaWQpCisgICAgICAgICAgICBzZWxmLmJ1Z3MuY2xvc2VfYnVnX2FzX2Zp eGVkKGJ1Z19pZCwgYnVnX2NvbW1lbnQpCiAKIAogIyBGSVhNRTogUmVxdWlyZXMgdW5pdCB0ZXN0 LiAgQmxvY2tpbmcgaXNzdWU6IHRvbyBjb21wbGV4IGZvciBub3cuCmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvdXBsb2FkX3VuaXR0ZXN0LnB5IGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3VwbG9hZF91bml0dGVzdC5weQppbmRl eCBjZjAwM2FhLi5lMjA2ZDEwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVs ZXMvY29tbWFuZHMvdXBsb2FkX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMv bW9kdWxlcy9jb21tYW5kcy91cGxvYWRfdW5pdHRlc3QucHkKQEAgLTMyLDkgKzMyLDYgQEAgZnJv bSBtb2R1bGVzLmNvbW1hbmRzLmNvbW1hbmR0ZXN0IGltcG9ydCBDb21tYW5kc1Rlc3QKIGZyb20g bW9kdWxlcy5jb21tYW5kcy51cGxvYWQgaW1wb3J0ICoKIAogY2xhc3MgVXBsb2FkQ29tbWFuZHNU ZXN0KENvbW1hbmRzVGVzdCk6Ci0gICAgZGVmIHRlc3RfbWFya19maXhlZChzZWxmKToKLSAgICAg ICAgc2VsZi5hc3NlcnRfZXhlY3V0ZV9vdXRwdXRzKE1hcmtGaXhlZCgpLCBbNDMsICJUZXN0IGNv bW1lbnQiXSkKLQogICAgIGRlZiB0ZXN0X29ic29sZXRlX2F0dGFjaG1lbnRzKHNlbGYpOgogICAg ICAgICBzZWxmLmFzc2VydF9leGVjdXRlX291dHB1dHMoT2Jzb2xldGVBdHRhY2htZW50cygpLCBb NDJdKQogCg==