28199 2009-08-11 16:07:48 -0700 bugzilla-tool : various improvements for running the commit-queue 2009-08-12 09:26:26 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned abarth oldest_to_newest 139154 0 eric 2009-08-11 16:07:48 -0700 bugzilla-tool : various improvements for running the commit-queue I've been running the commit-queue today and found a bunch of little bugs in bugzilla-tool which I will post a patch here to fix. 139155 1 34610 eric 2009-08-11 16:14:41 -0700 Created attachment 34610 Various little fixes for the commit-queue 139157 2 abarth 2009-08-11 16:18:38 -0700 I'll review this in detail after dinner. For the moment, you should use os.devnull instead of "/dev/null" 139207 3 34610 abarth 2009-08-11 19:16:32 -0700 Comment on attachment 34610 Various little fixes for the commit-queue These are all good bugs to fix. Two minor things to fix before landing: 1) "/dev/null" -> os.devnull 2) "Clearing review flag on attachment" -> this text now doesn't quite match what we're doing. 139352 4 eric 2009-08-12 09:22:15 -0700 Thanks. FIxed. 139355 5 eric 2009-08-12 09:26:26 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebKitTools/ChangeLog M WebKitTools/Scripts/bugzilla-tool M WebKitTools/Scripts/modules/bugzilla.py M WebKitTools/Scripts/modules/scm.py Committed r47111 M WebKitTools/ChangeLog M WebKitTools/Scripts/modules/bugzilla.py M WebKitTools/Scripts/modules/scm.py M WebKitTools/Scripts/bugzilla-tool r47111 = 431ef60608c95da88d3bc13bae5b7663484f029f (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/47111 34610 2009-08-11 16:14:41 -0700 2009-08-11 19:16:31 -0700 Various little fixes for the commit-queue bug-28199-20090811161440.patch text/plain 10854 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAxZDQyNTk4Li5kODc1YTRiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjYgQEAKIDIwMDktMDgt MTEgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGJ1Z3ppbGxhLXRvb2wgOiB2YXJpb3VzIGltcHJv dmVtZW50cyBmb3IgcnVubmluZyB0aGUgY29tbWl0LXF1ZXVlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODE5OQorCisgICAgICAgIE1ha2UgcnVuX2Fu ZF90aHJvd19pZl9mYWlsIHNpbGVuY2UgU1RERVJSIGFzIHdlbGwgYXMgU1RESU4uCisgICAgICAg IEkgYWxzbyBjaGFuZ2VkIHJ1bl9hbmRfdGhyb3dfaWZfZmFpbCB0byB1c2UgdGhlIC9kZXYvbnVs bCB0cmljayBpbnN0ZWFkIG9mIC5jb21tdW5pY2F0ZSgpIHRvIGF2b2lkIGV2ZXIgYnVmZmVyaW5n IHRoZSBvdXRwdXQgKHBlciBhYmFydGgncyBzdWdnZXN0aW9uKS4KKyAgICAgICAgQ2hhbmdlIGEg ZmV3ICJwcmludCIgc3RhdGVtZW50cyB0byAibG9nIiBzbyB0aGV5IGFwcGVhciBpbiB0aGUgb3V0 cHV0LgorICAgICAgICBDaGFuZ2VkIGFsbCBzdHJpbmcgKyB1c2VzIHRvIHVzZSBzdHJpbmcgZm9y bWF0dGluZyBpbnN0ZWFkICh0aGlzIGlzIGxlc3MgZXJyb3IgcHJvbmUgYXMgaXQgd2lsbCBhdXRv bWF0aWNhbGx5IGNvbnZlcnQgbm9uLXN0cmluZyBvYmplY3RzKS4KKyAgICAgICAgQWRkZWQgYSBs aXR0bGUgbW9yZSBsb2dnaW5nIHNvIHRoYXQgLS1xdWlldCBtb2RlIGlzIGVhc2llciB0byB1bmRl cnN0YW5kLgorICAgICAgICBDaGFuZ2VkIGNsZWFyX2F0dGFjaG1lbnRfcmV2aWV3X2ZsYWcgdG8g Y2xlYXJfYXR0YWNobWVudF9mbGFncyBhbmQgbWFkZSBpdCBjbGVhciB0aGUgY29tbWl0LXF1ZXVl IGZsYWcgYXMgd2VsbC4KKyAgICAgICAgQWRkZWQgdGhlIGFiaWxpdHkgZm9yIGJ1Z3ppbGxhLXRv b2wgdG8gcmVqZWN0IHBhdGNoZXMgZnJvbSB0aGUgY29tbWl0LXF1ZXVlIHdoZW4gdGhleSBmYWls IHRvIGNvbXBpbGUvYXBwbHkvZXRjLgorICAgICAgICBBZGRlZCBfZmluZF9zZWxlY3RfZWxlbWVu dF9mb3JfZmxhZyB0byBtYWtlIHRoZSBjb2RlIGZvciBmaW5kaW5nIGZsYWcgPHNlbGVjdD4gZWxl bWVudHMgY2xlYXJlci4KKyAgICAgICAgTWFkZSBjdXJsIGNhbGwgKGRvd25sb2FkaW5nIHBhdGNo IGZpbGVzKSBxdWlldGVyLgorCisgICAgICAgICogU2NyaXB0cy9idWd6aWxsYS10b29sOgorICAg ICAgICAqIFNjcmlwdHMvbW9kdWxlcy9idWd6aWxsYS5weToKKyAgICAgICAgKiBTY3JpcHRzL21v ZHVsZXMvc2NtLnB5OgorCisyMDA5LTA4LTExICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9y Zz4KKwogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgogCiAgICAgICAgIGJ1Z3ppbGxh LXRvb2w6IFJlLWZhY3RvciBzaGFyZWQgbGFuZGluZyBsb2dpYyBpbnRvIGhlbHBlciBjbGFzcyB0 byBzaGFyZSBtb3JlIGNvZGUKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemls bGEtdG9vbCBiL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbAppbmRleCBhNThlOTk1 Li5mM2QwYjUwIDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wK KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sCkBAIC0yNDIsMTEgKzI0Miwx NSBAQCBjbGFzcyBXZWJLaXRMYW5kaW5nU2NyaXB0czoKIAogICAgICBAc3RhdGljbWV0aG9kCiAg ICAgIGRlZiBydW5fYW5kX3Rocm93X2lmX2ZhaWwoYXJncywgcXVpZXQ9RmFsc2UpOgotICAgICAg ICAgY2hpbGRfc3Rkb3V0ID0gc3VicHJvY2Vzcy5QSVBFIGlmIHF1aWV0IGVsc2UgTm9uZQotICAg ICAgICAgY2hpbGRfcHJvY2VzcyA9IHN1YnByb2Nlc3MuUG9wZW4oYXJncywgc3Rkb3V0PWNoaWxk X3N0ZG91dCkKLSAgICAgICAgIGlmIGNoaWxkX3Byb2Nlc3Muc3Rkb3V0OgotICAgICAgICAgICAg IGNoaWxkX3Byb2Nlc3MuY29tbXVuaWNhdGUoKQorICAgICAgICAgIyBQYXNzaW5nIE5vbmUgd2ls bCB1c2UgdGhlIGRlZmF1bHQgaW5wdXQvb3V0cHV0cworICAgICAgICAgY2hpbGRfb3V0cHV0ID0g b3BlbigiL2Rldi9udWxsIiwgInciKSBpZiBxdWlldCBlbHNlIE5vbmUKKworICAgICAgICAgY2hp bGRfcHJvY2VzcyA9IHN1YnByb2Nlc3MuUG9wZW4oYXJncywgc3Rkb3V0PWNoaWxkX291dHB1dCwg c3RkZXJyPWNoaWxkX291dHB1dCkKICAgICAgICAgIHJldHVybl9jb2RlID0gY2hpbGRfcHJvY2Vz cy53YWl0KCkKKworICAgICAgICAgaWYgY2hpbGRfb3V0cHV0OgorICAgICAgICAgICAgIGNoaWxk X291dHB1dC5jbG9zZSgpCisKICAgICAgICAgIGlmIHJldHVybl9jb2RlOgogICAgICAgICAgICAg IHJhaXNlIFNjcmlwdEVycm9yKCIlcyBmYWlsZWQgd2l0aCBleGl0IGNvZGUgJWQiICUgKCIgIi5q b2luKGFyZ3MpLCByZXR1cm5fY29kZSkpCiAKQEAgLTI1Nyw3ICsyNjEsNyBAQCBjbGFzcyBXZWJL aXRMYW5kaW5nU2NyaXB0czoKIAogICAgICBAY2xhc3NtZXRob2QKICAgICAgZGVmIHJ1bl93ZWJr aXRfc2NyaXB0KGNscywgc2NyaXB0X25hbWUsIHF1aWV0PUZhbHNlKToKLSAgICAgICAgIHByaW50 ICJSdW5uaW5nIFdlYktpdCBTY3JpcHQgIiArIHNjcmlwdF9uYW1lCisgICAgICAgICBsb2coIlJ1 bm5pbmcgJXMiICUgc2NyaXB0X25hbWUpCiAgICAgICAgICBjbHMucnVuX2FuZF90aHJvd19pZl9m YWlsKGNscy53ZWJraXRfc2NyaXB0X3BhdGgoc2NyaXB0X25hbWUpLCBxdWlldCkKIAogICAgICBA Y2xhc3NtZXRob2QKQEAgLTM1NiwxMyArMzYwLDE1IEBAIGNsYXNzIExhbmRQYXRjaGVzRnJvbUJ1 Z3MoQ29tbWFuZCk6CiAgICAgICAgICAgICBjb21tZW50X3RleHQgPSAiIgogICAgICAgICAgICAg Zm9yIHBhdGNoIGluIHBhdGNoZXM6CiAgICAgICAgICAgICAgICAgdG9vbC5zY20oKS51cGRhdGVf d2Via2l0KCkgIyBVcGRhdGUgYmVmb3JlIGV2ZXJ5IHBhdGNoIGluIGNhc2UgdGhlIHRyZWUgaGFz IGNoYW5nZWQKKyAgICAgICAgICAgICAgICBsb2coIkFwcGx5aW5nICVzIGZyb20gYnVnICVzLiIg JSAocGF0Y2hbJ2lkJ10sIGJ1Z19pZCkpCiAgICAgICAgICAgICAgICAgdG9vbC5zY20oKS5hcHBs eV9wYXRjaChwYXRjaCwgZm9yY2U9b3B0aW9ucy5jb21taXRfcXVldWUpCiAgICAgICAgICAgICAg ICAgY29tbWVudF90ZXh0ID0gV2ViS2l0TGFuZGluZ1NjcmlwdHMuYnVpbGRfYW5kX2NvbW1pdCh0 b29sLnNjbSgpLCBvcHRpb25zKQotICAgICAgICAgICAgICAgIHRvb2wuYnVncy5jbGVhcl9hdHRh Y2htZW50X3Jldmlld19mbGFnKHBhdGNoWydpZCddLCBjb21tZW50X3RleHQpCisgICAgICAgICAg ICAgICAgdG9vbC5idWdzLmNsZWFyX2F0dGFjaG1lbnRfZmxhZ3MocGF0Y2hbJ2lkJ10sIGNvbW1l bnRfdGV4dCkKIAogICAgICAgICAgICAgaWYgb3B0aW9ucy5jbG9zZV9idWc6CiAgICAgICAgICAg ICAgICAgdG9vbC5idWdzLmNsb3NlX2J1Z19hc19maXhlZChidWdfaWQsICJBbGwgcmV2aWV3ZWQg cGF0Y2hlcyBoYXZlIGJlZW4gbGFuZGVkLiAgQ2xvc2luZyBidWcuIikKICAgICAgICAgZXhjZXB0 IFNjcmlwdEVycm9yLCBlOgorICAgICAgICAgICAgdG9vbC5idWdzLnJlamVjdF9wYXRjaF9mcm9t X2NvbW1pdF9xdWV1ZShwYXRjaFsnaWQnXSwgZSkKICAgICAgICAgICAgICMgV2Ugc2hvdWxkIGFk ZCBhIGNvbW1lbnQgdG8gdGhlIGJ1ZywgYW5kIHItIHRoZSBwYXRjaCBvbiBmYWlsdXJlCiAgICAg ICAgICAgICBlcnJvcihlKQogCkBAIC0zNzgsMTEgKzM4NCwxMyBAQCBjbGFzcyBMYW5kUGF0Y2hl c0Zyb21CdWdzKENvbW1hbmQpOgogICAgICAgICAgICAgICAgIHBhdGNoZXMgPSB0b29sLmJ1Z3Mu ZmV0Y2hfY29tbWl0X3F1ZXVlX3BhdGNoZXNfZnJvbV9idWcoYnVnX2lkKQogICAgICAgICAgICAg ZWxzZToKICAgICAgICAgICAgICAgICBwYXRjaGVzID0gdG9vbC5idWdzLmZldGNoX3Jldmlld2Vk X3BhdGNoZXNfZnJvbV9idWcoYnVnX2lkKQotICAgICAgICAgICAgaWYgbm90IGxlbihwYXRjaGVz KToKLSAgICAgICAgICAgICAgICBsb2coIk5vIHJldmlld2VkIHBhdGNoZXMgZm91bmQgb24gJXMu IiAlIGJ1Z19pZCkKLSAgICAgICAgICAgICAgICBjb250aW51ZQotICAgICAgICAgICAgcGF0Y2hf Y291bnQgKz0gbGVuKHBhdGNoZXMpCi0gICAgICAgICAgICBidWdzX3RvX3BhdGNoZXNbYnVnX2lk XSA9IHBhdGNoZXMKKworICAgICAgICAgICAgcGF0Y2hlc19mb3VuZCA9IGxlbihwYXRjaGVzKQor ICAgICAgICAgICAgbG9nKCIlcyBmb3VuZCBvbiAlcy4iICUgKHBsdXJhbGl6ZSgicmV2aWV3ZWQg cGF0Y2giLCBwYXRjaGVzX2ZvdW5kKSwgYnVnX2lkKSkKKworICAgICAgICAgICAgcGF0Y2hfY291 bnQgKz0gcGF0Y2hlc19mb3VuZAorICAgICAgICAgICAgaWYgcGF0Y2hlc19mb3VuZDoKKyAgICAg ICAgICAgICAgICBidWdzX3RvX3BhdGNoZXNbYnVnX2lkXSA9IHBhdGNoZXMKIAogICAgICAgICBs b2coIkxhbmRpbmcgJXMgZnJvbSAlcy4iICUgKHBsdXJhbGl6ZSgicGF0Y2giLCBwYXRjaF9jb3Vu dCksIHBsdXJhbGl6ZSgiYnVnIiwgbGVuKGFyZ3MpKSkpCiAKQEAgLTU0NCw3ICs1NTIsNyBAQCBj bGFzcyBDcmVhdGVCdWcoQ29tbWFuZCk6CiAKICAgICBkZWYgcHJvbXB0X2Zvcl9idWdfdGl0bGVf YW5kX2NvbW1lbnQoc2VsZik6CiAgICAgICAgIGJ1Z190aXRsZSA9IHJhd19pbnB1dCgiQnVnIHRp dGxlOiAiKQotICAgICAgICBwcmludCgiQnVnIGNvbW1lbnQgKGhpdCBeRCBvbiBibGFuayBsaW5l IHRvIGVuZCk6IikKKyAgICAgICAgcHJpbnQgIkJ1ZyBjb21tZW50IChoaXQgXkQgb24gYmxhbmsg bGluZSB0byBlbmQpOiIKICAgICAgICAgbGluZXMgPSBzeXMuc3RkaW4ucmVhZGxpbmVzKCkKICAg ICAgICAgc3lzLnN0ZGluLnNlZWsoMCwgb3MuU0VFS19FTkQpCiAgICAgICAgIGNvbW1lbnRfdGV4 dCA9ICcnLmpvaW4obGluZXMpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVs ZXMvYnVnemlsbGEucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvYnVnemlsbGEucHkK aW5kZXggMWVlYmU5ZC4uMWQyYmEyNSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9t b2R1bGVzL2J1Z3ppbGxhLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWd6 aWxsYS5weQpAQCAtOTUsNyArOTUsNyBAQCBkZWYgaXNfbWFjX29zX3goKToKICMgRklYTUU6IFRo aXMgc2hvdWxkIG5vdCBkZXBlbmQgb24gZ2l0IGZvciBjb25maWcgc3RvcmFnZQogZGVmIHJlYWRf Y29uZmlnKGtleSk6CiAgICAgIyBOZWVkIGEgd2F5IHRvIHJlYWQgZnJvbSBzdm4gdG9vCi0gICAg Y29uZmlnX3Byb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKCJnaXQgY29uZmlnIC0tZ2V0IGJ1Z3pp bGxhLiIgKyBrZXksIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUsIHNoZWxsPVRydWUpCisgICAgY29u ZmlnX3Byb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKCJnaXQgY29uZmlnIC0tZ2V0IGJ1Z3ppbGxh LiVzIiAlIGtleSwgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSwgc2hlbGw9VHJ1ZSkKICAgICB2YWx1 ZSA9IGNvbmZpZ19wcm9jZXNzLmNvbW11bmljYXRlKClbMF0KICAgICByZXR1cm5fY29kZSA9IGNv bmZpZ19wcm9jZXNzLndhaXQoKQogCkBAIC0xNDEsNyArMTQxLDcgQEAgY2xhc3MgQnVnemlsbGE6 CiAgICAgZGVmIGF0dGFjaG1lbnRfdXJsX2Zvcl9pZChzZWxmLCBhdHRhY2htZW50X2lkLCBhY3Rp b249InZpZXciKToKICAgICAgICAgYWN0aW9uX3BhcmFtID0gIiIKICAgICAgICAgaWYgYWN0aW9u IGFuZCBhY3Rpb24gIT0gInZpZXciOgotICAgICAgICAgICAgYWN0aW9uX3BhcmFtID0gIiZhY3Rp b249IiArIGFjdGlvbgorICAgICAgICAgICAgYWN0aW9uX3BhcmFtID0gIiZhY3Rpb249JXMiICUg YWN0aW9uCiAgICAgICAgIHJldHVybiAiJXNhdHRhY2htZW50LmNnaT9pZD0lcyVzIiAlIChzZWxm LmJ1Z19zZXJ2ZXJfdXJsLCBhdHRhY2htZW50X2lkLCBhY3Rpb25fcGFyYW0pCiAKICAgICBkZWYg X3BhcnNlX2F0dGFjaG1lbnRfZWxlbWVudChzZWxmLCBlbGVtZW50LCBidWdfaWQpOgpAQCAtMTcw LDcgKzE3MCw3IEBAIGNsYXNzIEJ1Z3ppbGxhOgogCiAgICAgZGVmIGZldGNoX2F0dGFjaG1lbnRz X2Zyb21fYnVnKHNlbGYsIGJ1Z19pZCk6CiAgICAgICAgIGJ1Z191cmwgPSBzZWxmLmJ1Z191cmxf Zm9yX2J1Z19pZChidWdfaWQsIHhtbD1UcnVlKQotICAgICAgICBsb2coIkZldGNoaW5nOiAiICsg YnVnX3VybCkKKyAgICAgICAgbG9nKCJGZXRjaGluZzogJXMiICUgYnVnX3VybCkKIAogICAgICAg ICBwYWdlID0gdXJsbGliMi51cmxvcGVuKGJ1Z191cmwpCiAgICAgICAgIHNvdXAgPSBCZWF1dGlm dWxTb3VwKHBhZ2UpCkBAIC0yNTcsNyArMjU3LDcgQEAgY2xhc3MgQnVnemlsbGE6CiAgICAgICAg ICAgICBsb2coY29tbWVudF90ZXh0KQogICAgICAgICAgICAgcmV0dXJuCiAgICAgICAgIAotICAg ICAgICBzZWxmLmJyb3dzZXIub3BlbihzZWxmLmJ1Z19zZXJ2ZXJfdXJsICsgImF0dGFjaG1lbnQu Y2dpP2FjdGlvbj1lbnRlciZidWdpZD0iICsgYnVnX2lkKQorICAgICAgICBzZWxmLmJyb3dzZXIu b3BlbigiJXNhdHRhY2htZW50LmNnaT9hY3Rpb249ZW50ZXImYnVnaWQ9JXMiICUgKHNlbGYuYnVn X3NlcnZlcl91cmwsIGJ1Z19pZCkpCiAgICAgICAgIHNlbGYuYnJvd3Nlci5zZWxlY3RfZm9ybShu YW1lPSJlbnRyeWZvcm0iKQogICAgICAgICBzZWxmLmJyb3dzZXJbJ2Rlc2NyaXB0aW9uJ10gPSBk ZXNjcmlwdGlvbgogICAgICAgICBzZWxmLmJyb3dzZXJbJ2lzcGF0Y2gnXSA9ICgiMSIsKQpAQCAt MzE3LDE1ICszMTcsNDIgQEAgY2xhc3MgQnVnemlsbGE6CiAKICAgICAgICAgYnVnX2lkID0gc2Vs Zi5fY2hlY2tfY3JlYXRlX2J1Z19yZXNwb25zZShyZXNwb25zZS5yZWFkKCkpCiAgICAgICAgIGxv ZygiQnVnICVzIGNyZWF0ZWQuIiAlIGJ1Z19pZCkKLSAgICAgICAgbG9nKHNlbGYuYnVnX3NlcnZl cl91cmwgKyAic2hvd19idWcuY2dpP2lkPSIgKyBidWdfaWQpCisgICAgICAgIGxvZygiJXNzaG93 X2J1Zy5jZ2k/aWQ9JXMiICUgKHNlbGYuYnVnX3NlcnZlcl91cmwsIGJ1Z19pZCkpCiAgICAgICAg IHJldHVybiBidWdfaWQKIAotICAgIGRlZiBjbGVhcl9hdHRhY2htZW50X3Jldmlld19mbGFnKHNl bGYsIGF0dGFjaG1lbnRfaWQsIGFkZGl0aW9uYWxfY29tbWVudF90ZXh0PU5vbmUpOgorICAgIGRl ZiBfZmluZF9zZWxlY3RfZWxlbWVudF9mb3JfZmxhZyhzZWxmLCBmbGFnX25hbWUpOgorICAgICAg ICAjIEZJWE1FOiBUaGlzIHdpbGwgYnJlYWsgaWYgd2UgZXZlciByZS1vcmRlciBhdHRhY2htZW50 IGZsYWdzCisgICAgICAgIGlmIGZsYWdfbmFtZSA9PSAicmV2aWV3IjoKKyAgICAgICAgICAgIHJl dHVybiBzZWxmLmJyb3dzZXIuZmluZF9jb250cm9sKHR5cGU9J3NlbGVjdCcsIG5yPTApCisgICAg ICAgIGlmIGZsYWdfbmFtZSA9PSAiY29tbWl0LXF1ZXVlIjoKKyAgICAgICAgICAgIHJldHVybiBz ZWxmLmJyb3dzZXIuZmluZF9jb250cm9sKHR5cGU9J3NlbGVjdCcsIG5yPTEpCisgICAgICAgIHJh aXNlIEV4Y2VwdGlvbigiRG9uJ3Qga25vdyBob3cgdG8gZmluZCBmbGFnIG5hbWVkIFwiJXNcIiIg JSBmbGFnX25hbWUpCisKKyAgICBkZWYgY2xlYXJfYXR0YWNobWVudF9mbGFncyhzZWxmLCBhdHRh Y2htZW50X2lkLCBhZGRpdGlvbmFsX2NvbW1lbnRfdGV4dD1Ob25lKToKICAgICAgICAgc2VsZi5h dXRoZW50aWNhdGUoKQogCiAgICAgICAgIGNvbW1lbnRfdGV4dCA9ICJDbGVhcmluZyByZXZpZXcg ZmxhZyBvbiBhdHRhY2htZW50OiAlcyIgJSBhdHRhY2htZW50X2lkCiAgICAgICAgIGlmIGFkZGl0 aW9uYWxfY29tbWVudF90ZXh0OgotICAgICAgICAgICAgY29tbWVudF90ZXh0ICs9ICJcblxuIiAr IGFkZGl0aW9uYWxfY29tbWVudF90ZXh0CisgICAgICAgICAgICBjb21tZW50X3RleHQgKz0gIlxu XG4lcyIgJSBhZGRpdGlvbmFsX2NvbW1lbnRfdGV4dAorICAgICAgICBsb2coY29tbWVudF90ZXh0 KQorCisgICAgICAgIGlmIHNlbGYuZHJ5cnVuOgorICAgICAgICAgICAgcmV0dXJuCisKKyAgICAg ICAgc2VsZi5icm93c2VyLm9wZW4oc2VsZi5hdHRhY2htZW50X3VybF9mb3JfaWQoYXR0YWNobWVu dF9pZCwgJ2VkaXQnKSkKKyAgICAgICAgc2VsZi5icm93c2VyLnNlbGVjdF9mb3JtKG5yPTEpCisg ICAgICAgIHNlbGYuYnJvd3Nlci5zZXRfdmFsdWUoY29tbWVudF90ZXh0LCBuYW1lPSdjb21tZW50 JywgbnI9MCkKKyAgICAgICAgc2VsZi5fZmluZF9zZWxlY3RfZWxlbWVudF9mb3JfZmxhZygncmV2 aWV3JykudmFsdWUgPSAoIlgiLCkKKyAgICAgICAgc2VsZi5fZmluZF9zZWxlY3RfZWxlbWVudF9m b3JfZmxhZygnY29tbWl0LXF1ZXVlJykudmFsdWUgPSAoIlgiLCkKKyAgICAgICAgc2VsZi5icm93 c2VyLnN1Ym1pdCgpCisKKyAgICAjIEZJWE1FOiBXZSBuZWVkIGEgd2F5IHRvIHRlc3QgdGhpcyBv biBhIGxpdmUgYnVnemlsbGEgaW5zdGFuY2UuCisgICAgZGVmIHJlamVjdF9wYXRjaF9mcm9tX2Nv bW1pdF9xdWV1ZShzZWxmLCBhdHRhY2htZW50X2lkLCBhZGRpdGlvbmFsX2NvbW1lbnRfdGV4dD1O b25lKToKKyAgICAgICAgc2VsZi5hdXRoZW50aWNhdGUoKQorCisgICAgICAgIGNvbW1lbnRfdGV4 dCA9ICJSZWplY3RpbmcgcGF0Y2ggJXMgZnJvbSBjb21taXQtcXVldWUuICBUaGlzIHBhdGNoIHdp bGwgcmVxdWlyZSBtYW51YWwgY29tbWl0LiIgJSBhdHRhY2htZW50X2lkCisgICAgICAgIGlmIGFk ZGl0aW9uYWxfY29tbWVudF90ZXh0OgorICAgICAgICAgICAgY29tbWVudF90ZXh0ICs9ICJcblxu JXMiICUgYWRkaXRpb25hbF9jb21tZW50X3RleHQKICAgICAgICAgbG9nKGNvbW1lbnRfdGV4dCkK IAogICAgICAgICBpZiBzZWxmLmRyeXJ1bjoKQEAgLTMzNCw3ICszNjEsNyBAQCBjbGFzcyBCdWd6 aWxsYToKICAgICAgICAgc2VsZi5icm93c2VyLm9wZW4oc2VsZi5hdHRhY2htZW50X3VybF9mb3Jf aWQoYXR0YWNobWVudF9pZCwgJ2VkaXQnKSkKICAgICAgICAgc2VsZi5icm93c2VyLnNlbGVjdF9m b3JtKG5yPTEpCiAgICAgICAgIHNlbGYuYnJvd3Nlci5zZXRfdmFsdWUoY29tbWVudF90ZXh0LCBu YW1lPSdjb21tZW50JywgbnI9MCkKLSAgICAgICAgc2VsZi5icm93c2VyLmZpbmRfY29udHJvbCh0 eXBlPSdzZWxlY3QnLCBucj0wKS52YWx1ZSA9ICgiWCIsKQorICAgICAgICBzZWxmLl9maW5kX3Nl bGVjdF9lbGVtZW50X2Zvcl9mbGFnKCdjb21taXQtcXVldWUnKS52YWx1ZSA9ICgiLSIsKQogICAg ICAgICBzZWxmLmJyb3dzZXIuc3VibWl0KCkKIAogICAgIGRlZiBvYnNvbGV0ZV9hdHRhY2htZW50 KHNlbGYsIGF0dGFjaG1lbnRfaWQsIGNvbW1lbnRfdGV4dCA9IE5vbmUpOgpAQCAtMzQ5LDcgKzM3 Niw4IEBAIGNsYXNzIEJ1Z3ppbGxhOgogICAgICAgICBzZWxmLmJyb3dzZXIuc2VsZWN0X2Zvcm0o bnI9MSkKICAgICAgICAgc2VsZi5icm93c2VyLmZpbmRfY29udHJvbCgnaXNvYnNvbGV0ZScpLml0 ZW1zWzBdLnNlbGVjdGVkID0gVHJ1ZQogICAgICAgICAjIEFsc28gY2xlYXIgYW55IHJldmlldyBm bGFnICh0byByZW1vdmUgaXQgZnJvbSByZXZpZXcvY29tbWl0IHF1ZXVlcykKLSAgICAgICAgc2Vs Zi5icm93c2VyLmZpbmRfY29udHJvbCh0eXBlPSdzZWxlY3QnLCBucj0wKS52YWx1ZSA9ICgiWCIs KQorICAgICAgICBzZWxmLl9maW5kX3NlbGVjdF9lbGVtZW50X2Zvcl9mbGFnKCdyZXZpZXcnKS52 YWx1ZSA9ICgiWCIsKQorICAgICAgICBzZWxmLl9maW5kX3NlbGVjdF9lbGVtZW50X2Zvcl9mbGFn KCdjb21taXQtcXVldWUnKS52YWx1ZSA9ICgiWCIsKQogICAgICAgICBpZiBjb21tZW50X3RleHQ6 CiAgICAgICAgICAgICBsb2coY29tbWVudF90ZXh0KQogICAgICAgICAgICAgIyBCdWd6aWxsYSBo YXMgdHdvIHRleHRhcmVhcyBuYW1lZCAnY29tbWVudCcsIG9uZSBpcyBzb21laG93IGhpZGRlbi4g IFdlIHdhbnQgdGhlIGZpcnN0LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1 bGVzL3NjbS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY20ucHkKaW5kZXggZWMx ZjM2Mi4uMTBiNzk5YSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3Nj bS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5CkBAIC0xMjMsNyAr MTIzLDcgQEAgY2xhc3MgU0NNOgogICAgIGRlZiBhcHBseV9wYXRjaChzZWxmLCBwYXRjaCwgZm9y Y2U9RmFsc2UpOgogICAgICAgICAjIEl0J3MgcG9zc2libGUgdGhhdCB0aGUgcGF0Y2ggd2FzIG5v dCBtYWRlIGZyb20gdGhlIHJvb3QgZGlyZWN0b3J5LgogICAgICAgICAjIFdlIHNob3VsZCBkZXRl Y3QgYW5kIGhhbmRsZSB0aGF0IGNhc2UuCi0gICAgICAgIGN1cmxfcHJvY2VzcyA9IHN1YnByb2Nl c3MuUG9wZW4oWydjdXJsJywgcGF0Y2hbJ3VybCddXSwgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSkK KyAgICAgICAgY3VybF9wcm9jZXNzID0gc3VicHJvY2Vzcy5Qb3BlbihbJ2N1cmwnLCAnLS1zaWxl bnQnLCAnLS1zaG93LWVycm9yJywgcGF0Y2hbJ3VybCddXSwgc3Rkb3V0PXN1YnByb2Nlc3MuUElQ RSkKICAgICAgICAgYXJncyA9IFtzZWxmLnNjcmlwdF9wYXRoKCdzdm4tYXBwbHknKSwgJy0tcmV2 aWV3ZXInLCBwYXRjaFsncmV2aWV3ZXInXV0KICAgICAgICAgaWYgZm9yY2U6CiAgICAgICAgICAg ICBhcmdzLmFwcGVuZCgnLS1mb3JjZScp