31771 2009-11-21 12:23:06 -0800 bugzilla-tool --help spews way too much text 2009-11-21 13:35:08 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 27164 31772 1 eric webkit-unassigned abarth commit-queue oldest_to_newest 165632 0 eric 2009-11-21 12:23:06 -0800 bugzilla-tool --help spews way too much text Fix it to just show a short list of the commands like "git help" or "svn help" do. One piece which is not yet implemented, is that we don't just show "common" commands, we show all commands. I plan to do the common-only part in a separate patch. 165634 1 abarth 2009-11-21 12:32:38 -0800 Yes. We definitely need to do this. 165635 2 43655 eric 2009-11-21 12:45:00 -0800 Created attachment 43655 Patch 165638 3 eric 2009-11-21 12:53:55 -0800 In case you'd like to know what the now-awesomer help looks like, here it is: (NOTE: the wrapping is from bugzilla's comment system, not from bugzilla-tool) % bugzilla-tool --help Usage: bugzilla-tool [options] COMMAND [ARGS] Options: -h, --help show this help message and exit --dry-run do not touch remote servers bugzilla-tool supports the following commands: apply-attachment Apply an attachment to the local working directory apply-patches Apply reviewed patches from provided bugs to the local working directory bugs-to-commit List bugs in the commit-queue build Update working copy and build build-attachment Apply and build patches from bugzilla build-queue Run the build-queue check-style Run check-webkit-style on the specified attachments commit-message Print a commit message suitable for the uncommitted changes commit-queue Run the commit-queue create-bug Create a bug from local changes or local commits land-attachment Land patches from bugzilla, optionally building and testing them first land-diff Land the current working directory diff and updates the associated bug if any land-patches Land all patches on the given bugs, optionally building and testing them first obsolete-attachments Mark all attachments on a bug as obsolete patches-to-commit List patches in the commit-queue post-commits Attach a range of local commits to bugs as patch files post-diff Attach the current working directory diff to a bug as a patch file reviewed-patches List r+'d patches on a bug rollout Revert the given revision in the working copy and optionally commit the revert and re-open the original bug style-queue Run the style-queue tree-status Print the status of the build.webkit.org buildbots See 'bugzilla-tool help COMMAND' for more information on a specific command. 165641 4 43655 abarth 2009-11-21 13:03:12 -0800 Comment on attachment 43655 Patch Yay! 165649 5 43655 commit-queue 2009-11-21 13:34:59 -0800 Comment on attachment 43655 Patch Clearing flags on attachment: 43655 Committed r51287: <http://trac.webkit.org/changeset/51287> 165650 6 commit-queue 2009-11-21 13:35:08 -0800 All reviewed patches have been landed. Closing bug. 43655 2009-11-21 12:45:00 -0800 2009-11-21 13:34:59 -0800 Patch bug-31771-20091121124459.patch text/plain 20041 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBjODk3MzcxLi5iMWRhY2E3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjkgQEAKIDIwMDktMTEt MjEgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGJ1Z3ppbGxhLXRvb2wgLS1oZWxwIHNwZXdzIHdh eSB0b28gbXVjaCB0ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0zMTc3MQorCisgICAgICAgICogU2NyaXB0cy9idWd6aWxsYS10b29sOgorICAgICAg ICAgLSBSZW1vdmUgc2VsZi5jYWNoZWRfc2NtIGluaXRpYWxpemF0aW9uIGhhY2suCisgICAgICAg ICogU2NyaXB0cy9tb2R1bGVzL2J1aWxkYm90LnB5OgorICAgICAgICAgLSBNYWtlIGRlZmF1bHRf aG9zdCBhY2Nlc3NpYmxlIHRvIGNhbGxlcnMuCisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL2Nv bW1hbmRzL2Rvd25sb2FkLnB5OgorICAgICAgICAgLSBQaHJhc2UgaGVscCBmb3IgYWxsIGNvbW1h bmRzIGNvbnNpc3RlbnRseSBhbmQgcmVtb3ZlIHNwdXJpb3VzIGhlbHAgdGV4dCBwdW5jdHVhdGlv bi4KKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvcXVlcmllcy5weTogRGl0dG8u CisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3F1ZXVlcy5weTogRGl0dG8uCisg ICAgICAgICogU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3VwbG9hZC5weTogRGl0dG8uCisgICAg ICAgICogU2NyaXB0cy9tb2R1bGVzL211bHRpY29tbWFuZHRvb2wucHk6CisgICAgICAgICAtIEFk ZCBIZWxwUHJpbnRpbmdPcHRpb25QYXJzZXIuZm9ybWF0X2VwaWxvZyB0byByZXBsYWNlCisgICAg ICAgICAgIE5vbldyYXBwaW5nRXBpbG9nSW5kZW50ZWRIZWxwRm9ybWF0dGVyIGFuZCBhbGxvdyB1 cyB0byBsYXppbHkgaW5pdGlhbGl6ZQorICAgICAgICAgICBwZXItY29tbWFuZCBoZWxwICh0aHVz IHJlbW92aW5nIHRoZSBuZWVkIGZvciB0aGUgY2FjaGVkX3NjbSBoYWNrIGluIEJ1Z3ppbGxhVG9v bCkuCisgICAgICAgICAtIE1ha2UgLS1oZWxwIG9ubHkgc2hvdyBhIGxpc3Qgb2YgY29tbWFuZHMg bGlrZSAic3ZuIGhlbHAiIGFuZCAiZ2l0IGhlbHAiIGRvIC0tCisgICAgICAgICAgIHByZXZpb3Vz bHkgLS1oZWxwIHdhcyBsaXN0aW5nIGFsbCBjb21tYW5kcyBhbmQgb3B0aW9ucy4KKyAgICAgICAg IC0gU29ydCBsaXN0IG9mIGNvbW1hbmRzIGFscGhhYmV0aWNhbGx5LgorCisyMDA5LTExLTIxICBF cmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBBZGFt IEJhcnRoLgogCiAgICAgICAgIGNvbW1pdC1xdWV1ZSBmYWlscyB0byBydW4gd2l0aCAicGVybWlz c2lvbnMgZXJyb3IiIGR1ZSB0byBiYWQgYnVnemlsbGEtdG9vbCBwYXRoCmRpZmYgLS1naXQgYS9X ZWJLaXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wgYi9XZWJLaXRUb29scy9TY3JpcHRzL2J1 Z3ppbGxhLXRvb2wKaW5kZXggM2E0OGM1Yi4uZmRhMzU0OCAxMDA3NTUKLS0tIGEvV2ViS2l0VG9v bHMvU2NyaXB0cy9idWd6aWxsYS10b29sCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemls bGEtdG9vbApAQCAtNDAsMTYgKzQwLDEyIEBAIGZyb20gbW9kdWxlcy5sb2dnaW5nIGltcG9ydCBs b2cKIAogY2xhc3MgQnVnemlsbGFUb29sKE11bHRpQ29tbWFuZFRvb2wpOgogICAgIGRlZiBfX2lu aXRfXyhzZWxmKToKLSAgICAgICAgIyBIQUNLOiBTZXQgc2VsZi5jYWNoZWRfc2NtIGJlZm9yZSBj YWxsaW5nIE11bHRpQ29tbWFuZFRvb2wuX19pbml0X18gYmVjYXVzZQotICAgICAgICAjIE11bHRp Q29tbWFuZFRvb2wuX2NvbW1hbmRzX3VzYWdlKCkgd2lsbCBjYWxsIHNlbGYuc2hvdWxkX3Nob3df Y29tbWFuZF9oZWxwIHdoaWNoIHVzZXMgc2NtKCkuCi0gICAgICAgICMgVGhpcyBoYWNrIGNhbiBi ZSByZW1vdmVkIGJ5IG92ZXJyaWRpbmcgdXNhZ2UoKSBwcmludGluZyBpbiBIZWxwUHJpbnRpbmdP cHRpb25QYXJzZXIKLSAgICAgICAgIyBzbyB0aGF0IHdlIGRvbid0IG5lZWQgdG8gY3JlYXRlICdl cGlsb2cnIGJlZm9yZSBjb25zdHJ1Y3RpbmcgSGVscFByaW50aW5nT3B0aW9uUGFyc2VyLgotICAg ICAgICBzZWxmLmNhY2hlZF9zY20gPSBOb25lCiAgICAgICAgIE11bHRpQ29tbWFuZFRvb2wuX19p bml0X18oc2VsZikKICAgICAgICAgc2VsZi5nbG9iYWxfb3B0aW9uX3BhcnNlci5hZGRfb3B0aW9u KCItLWRyeS1ydW4iLCBhY3Rpb249ImNhbGxiYWNrIiwgaGVscD0iZG8gbm90IHRvdWNoIHJlbW90 ZSBzZXJ2ZXJzIiwgY2FsbGJhY2s9c2VsZi5kcnlfcnVuX2NhbGxiYWNrKQogCiAgICAgICAgIHNl bGYuYnVncyA9IEJ1Z3ppbGxhKCkKICAgICAgICAgc2VsZi5idWlsZGJvdCA9IEJ1aWxkQm90KCkK KyAgICAgICAgc2VsZi5jYWNoZWRfc2NtID0gTm9uZQogCiAgICAgZGVmIGRyeV9ydW5fY2FsbGJh Y2soc2VsZiwgb3B0aW9uLCBvcHQsIHZhbHVlLCBwYXJzZXIpOgogICAgICAgICBzZWxmLnNjbSgp LmRyeXJ1biA9IFRydWUKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9i dWlsZGJvdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWlsZGJvdC5weQppbmRl eCBlOTQ4ZDhjLi41NDhjYWQ4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVs ZXMvYnVpbGRib3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1aWxkYm90 LnB5CkBAIC0zOSw3ICszOSw4IEBAIGZyb20gbW9kdWxlcy5sb2dnaW5nIGltcG9ydCBsb2cKIGZy b20gLkJlYXV0aWZ1bFNvdXAgaW1wb3J0IEJlYXV0aWZ1bFNvdXAKIAogY2xhc3MgQnVpbGRCb3Q6 Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3Q9ImJ1aWxkLndlYmtpdC5vcmciKToKKyAgICBk ZWZhdWx0X2hvc3QgPSAiYnVpbGQud2Via2l0Lm9yZyIKKyAgICBkZWYgX19pbml0X18oc2VsZiwg aG9zdD1kZWZhdWx0X2hvc3QpOgogICAgICAgICBzZWxmLmJ1aWxkYm90X2hvc3QgPSBob3N0CiAg ICAgICAgIHNlbGYuYnVpbGRib3Rfc2VydmVyX3VybCA9ICJodHRwOi8vJXMvIiAlIHNlbGYuYnVp bGRib3RfaG9zdAogICAgICAgICAKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9k dWxlcy9jb21tYW5kcy9kb3dubG9hZC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9j b21tYW5kcy9kb3dubG9hZC5weQppbmRleCAxZTE5NDU5Li5iZDVlZGM2IDEwMDY0NAotLS0gYS9X ZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvZG93bmxvYWQucHkKKysrIGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL2Rvd25sb2FkLnB5CkBAIC03MSw3ICs3 MSw3IEBAIGNsYXNzIEJ1aWxkKENvbW1hbmQpOgogICAgICAgICBvcHRpb25zID0gV2ViS2l0TGFu ZGluZ1NjcmlwdHMuY2xlYW5pbmdfb3B0aW9ucygpCiAgICAgICAgIG9wdGlvbnMgKz0gV2ViS2l0 TGFuZGluZ1NjcmlwdHMuYnVpbGRfb3B0aW9ucygpCiAgICAgICAgIG9wdGlvbnMgKz0gV2ViS2l0 TGFuZGluZ1NjcmlwdHMubGFuZF9vcHRpb25zKCkKLSAgICAgICAgQ29tbWFuZC5fX2luaXRfXyhz ZWxmLCAiVXBkYXRlcyB3b3JraW5nIGNvcHkgYW5kIGRvZXMgYSBidWlsZC4iLCAiIiwgb3B0aW9u cykKKyAgICAgICAgQ29tbWFuZC5fX2luaXRfXyhzZWxmLCAiVXBkYXRlIHdvcmtpbmcgY29weSBh bmQgYnVpbGQiLCAiIiwgb3B0aW9ucykKIAogICAgIGRlZiBleGVjdXRlKHNlbGYsIG9wdGlvbnMs IGFyZ3MsIHRvb2wpOgogICAgICAgICBzZXF1ZW5jZSA9IEJ1aWxkU2VxdWVuY2Uob3B0aW9ucywg dG9vbCkKQEAgLTgyLDcgKzgyLDcgQEAgY2xhc3MgQXBwbHlBdHRhY2htZW50KENvbW1hbmQpOgog ICAgIG5hbWUgPSAiYXBwbHktYXR0YWNobWVudCIKICAgICBkZWYgX19pbml0X18oc2VsZik6CiAg ICAgICAgIG9wdGlvbnMgPSBXZWJLaXRBcHBseWluZ1NjcmlwdHMuYXBwbHlfb3B0aW9ucygpICsg V2ViS2l0TGFuZGluZ1NjcmlwdHMuY2xlYW5pbmdfb3B0aW9ucygpCi0gICAgICAgIENvbW1hbmQu X19pbml0X18oc2VsZiwgIkFwcGxpZXMgYW4gYXR0YWNobWVudCB0byB0aGUgbG9jYWwgd29ya2lu ZyBkaXJlY3RvcnkuIiwgIkFUVEFDSE1FTlRfSUQiLCBvcHRpb25zPW9wdGlvbnMpCisgICAgICAg IENvbW1hbmQuX19pbml0X18oc2VsZiwgIkFwcGx5IGFuIGF0dGFjaG1lbnQgdG8gdGhlIGxvY2Fs IHdvcmtpbmcgZGlyZWN0b3J5IiwgIkFUVEFDSE1FTlRfSUQiLCBvcHRpb25zPW9wdGlvbnMpCiAK ICAgICBkZWYgZXhlY3V0ZShzZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToKICAgICAgICAgV2Vi S2l0QXBwbHlpbmdTY3JpcHRzLnNldHVwX2Zvcl9wYXRjaF9hcHBseSh0b29sLnNjbSgpLCBvcHRp b25zKQpAQCAtOTUsNyArOTUsNyBAQCBjbGFzcyBBcHBseVBhdGNoZXMoQ29tbWFuZCk6CiAgICAg bmFtZSA9ICJhcHBseS1wYXRjaGVzIgogICAgIGRlZiBfX2luaXRfXyhzZWxmKToKICAgICAgICAg b3B0aW9ucyA9IFdlYktpdEFwcGx5aW5nU2NyaXB0cy5hcHBseV9vcHRpb25zKCkgKyBXZWJLaXRM YW5kaW5nU2NyaXB0cy5jbGVhbmluZ19vcHRpb25zKCkKLSAgICAgICAgQ29tbWFuZC5fX2luaXRf XyhzZWxmLCAiQXBwbGllcyBhbGwgcGF0Y2hlcyBvbiBhIGJ1ZyB0byB0aGUgbG9jYWwgd29ya2lu ZyBkaXJlY3RvcnkuIiwgIkJVR0lEIiwgb3B0aW9ucz1vcHRpb25zKQorICAgICAgICBDb21tYW5k Ll9faW5pdF9fKHNlbGYsICJBcHBseSByZXZpZXdlZCBwYXRjaGVzIGZyb20gcHJvdmlkZWQgYnVn cyB0byB0aGUgbG9jYWwgd29ya2luZyBkaXJlY3RvcnkiLCAiQlVHSUQiLCBvcHRpb25zPW9wdGlv bnMpCiAKICAgICBkZWYgZXhlY3V0ZShzZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToKICAgICAg ICAgV2ViS2l0QXBwbHlpbmdTY3JpcHRzLnNldHVwX2Zvcl9wYXRjaF9hcHBseSh0b29sLnNjbSgp LCBvcHRpb25zKQpAQCAtMTY1LDcgKzE2NSw3IEBAIGNsYXNzIExhbmREaWZmKENvbW1hbmQpOgog ICAgICAgICBdCiAgICAgICAgIG9wdGlvbnMgKz0gV2ViS2l0TGFuZGluZ1NjcmlwdHMuYnVpbGRf b3B0aW9ucygpCiAgICAgICAgIG9wdGlvbnMgKz0gV2ViS2l0TGFuZGluZ1NjcmlwdHMubGFuZF9v cHRpb25zKCkKLSAgICAgICAgQ29tbWFuZC5fX2luaXRfXyhzZWxmLCAiTGFuZHMgdGhlIGN1cnJl bnQgd29ya2luZyBkaXJlY3RvcnkgZGlmZiBhbmQgdXBkYXRlcyB0aGUgYnVnIGlmIHByb3ZpZGVk LiIsICJbQlVHSURdIiwgb3B0aW9ucz1vcHRpb25zKQorICAgICAgICBDb21tYW5kLl9faW5pdF9f KHNlbGYsICJMYW5kIHRoZSBjdXJyZW50IHdvcmtpbmcgZGlyZWN0b3J5IGRpZmYgYW5kIHVwZGF0 ZXMgdGhlIGFzc29jaWF0ZWQgYnVnIGlmIGFueSIsICJbQlVHSURdIiwgb3B0aW9ucz1vcHRpb25z KQogCiAgICAgZGVmIGd1ZXNzX3Jldmlld2VyX2Zyb21fYnVnKHNlbGYsIGJ1Z3MsIGJ1Z19pZCk6 CiAgICAgICAgIHBhdGNoZXMgPSBidWdzLmZldGNoX3Jldmlld2VkX3BhdGNoZXNfZnJvbV9idWco YnVnX2lkKQpAQCAtMjYxLDcgKzI2MSw3IEBAIGNsYXNzIENoZWNrU3R5bGUoQWJzdHJhY3RQYXRj aFByb2Nlc3NpbmdDb21tYW5kKToKICAgICBkZWYgX19pbml0X18oc2VsZik6CiAgICAgICAgIG9w dGlvbnMgPSBXZWJLaXRMYW5kaW5nU2NyaXB0cy5jbGVhbmluZ19vcHRpb25zKCkKICAgICAgICAg b3B0aW9ucyArPSBXZWJLaXRMYW5kaW5nU2NyaXB0cy5idWlsZF9vcHRpb25zKCkKLSAgICAgICAg QWJzdHJhY3RQYXRjaFByb2Nlc3NpbmdDb21tYW5kLl9faW5pdF9fKHNlbGYsICJSdW5zIGNoZWNr LXdlYmtpdC1zdHlsZSBvbiB0aGUgc3BlY2lmaWVkIGF0dGFjaG1lbnRzLiIsICJBVFRBQ0hNRU5U X0lEIFtBVFRBQ0hNRU5UX0lEU10iLCBvcHRpb25zKQorICAgICAgICBBYnN0cmFjdFBhdGNoUHJv Y2Vzc2luZ0NvbW1hbmQuX19pbml0X18oc2VsZiwgIlJ1biBjaGVjay13ZWJraXQtc3R5bGUgb24g dGhlIHNwZWNpZmllZCBhdHRhY2htZW50cyIsICJBVFRBQ0hNRU5UX0lEIFtBVFRBQ0hNRU5UX0lE U10iLCBvcHRpb25zKQogCiAgICAgZGVmIF9mZXRjaF9saXN0X29mX3BhdGNoZXNfdG9fcHJvY2Vz cyhzZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToKICAgICAgICAgcmV0dXJuIG1hcChsYW1iZGEg cGF0Y2hfaWQ6IHRvb2wuYnVncy5mZXRjaF9hdHRhY2htZW50KHBhdGNoX2lkKSwgYXJncykKQEAg LTI5MCw3ICsyOTAsNyBAQCBjbGFzcyBCdWlsZEF0dGFjaG1lbnQoQWJzdHJhY3RQYXRjaFByb2Nl c3NpbmdDb21tYW5kKToKICAgICBkZWYgX19pbml0X18oc2VsZik6CiAgICAgICAgIG9wdGlvbnMg PSBXZWJLaXRMYW5kaW5nU2NyaXB0cy5jbGVhbmluZ19vcHRpb25zKCkKICAgICAgICAgb3B0aW9u cyArPSBXZWJLaXRMYW5kaW5nU2NyaXB0cy5idWlsZF9vcHRpb25zKCkKLSAgICAgICAgQWJzdHJh Y3RQYXRjaFByb2Nlc3NpbmdDb21tYW5kLl9faW5pdF9fKHNlbGYsICJCdWlsZHMgcGF0Y2hlcyBm cm9tIGJ1Z3ppbGxhIiwgIkFUVEFDSE1FTlRfSUQgW0FUVEFDSE1FTlRfSURTXSIsIG9wdGlvbnMp CisgICAgICAgIEFic3RyYWN0UGF0Y2hQcm9jZXNzaW5nQ29tbWFuZC5fX2luaXRfXyhzZWxmLCAi QXBwbHkgYW5kIGJ1aWxkIHBhdGNoZXMgZnJvbSBidWd6aWxsYSIsICJBVFRBQ0hNRU5UX0lEIFtB VFRBQ0hNRU5UX0lEU10iLCBvcHRpb25zKQogCiAgICAgZGVmIF9mZXRjaF9saXN0X29mX3BhdGNo ZXNfdG9fcHJvY2VzcyhzZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToKICAgICAgICAgcmV0dXJu IG1hcChsYW1iZGEgcGF0Y2hfaWQ6IHRvb2wuYnVncy5mZXRjaF9hdHRhY2htZW50KHBhdGNoX2lk KSwgYXJncykKQEAgLTMyMyw3ICszMjMsNyBAQCBjbGFzcyBBYnN0cmFjdFBhdGNoTGFuZGluZ0Nv bW1hbmQoQWJzdHJhY3RQYXRjaFByb2Nlc3NpbmdDb21tYW5kKToKIGNsYXNzIExhbmRBdHRhY2ht ZW50KEFic3RyYWN0UGF0Y2hMYW5kaW5nQ29tbWFuZCk6CiAgICAgbmFtZSA9ICJsYW5kLWF0dGFj aG1lbnQiCiAgICAgZGVmIF9faW5pdF9fKHNlbGYpOgotICAgICAgICBBYnN0cmFjdFBhdGNoTGFu ZGluZ0NvbW1hbmQuX19pbml0X18oc2VsZiwgIkxhbmRzIHBhdGNoZXMgZnJvbSBidWd6aWxsYSwg b3B0aW9uYWxseSBidWlsZGluZyBhbmQgdGVzdGluZyB0aGVtIGZpcnN0IiwgIkFUVEFDSE1FTlRf SUQgW0FUVEFDSE1FTlRfSURTXSIpCisgICAgICAgIEFic3RyYWN0UGF0Y2hMYW5kaW5nQ29tbWFu ZC5fX2luaXRfXyhzZWxmLCAiTGFuZCBwYXRjaGVzIGZyb20gYnVnemlsbGEsIG9wdGlvbmFsbHkg YnVpbGRpbmcgYW5kIHRlc3RpbmcgdGhlbSBmaXJzdCIsICJBVFRBQ0hNRU5UX0lEIFtBVFRBQ0hN RU5UX0lEU10iKQogCiAgICAgZGVmIF9mZXRjaF9saXN0X29mX3BhdGNoZXNfdG9fcHJvY2Vzcyhz ZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToKICAgICAgICAgcmV0dXJuIG1hcChsYW1iZGEgcGF0 Y2hfaWQ6IHRvb2wuYnVncy5mZXRjaF9hdHRhY2htZW50KHBhdGNoX2lkKSwgYXJncykKQEAgLTMz Miw3ICszMzIsNyBAQCBjbGFzcyBMYW5kQXR0YWNobWVudChBYnN0cmFjdFBhdGNoTGFuZGluZ0Nv bW1hbmQpOgogY2xhc3MgTGFuZFBhdGNoZXMoQWJzdHJhY3RQYXRjaExhbmRpbmdDb21tYW5kKToK ICAgICBuYW1lID0gImxhbmQtcGF0Y2hlcyIKICAgICBkZWYgX19pbml0X18oc2VsZik6Ci0gICAg ICAgIEFic3RyYWN0UGF0Y2hMYW5kaW5nQ29tbWFuZC5fX2luaXRfXyhzZWxmLCAiTGFuZHMgYWxs IHBhdGNoZXMgb24gdGhlIGdpdmVuIGJ1Z3MsIG9wdGlvbmFsbHkgYnVpbGRpbmcgYW5kIHRlc3Rp bmcgdGhlbSBmaXJzdCIsICJCVUdJRCBbQlVHSURTXSIpCisgICAgICAgIEFic3RyYWN0UGF0Y2hM YW5kaW5nQ29tbWFuZC5fX2luaXRfXyhzZWxmLCAiTGFuZCBhbGwgcGF0Y2hlcyBvbiB0aGUgZ2l2 ZW4gYnVncywgb3B0aW9uYWxseSBidWlsZGluZyBhbmQgdGVzdGluZyB0aGVtIGZpcnN0IiwgIkJV R0lEIFtCVUdJRFNdIikKIAogICAgIGRlZiBfZmV0Y2hfbGlzdF9vZl9wYXRjaGVzX3RvX3Byb2Nl c3Moc2VsZiwgb3B0aW9ucywgYXJncywgdG9vbCk6CiAgICAgICAgIGFsbF9wYXRjaGVzID0gW10K QEAgLTM0OSw4ICszNDksOCBAQCBjbGFzcyBSb2xsb3V0KENvbW1hbmQpOgogICAgICAgICBvcHRp b25zID0gV2ViS2l0TGFuZGluZ1NjcmlwdHMuY2xlYW5pbmdfb3B0aW9ucygpCiAgICAgICAgIG9w dGlvbnMgKz0gV2ViS2l0TGFuZGluZ1NjcmlwdHMuYnVpbGRfb3B0aW9ucygpCiAgICAgICAgIG9w dGlvbnMgKz0gV2ViS2l0TGFuZGluZ1NjcmlwdHMubGFuZF9vcHRpb25zKCkKLSAgICAgICAgb3B0 aW9ucy5hcHBlbmQobWFrZV9vcHRpb24oIi0tY29tcGxldGUtcm9sbG91dCIsIGFjdGlvbj0ic3Rv cmVfdHJ1ZSIsIGRlc3Q9ImNvbXBsZXRlX3JvbGxvdXQiLCBoZWxwPSJFeHBlcmltZW50YWwgc3Vw cG9ydCBmb3IgY29tcGxldGUgdW5zdXBlcnZpc2VkIHJvbGxvdXRzLCBpbmNsdWRpbmcgcmUtb3Bl bmluZyB0aGUgYnVnLiAgTm90IHJlY29tbWVuZGVkLiIpKQotICAgICAgICBDb21tYW5kLl9faW5p dF9fKHNlbGYsICJSZXZlcnRzIHRoZSBnaXZlbiByZXZpc2lvbiBhbmQgY29tbWl0cyB0aGUgcmV2 ZXJ0IGFuZCByZS1vcGVucyB0aGUgb3JpZ2luYWwgYnVnLiIsICJSRVZJU0lPTiBbQlVHSURdIiwg b3B0aW9ucz1vcHRpb25zKQorICAgICAgICBvcHRpb25zLmFwcGVuZChtYWtlX29wdGlvbigiLS1j b21wbGV0ZS1yb2xsb3V0IiwgYWN0aW9uPSJzdG9yZV90cnVlIiwgZGVzdD0iY29tcGxldGVfcm9s bG91dCIsIGhlbHA9IkNvbW1pdCB0aGUgcmV2ZXJ0IGFuZCByZS1vcGVuIHRoZSBvcmlnaW5hbCBi dWcuIikpCisgICAgICAgIENvbW1hbmQuX19pbml0X18oc2VsZiwgIlJldmVydCB0aGUgZ2l2ZW4g cmV2aXNpb24gaW4gdGhlIHdvcmtpbmcgY29weSBhbmQgb3B0aW9uYWxseSBjb21taXQgdGhlIHJl dmVydCBhbmQgcmUtb3BlbiB0aGUgb3JpZ2luYWwgYnVnIiwgIlJFVklTSU9OIFtCVUdJRF0iLCBv cHRpb25zPW9wdGlvbnMpCiAKICAgICBAc3RhdGljbWV0aG9kCiAgICAgZGVmIF9jcmVhdGVfY2hh bmdlbG9nc19mb3JfcmV2ZXJ0KHNjbSwgcmV2aXNpb24pOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3F1ZXJpZXMucHkgYi9XZWJLaXRUb29scy9TY3Jp cHRzL21vZHVsZXMvY29tbWFuZHMvcXVlcmllcy5weQppbmRleCA3OGNhYzZkLi5iMzA0ODExIDEw MDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvcXVlcmllcy5w eQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvcXVlcmllcy5weQpA QCAtNTcsNyArNTcsNyBAQCBmcm9tIG1vZHVsZXMud29ya3F1ZXVlIGltcG9ydCBXb3JrUXVldWUs IFdvcmtRdWV1ZURlbGVnYXRlCiBjbGFzcyBCdWdzVG9Db21taXQoQ29tbWFuZCk6CiAgICAgbmFt ZSA9ICJidWdzLXRvLWNvbW1pdCIKICAgICBkZWYgX19pbml0X18oc2VsZik6Ci0gICAgICAgIENv bW1hbmQuX19pbml0X18oc2VsZiwgIkJ1Z3MgaW4gdGhlIGNvbW1pdCBxdWV1ZSIpCisgICAgICAg IENvbW1hbmQuX19pbml0X18oc2VsZiwgIkxpc3QgYnVncyBpbiB0aGUgY29tbWl0LXF1ZXVlIikK IAogICAgIGRlZiBleGVjdXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgogICAgICAgICBi dWdfaWRzID0gdG9vbC5idWdzLmZldGNoX2J1Z19pZHNfZnJvbV9jb21taXRfcXVldWUoKQpAQCAt NjgsNyArNjgsNyBAQCBjbGFzcyBCdWdzVG9Db21taXQoQ29tbWFuZCk6CiBjbGFzcyBQYXRjaGVz VG9Db21taXQoQ29tbWFuZCk6CiAgICAgbmFtZSA9ICJwYXRjaGVzLXRvLWNvbW1pdCIKICAgICBk ZWYgX19pbml0X18oc2VsZik6Ci0gICAgICAgIENvbW1hbmQuX19pbml0X18oc2VsZiwgIlBhdGNo ZXMgaW4gdGhlIGNvbW1pdCBxdWV1ZSIpCisgICAgICAgIENvbW1hbmQuX19pbml0X18oc2VsZiwg Ikxpc3QgcGF0Y2hlcyBpbiB0aGUgY29tbWl0LXF1ZXVlIikKIAogICAgIGRlZiBleGVjdXRlKHNl bGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgogICAgICAgICBwYXRjaGVzID0gdG9vbC5idWdzLmZl dGNoX3BhdGNoZXNfZnJvbV9jb21taXRfcXVldWUoKQpAQCAtODAsNyArODAsNyBAQCBjbGFzcyBQ YXRjaGVzVG9Db21taXQoQ29tbWFuZCk6CiBjbGFzcyBSZXZpZXdlZFBhdGNoZXMoQ29tbWFuZCk6 CiAgICAgbmFtZSA9ICJyZXZpZXdlZC1wYXRjaGVzIgogICAgIGRlZiBfX2luaXRfXyhzZWxmKToK LSAgICAgICAgQ29tbWFuZC5fX2luaXRfXyhzZWxmLCAicisnZCBwYXRjaGVzIG9uIGEgYnVnIiwg IkJVR0lEIikKKyAgICAgICAgQ29tbWFuZC5fX2luaXRfXyhzZWxmLCAiTGlzdCByKydkIHBhdGNo ZXMgb24gYSBidWciLCAiQlVHSUQiKQogCiAgICAgZGVmIGV4ZWN1dGUoc2VsZiwgb3B0aW9ucywg YXJncywgdG9vbCk6CiAgICAgICAgIGJ1Z19pZCA9IGFyZ3NbMF0KQEAgLTkyLDcgKzkyLDcgQEAg Y2xhc3MgUmV2aWV3ZWRQYXRjaGVzKENvbW1hbmQpOgogY2xhc3MgVHJlZVN0YXR1cyhDb21tYW5k KToKICAgICBuYW1lID0gInRyZWUtc3RhdHVzIgogICAgIGRlZiBfX2luaXRfXyhzZWxmKToKLSAg ICAgICAgQ29tbWFuZC5fX2luaXRfXyhzZWxmLCAiUHJpbnQgb3V0IHRoZSBzdGF0dXMgb2YgdGhl IHdlYmtpdCBidWlsZGVycy4iKQorICAgICAgICBDb21tYW5kLl9faW5pdF9fKHNlbGYsICJQcmlu dCB0aGUgc3RhdHVzIG9mIHRoZSAlcyBidWlsZGJvdHMiICUgQnVpbGRCb3QuZGVmYXVsdF9ob3N0 KQogCiAgICAgZGVmIGV4ZWN1dGUoc2VsZiwgb3B0aW9ucywgYXJncywgdG9vbCk6CiAgICAgICAg IGZvciBidWlsZGVyIGluIHRvb2wuYnVpbGRib3QuYnVpbGRlcl9zdGF0dXNlcygpOgpkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3F1ZXVlcy5weSBiL1dl YktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy9xdWV1ZXMucHkKaW5kZXggZmVlN2Y2 ZC4uYWRjMTJiZSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1h bmRzL3F1ZXVlcy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMv cXVldWVzLnB5CkBAIC02MCw3ICs2MCw3IEBAIGNsYXNzIEFic3RyYWN0UXVldWUoQ29tbWFuZCwg V29ya1F1ZXVlRGVsZWdhdGUpOgogICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0tbm8tY29uZmly bSIsIGFjdGlvbj0ic3RvcmVfZmFsc2UiLCBkZXN0PSJjb25maXJtIiwgZGVmYXVsdD1UcnVlLCBo ZWxwPSJEbyBub3QgYXNrIHRoZSB1c2VyIGZvciBjb25maXJtYXRpb24gYmVmb3JlIHJ1bm5pbmcg dGhlIHF1ZXVlLiAgRGFuZ2Vyb3VzISIpLAogICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0tc3Rh dHVzLWhvc3QiLCBhY3Rpb249InN0b3JlIiwgdHlwZT0ic3RyaW5nIiwgZGVzdD0ic3RhdHVzX2hv c3QiLCBkZWZhdWx0PVN0YXR1c0JvdC5kZWZhdWx0X2hvc3QsIGhlbHA9Ikhvc3RuYW1lIChlLmcu IGxvY2FsaG9zdCBvciBjb21taXQud2Via2l0Lm9yZykgd2hlcmUgc3RhdHVzIHVwZGF0ZXMgc2hv dWxkIGJlIHBvc3RlZC4iKSwKICAgICAgICAgXQotICAgICAgICBDb21tYW5kLl9faW5pdF9fKHNl bGYsICJSdW4gdGhlICVzLiIgJSBzZWxmLm5hbWUsIG9wdGlvbnM9b3B0aW9ucykKKyAgICAgICAg Q29tbWFuZC5fX2luaXRfXyhzZWxmLCAiUnVuIHRoZSAlcyIgJSBzZWxmLm5hbWUsIG9wdGlvbnM9 b3B0aW9ucykKIAogICAgIGRlZiBxdWV1ZV9sb2dfcGF0aChzZWxmKToKICAgICAgICAgcmV0dXJu ICIlcy5sb2ciICUgc2VsZi5uYW1lCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21v ZHVsZXMvY29tbWFuZHMvdXBsb2FkLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2Nv bW1hbmRzL3VwbG9hZC5weQppbmRleCA0MmUyM2QzLi43ZWM0MjM4IDEwMDY0NAotLS0gYS9XZWJL aXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvdXBsb2FkLnB5CisrKyBiL1dlYktpdFRv b2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy91cGxvYWQucHkKQEAgLTU3LDcgKzU3LDcgQEAg ZnJvbSBtb2R1bGVzLndvcmtxdWV1ZSBpbXBvcnQgV29ya1F1ZXVlLCBXb3JrUXVldWVEZWxlZ2F0 ZQogY2xhc3MgQ29tbWl0TWVzc2FnZUZvckN1cnJlbnREaWZmKENvbW1hbmQpOgogICAgIG5hbWUg PSAiY29tbWl0LW1lc3NhZ2UiCiAgICAgZGVmIF9faW5pdF9fKHNlbGYpOgotICAgICAgICBDb21t YW5kLl9faW5pdF9fKHNlbGYsICJQcmludHMgYSBjb21taXQgbWVzc2FnZSBzdWl0YWJsZSBmb3Ig dGhlIHVuY29tbWl0dGVkIGNoYW5nZXMuIikKKyAgICAgICAgQ29tbWFuZC5fX2luaXRfXyhzZWxm LCAiUHJpbnQgYSBjb21taXQgbWVzc2FnZSBzdWl0YWJsZSBmb3IgdGhlIHVuY29tbWl0dGVkIGNo YW5nZXMiKQogCiAgICAgZGVmIGV4ZWN1dGUoc2VsZiwgb3B0aW9ucywgYXJncywgdG9vbCk6CiAg ICAgICAgIG9zLmNoZGlyKHRvb2wuc2NtKCkuY2hlY2tvdXRfcm9vdCkKQEAgLTY3LDcgKzY3LDcg QEAgY2xhc3MgQ29tbWl0TWVzc2FnZUZvckN1cnJlbnREaWZmKENvbW1hbmQpOgogY2xhc3MgT2Jz b2xldGVBdHRhY2htZW50cyhDb21tYW5kKToKICAgICBuYW1lID0gIm9ic29sZXRlLWF0dGFjaG1l bnRzIgogICAgIGRlZiBfX2luaXRfXyhzZWxmKToKLSAgICAgICAgQ29tbWFuZC5fX2luaXRfXyhz ZWxmLCAiTWFya3MgYWxsIGF0dGFjaG1lbnRzIG9uIGEgYnVnIGFzIG9ic29sZXRlLiIsICJCVUdJ RCIpCisgICAgICAgIENvbW1hbmQuX19pbml0X18oc2VsZiwgIk1hcmsgYWxsIGF0dGFjaG1lbnRz IG9uIGEgYnVnIGFzIG9ic29sZXRlIiwgIkJVR0lEIikKIAogICAgIGRlZiBleGVjdXRlKHNlbGYs IG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgogICAgICAgICBidWdfaWQgPSBhcmdzWzBdCkBAIC04NCw3 ICs4NCw3IEBAIGNsYXNzIFBvc3REaWZmKENvbW1hbmQpOgogICAgICAgICAgICAgbWFrZV9vcHRp b24oIi1tIiwgIi0tZGVzY3JpcHRpb24iLCBhY3Rpb249InN0b3JlIiwgdHlwZT0ic3RyaW5nIiwg ZGVzdD0iZGVzY3JpcHRpb24iLCBoZWxwPSJEZXNjcmlwdGlvbiBzdHJpbmcgZm9yIHRoZSBhdHRh Y2htZW50IChkZWZhdWx0OiBcInBhdGNoXCIpIiksCiAgICAgICAgIF0KICAgICAgICAgb3B0aW9u cyArPSBzZWxmLnBvc3Rpbmdfb3B0aW9ucygpCi0gICAgICAgIENvbW1hbmQuX19pbml0X18oc2Vs ZiwgIkF0dGFjaGVzIHRoZSBjdXJyZW50IHdvcmtpbmcgZGlyZWN0b3J5IGRpZmYgdG8gYSBidWcg YXMgYSBwYXRjaCBmaWxlLiIsICJbQlVHSURdIiwgb3B0aW9ucz1vcHRpb25zKQorICAgICAgICBD b21tYW5kLl9faW5pdF9fKHNlbGYsICJBdHRhY2ggdGhlIGN1cnJlbnQgd29ya2luZyBkaXJlY3Rv cnkgZGlmZiB0byBhIGJ1ZyBhcyBhIHBhdGNoIGZpbGUiLCAiW0JVR0lEXSIsIG9wdGlvbnM9b3B0 aW9ucykKIAogICAgIEBzdGF0aWNtZXRob2QKICAgICBkZWYgcG9zdGluZ19vcHRpb25zKCk6CkBA IC0xMjcsNyArMTI3LDcgQEAgY2xhc3MgUG9zdENvbW1pdHMoQ29tbWFuZCk6CiAgICAgICAgICAg ICBtYWtlX29wdGlvbigiLW0iLCAiLS1kZXNjcmlwdGlvbiIsIGFjdGlvbj0ic3RvcmUiLCB0eXBl PSJzdHJpbmciLCBkZXN0PSJkZXNjcmlwdGlvbiIsIGhlbHA9IkRlc2NyaXB0aW9uIHN0cmluZyBm b3IgdGhlIGF0dGFjaG1lbnQgKGRlZmF1bHQ6IGRlc2NyaXB0aW9uIGZyb20gY29tbWl0IG1lc3Nh Z2UpIiksCiAgICAgICAgIF0KICAgICAgICAgb3B0aW9ucyArPSBQb3N0RGlmZi5wb3N0aW5nX29w dGlvbnMoKQotICAgICAgICBDb21tYW5kLl9faW5pdF9fKHNlbGYsICJBdHRhY2hlcyBhIHJhbmdl IG9mIGxvY2FsIGNvbW1pdHMgdG8gYnVncyBhcyBwYXRjaCBmaWxlcy4iLCAiQ09NTUlUSVNIIiwg b3B0aW9ucz1vcHRpb25zLCByZXF1aXJlc19sb2NhbF9jb21taXRzPVRydWUpCisgICAgICAgIENv bW1hbmQuX19pbml0X18oc2VsZiwgIkF0dGFjaCBhIHJhbmdlIG9mIGxvY2FsIGNvbW1pdHMgdG8g YnVncyBhcyBwYXRjaCBmaWxlcyIsICJDT01NSVRJU0giLCBvcHRpb25zPW9wdGlvbnMsIHJlcXVp cmVzX2xvY2FsX2NvbW1pdHM9VHJ1ZSkKIAogICAgIGRlZiBfY29tbWVudF90ZXh0X2Zvcl9jb21t aXQoc2VsZiwgb3B0aW9ucywgY29tbWl0X21lc3NhZ2UsIHRvb2wsIGNvbW1pdF9pZCk6CiAgICAg ICAgIGNvbW1lbnRfdGV4dCA9IE5vbmUKQEAgLTE3OSw3ICsxNzksNyBAQCBjbGFzcyBDcmVhdGVC dWcoQ29tbWFuZCk6CiAgICAgICAgICAgICBtYWtlX29wdGlvbigiLS1uby1yZXZpZXciLCBhY3Rp b249InN0b3JlX2ZhbHNlIiwgZGVzdD0icmV2aWV3IiwgZGVmYXVsdD1UcnVlLCBoZWxwPSJEbyBu b3QgbWFyayB0aGUgcGF0Y2ggZm9yIHJldmlldy4iKSwKICAgICAgICAgICAgIG1ha2Vfb3B0aW9u KCItLXJlcXVlc3QtY29tbWl0IiwgYWN0aW9uPSJzdG9yZV90cnVlIiwgZGVzdD0icmVxdWVzdF9j b21taXQiLCBkZWZhdWx0PUZhbHNlLCBoZWxwPSJNYXJrIHRoZSBwYXRjaCBhcyBuZWVkaW5nIGF1 dG8tY29tbWl0IGFmdGVyIHJldmlldy4iKSwKICAgICAgICAgXQotICAgICAgICBDb21tYW5kLl9f aW5pdF9fKHNlbGYsICJDcmVhdGUgYSBidWcgZnJvbSBsb2NhbCBjaGFuZ2VzIG9yIGxvY2FsIGNv bW1pdHMuIiwgIltDT01NSVRJU0hdIiwgb3B0aW9ucz1vcHRpb25zKQorICAgICAgICBDb21tYW5k Ll9faW5pdF9fKHNlbGYsICJDcmVhdGUgYSBidWcgZnJvbSBsb2NhbCBjaGFuZ2VzIG9yIGxvY2Fs IGNvbW1pdHMiLCAiW0NPTU1JVElTSF0iLCBvcHRpb25zPW9wdGlvbnMpCiAKICAgICBkZWYgY3Jl YXRlX2J1Z19mcm9tX2NvbW1pdChzZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToKICAgICAgICAg Y29tbWl0X2lkcyA9IHRvb2wuc2NtKCkuY29tbWl0X2lkc19mcm9tX2NvbW1pdGlzaF9hcmd1bWVu dHMoYXJncykKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9tdWx0aWNv bW1hbmR0b29sLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL211bHRpY29tbWFuZHRv b2wucHkKaW5kZXggOTAxNDhiMi4uZmJlYmI3MyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy9tb2R1bGVzL211bHRpY29tbWFuZHRvb2wucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy9tb2R1bGVzL211bHRpY29tbWFuZHRvb2wucHkKQEAgLTYwLDMwICs2MCwzMSBAQCBjbGFzcyBD b21tYW5kKG9iamVjdCk6CiAgICAgZGVmIGV4ZWN1dGUoc2VsZiwgb3B0aW9ucywgYXJncywgdG9v bCk6CiAgICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IsICJzdWJjbGFzc2VzIG11c3Qg aW1wbGVtZW50IgogCi1jbGFzcyBOb25XcmFwcGluZ0VwaWxvZ0luZGVudGVkSGVscEZvcm1hdHRl cihJbmRlbnRlZEhlbHBGb3JtYXR0ZXIpOgotICAgICMgVGhlIHN0YW5kYXJkIEluZGVudGVkSGVs cEZvcm1hdHRlciBwYXJhZ3JhcGgtd3JhcHMgdGhlIGVwaWxvZywga2lsbGluZyBvdXIgY3VzdG9t IGZvcm1hdHRpbmcuCi0gICAgZGVmIGZvcm1hdF9lcGlsb2coc2VsZiwgZXBpbG9nKToKLSAgICAg ICAgaWYgZXBpbG9nOgotICAgICAgICAgICAgcmV0dXJuICJcbiIgKyBlcGlsb2cgKyAiXG4iCi0g ICAgICAgIHJldHVybiAiIgotCiAKIGNsYXNzIEhlbHBQcmludGluZ09wdGlvblBhcnNlcihPcHRp b25QYXJzZXIpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBlcGlsb2dfbWV0aG9kPU5vbmUsICph cmdzLCAqKmt3YXJncyk6CisgICAgICAgIHNlbGYuZXBpbG9nX21ldGhvZCA9IGVwaWxvZ19tZXRo b2QKKyAgICAgICAgT3B0aW9uUGFyc2VyLl9faW5pdF9fKHNlbGYsICphcmdzLCAqKmt3YXJncykK KwogICAgIGRlZiBlcnJvcihzZWxmLCBtc2cpOgogICAgICAgICBzZWxmLnByaW50X3VzYWdlKHN5 cy5zdGRlcnIpCiAgICAgICAgIGVycm9yX21lc3NhZ2UgPSAiJXM6IGVycm9yOiAlc1xuIiAlIChz ZWxmLmdldF9wcm9nX25hbWUoKSwgbXNnKQogICAgICAgICBlcnJvcl9tZXNzYWdlICs9ICJcblR5 cGUgXCIiICsgc2VsZi5nZXRfcHJvZ19uYW1lKCkgKyAiIC0taGVscFwiIHRvIHNlZSB1c2FnZS5c biIKICAgICAgICAgc2VsZi5leGl0KDEsIGVycm9yX21lc3NhZ2UpCiAKKyAgICAjIFdlIG92ZXJy aWRlIGZvcm1hdF9lcGlsb2cgdG8gYXZvaWQgdGhlIGRlZmF1bHQgZm9ybWF0dGluZyB3aGljaCB3 b3VsZCBwYXJhZ3JhcGgtd3JhcCB0aGUgZXBpbG9nCisgICAgIyBhbmQgYWxzbyB0byBhbGxvdyB1 cyB0byBjb21wdXRlIHRoZSBlcGlsb2cgbGF6aWx5IGluc3RlYWQgb2YgaW4gdGhlIGNvbnN0cnVj dG9yIChhbGxvd2luZyBpdCB0byBiZSBjb250ZXh0IHNlbnNpdGl2ZSkuCisgICAgZGVmIGZvcm1h dF9lcGlsb2coc2VsZiwgZXBpbG9nKToKKyAgICAgICAgaWYgc2VsZi5lcGlsb2dfbWV0aG9kOgor ICAgICAgICAgICAgcmV0dXJuICJcbiVzXG4iICUgc2VsZi5lcGlsb2dfbWV0aG9kKCkKKyAgICAg ICAgcmV0dXJuICIiCisKIAogY2xhc3MgTXVsdGlDb21tYW5kVG9vbChvYmplY3QpOgogICAgIGRl ZiBfX2luaXRfXyhzZWxmLCBjb21tYW5kcz1Ob25lKToKICAgICAgICAgIyBBbGxvdyB0aGUgdW5p dCB0ZXN0cyB0byBkaXNhYmxlIGNvbW1hbmQgYXV0by1kaXNjb3ZlcnkuCiAgICAgICAgIHNlbGYu Y29tbWFuZHMgPSBjb21tYW5kcyBvciBbY2xzKCkgZm9yIGNscyBpbiBzZWxmLl9maW5kX2FsbF9j b21tYW5kcygpIGlmIGNscy5uYW1lXQotICAgICAgICAjIEZJWE1FOiBDYWxsaW5nIHNlbGYuX2Nv bW1hbmRzX3VzYWdlKCkgaW4gdGhlIGNvbnN0cnVjdG9yIGlzIGJhZCBiZWNhdXNlCi0gICAgICAg ICMgaXQgY2FsbHMgc2VsZi5zaG91bGRfc2hvd19jb21tYW5kX2hlbHAgd2hpY2ggaXMgc3ViY2xh c3MtZGVmaW5lZC4KLSAgICAgICAgIyBUaGUgc3ViY2xhc3Mgd2lsbCBub3QgYmUgZnVsbHkgaW5p dGlhbGl6ZWQgYXQgdGhpcyBwb2ludC4KLSAgICAgICAgc2VsZi5nbG9iYWxfb3B0aW9uX3BhcnNl ciA9IEhlbHBQcmludGluZ09wdGlvblBhcnNlcih1c2FnZT1zZWxmLl91c2FnZV9saW5lKCksIGZv cm1hdHRlcj1Ob25XcmFwcGluZ0VwaWxvZ0luZGVudGVkSGVscEZvcm1hdHRlcigpLCBlcGlsb2c9 c2VsZi5fY29tbWFuZHNfdXNhZ2UoKSkKKyAgICAgICAgc2VsZi5nbG9iYWxfb3B0aW9uX3BhcnNl ciA9IEhlbHBQcmludGluZ09wdGlvblBhcnNlcihlcGlsb2dfbWV0aG9kPXNlbGYuX2hlbHBfZXBp bG9nLCB1c2FnZT1zZWxmLl91c2FnZV9saW5lKCkpCiAKICAgICBAY2xhc3NtZXRob2QKICAgICBk ZWYgX2FkZF9hbGxfc3ViY2xhc3NlcyhjbHMsIGNsYXNzX3RvX2NyYXdsLCBzZWVuX2NsYXNzZXMp OgpAQCAtMTAwLDMxICsxMDEsMjQgQEAgY2xhc3MgTXVsdGlDb21tYW5kVG9vbChvYmplY3QpOgog CiAgICAgQHN0YXRpY21ldGhvZAogICAgIGRlZiBfdXNhZ2VfbGluZSgpOgotICAgICAgICByZXR1 cm4gIlVzYWdlOiAlcHJvZyBbb3B0aW9uc10gY29tbWFuZCBbY29tbWFuZC1vcHRpb25zXSBbY29t bWFuZC1hcmd1bWVudHNdIgotCi0gICAgZGVmIF9jb21tYW5kX2hlbHBfZm9ybWF0dGVyKHNlbGYp OgotICAgICAgICAjIFVzZSBvdXIgb3duIGhlbHAgZm9ybWF0dGVyIHNvIGFzIHRvIGluZGVudCBl bm91Z2guCi0gICAgICAgIGZvcm1hdHRlciA9IEluZGVudGVkSGVscEZvcm1hdHRlcigpCi0gICAg ICAgIGZvcm1hdHRlci5pbmRlbnQoKQotICAgICAgICBmb3JtYXR0ZXIuaW5kZW50KCkKLSAgICAg ICAgcmV0dXJuIGZvcm1hdHRlcgotCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIF9oZWxwX2Zv cl9jb21tYW5kKGNscywgY29tbWFuZCwgZm9ybWF0dGVyLCBsb25nZXN0X25hbWVfbGVuZ3RoKToK LSAgICAgICAgaGVscF90ZXh0ID0gIiAgIiArIGNvbW1hbmQubmFtZV93aXRoX2FyZ3VtZW50cygp LmxqdXN0KGxvbmdlc3RfbmFtZV9sZW5ndGggKyAzKSArIGNvbW1hbmQuaGVscF90ZXh0ICsgIlxu IgotICAgICAgICBoZWxwX3RleHQgKz0gY29tbWFuZC5vcHRpb25fcGFyc2VyLmZvcm1hdF9vcHRp b25faGVscChmb3JtYXR0ZXIpCi0gICAgICAgIHJldHVybiBoZWxwX3RleHQKKyAgICAgICAgcmV0 dXJuICJVc2FnZTogJXByb2cgW29wdGlvbnNdIENPTU1BTkQgW0FSR1NdIgogCiAgICAgQGNsYXNz bWV0aG9kCiAgICAgZGVmIF9zdGFuZGFsb25lX2hlbHBfZm9yX2NvbW1hbmQoY2xzLCBjb21tYW5k KToKLSAgICAgICAgcmV0dXJuIGNscy5faGVscF9mb3JfY29tbWFuZChjb21tYW5kLCBJbmRlbnRl ZEhlbHBGb3JtYXR0ZXIoKSwgbGVuKGNvbW1hbmQubmFtZV93aXRoX2FyZ3VtZW50cygpKSkKKyAg ICAgICAgaGVscF90ZXh0ID0gY29tbWFuZC5uYW1lX3dpdGhfYXJndW1lbnRzKCkubGp1c3QobGVu KGNvbW1hbmQubmFtZV93aXRoX2FyZ3VtZW50cygpKSArIDMpICsgY29tbWFuZC5oZWxwX3RleHQg KyAiXG4iCisgICAgICAgIGhlbHBfdGV4dCArPSBjb21tYW5kLm9wdGlvbl9wYXJzZXIuZm9ybWF0 X29wdGlvbl9oZWxwKEluZGVudGVkSGVscEZvcm1hdHRlcigpKQorICAgICAgICByZXR1cm4gaGVs cF90ZXh0CiAKLSAgICBkZWYgX2NvbW1hbmRzX3VzYWdlKHNlbGYpOgotICAgICAgICAjIE9ubHkg c2hvdyBjb21tYW5kcyB3aGljaCBhcmUgcmVsZXZhbnQgdG8gdGhpcyBjaGVja291dC4gIFRoaXMg bWlnaHQgYmUgY29uZnVzaW5nIHRvIHNvbWUgdXNlcnM/CisgICAgZGVmIF9oZWxwX2VwaWxvZyhz ZWxmKToKKyAgICAgICAgIyBPbmx5IHNob3cgY29tbWFuZHMgd2hpY2ggYXJlIHJlbGV2YW50IHRv IHRoaXMgY2hlY2tvdXQncyBTQ00gc3lzdGVtLiAgTWlnaHQgdGhpcyBiZSBjb25mdXNpbmcgdG8g c29tZSB1c2Vycz8KICAgICAgICAgcmVsZXZhbnRfY29tbWFuZHMgPSBmaWx0ZXIoc2VsZi5zaG91 bGRfc2hvd19jb21tYW5kX2hlbHAsIHNlbGYuY29tbWFuZHMpCi0gICAgICAgIGxvbmdlc3RfbmFt ZV9sZW5ndGggPSBtYXgobWFwKGxhbWJkYSBjb21tYW5kOiBsZW4oY29tbWFuZC5uYW1lX3dpdGhf YXJndW1lbnRzKCkpLCByZWxldmFudF9jb21tYW5kcykpCi0gICAgICAgIGNvbW1hbmRfaGVscF90 ZXh0cyA9IG1hcChsYW1iZGEgY29tbWFuZDogc2VsZi5faGVscF9mb3JfY29tbWFuZChjb21tYW5k LCBzZWxmLl9jb21tYW5kX2hlbHBfZm9ybWF0dGVyKCksIGxvbmdlc3RfbmFtZV9sZW5ndGgpLCBy ZWxldmFudF9jb21tYW5kcykKLSAgICAgICAgcmV0dXJuICJDb21tYW5kczpcbiIgKyAiIi5qb2lu KGNvbW1hbmRfaGVscF90ZXh0cykKKyAgICAgICAgbG9uZ2VzdF9uYW1lX2xlbmd0aCA9IG1heCht YXAobGFtYmRhIGNvbW1hbmQ6IGxlbihjb21tYW5kLm5hbWUpLCByZWxldmFudF9jb21tYW5kcykp CisgICAgICAgIHJlbGV2YW50X2NvbW1hbmRzLnNvcnQobGFtYmRhIGEsIGI6IGNtcChhLm5hbWUs IGIubmFtZSkpCisgICAgICAgIGNvbW1hbmRfaGVscF90ZXh0cyA9IG1hcChsYW1iZGEgY29tbWFu ZDogIiAgICVzICAgJXNcbiIgJSAoY29tbWFuZC5uYW1lLmxqdXN0KGxvbmdlc3RfbmFtZV9sZW5n dGgpLCBjb21tYW5kLmhlbHBfdGV4dCksIHJlbGV2YW50X2NvbW1hbmRzKQorICAgICAgICBlcGls b2cgPSAiJXByb2cgc3VwcG9ydHMgdGhlIGZvbGxvd2luZyBjb21tYW5kczpcbiIKKyAgICAgICAg ZXBpbG9nICs9ICIlc1xuIiAlICIiLmpvaW4oY29tbWFuZF9oZWxwX3RleHRzKQorICAgICAgICBl cGlsb2cgKz0gIlNlZSAnJXByb2cgaGVscCBDT01NQU5EJyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBv biBhIHNwZWNpZmljIGNvbW1hbmQuXG4iCisgICAgICAgIHJldHVybiBzZWxmLmdsb2JhbF9vcHRp b25fcGFyc2VyLmV4cGFuZF9wcm9nX25hbWUoZXBpbG9nKQogCiAgICAgZGVmIGhhbmRsZV9nbG9i YWxfYXJncyhzZWxmLCBhcmdzKToKICAgICAgICAgKG9wdGlvbnMsIGFyZ3MpID0gc2VsZi5nbG9i YWxfb3B0aW9uX3BhcnNlci5wYXJzZV9hcmdzKGFyZ3MpCg==