31528 2009-11-15 22:25:15 -0800 bugzilla-tool needs apply-attachment 2009-11-16 00:40:34 -0800 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 163851 0 eric 2009-11-15 22:25:15 -0800 bugzilla-tool needs land-attachment, apply-attachment, etc. land-patches and apply-patches are great (they take bug ids) but sometimes you want to work with attachment ids, even when attachments have been obsoleted, or not even marked as patches! 163870 1 43274 eric 2009-11-16 00:25:30 -0800 Created attachment 43274 Patch 163874 2 43274 abarth 2009-11-16 00:36:58 -0800 Comment on attachment 43274 Patch 171 Command.__init__(self, 'Applies an attachment to the local working directory.', 'BUGID', options=options) bugid? should be attachmentid 163876 3 eric 2009-11-16 00:39:40 -0800 Committed r51015: <http://trac.webkit.org/changeset/51015> 163877 4 eric 2009-11-16 00:40:34 -0800 Actually http://trac.webkit.org/changeset/51016. bugzilla-tool land-diff gets confused if you have local commits. 43274 2009-11-16 00:25:30 -0800 2009-11-16 00:36:58 -0800 Patch bug-31528-20091116002529.patch text/plain 10524 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA2ODNjODRkLi4xN2QzNmM0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjIgQEAKIDIwMDktMTEt MTYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGJ1Z3ppbGxhLXRvb2wgbmVlZHMgYXBwbHktYXR0 YWNobWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzE1MjgKKworICAgICAgICAqIFNjcmlwdHMvYnVnemlsbGEtdG9vbDoKKyAgICAgICAgIC0gQWRk IEFwcGx5QXR0YWNobWVudCBjb21tYW5kLgorICAgICAgICAgLSBBYnN0cmFjdCBhcHBseWluZyBj b2RlIGludG8gV2ViS2l0QXBwbHlpbmdTY3JpcHRzLgorICAgICAgICAgLSBSZW5hbWUgc2V0dXBf Zm9yX2xhbmRpbmcgdG8gcHJlcGFyZV9jbGVhbl93b3JraW5nX2RpcmVjdG9yeSBhbmQgbWFrZSBs b2NhbF9jb21taXQgY2hlY2tpbmcgb3B0aW9uYWwuCisgICAgICAgICogU2NyaXB0cy9tb2R1bGVz L2J1Z3ppbGxhLnB5OgorICAgICAgICAgLSBBZGQgZmV0Y2hfYXR0YWNobWVudCBhbmQgYnVnX2lk X2Zvcl9hdHRhY2htZW50X2lkLgorICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9idWd6aWxsYV91 bml0dGVzdC5weToKKyAgICAgICAgIC0gQWRkIHRlc3QgZm9yIG5ldyBwYXJzaW5nLgorICAgICAg ICAgLSBGaXggcHJldmlvdXMgcGFyc2luZyB0ZXN0IHdoaWNoIGJyb2tlIHdpdGggQWRhbSdzIGNo ZWNrLXN0eWxlIHBhdGNoIChidWcgMzE1MTUpLgorCisyMDA5LTExLTE2ICBFcmljIFNlaWRlbCAg PGVyaWNAd2Via2l0Lm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgogCiAg ICAgICAgIERvY3VtZW50IGNoZWNrLXN0eWxlJ3MgdXNlIG9mIGZvcmNlX2NsZWFuLgpkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sIGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy9idWd6aWxsYS10b29sCmluZGV4IGQyOWZiNDQuLjkxZTJjZDYgMTAwNzU1Ci0tLSBhL1dl YktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbAorKysgYi9XZWJLaXRUb29scy9TY3JpcHRz L2J1Z3ppbGxhLXRvb2wKQEAgLTE1OSw0MyArMTU5LDYyIEBAIGNsYXNzIENoZWNrU3R5bGVPbkJ1 ZyhDb21tYW5kKToKICAgICAgICAgYnVnX2lkID0gYXJnc1swXQogICAgICAgICBwYXRjaGVzID0g dG9vbC5idWdzLmZldGNoX3VucmV2aWV3ZWRfcGF0Y2hlc19mcm9tX2J1ZyhidWdfaWQpCiAKLSAg ICAgICAgV2ViS2l0TGFuZGluZ1NjcmlwdHMuc2V0dXBfZm9yX2xhbmRpbmcodG9vbC5zY20oKSwg b3B0aW9ucykKKyAgICAgICAgV2ViS2l0TGFuZGluZ1NjcmlwdHMucHJlcGFyZV9jbGVhbl93b3Jr aW5nX2RpcmVjdG9yeSh0b29sLnNjbSgpLCBvcHRpb25zKQogCiAgICAgICAgIGZvciBwYXRjaCBp biBwYXRjaGVzOgogICAgICAgICAgICAgc2VsZi5jaGVja19zdHlsZShidWdfaWQsIHBhdGNoLCBv cHRpb25zLCB0b29sKQogCiAKK2NsYXNzIEFwcGx5QXR0YWNobWVudChDb21tYW5kKToKKyAgICBk ZWYgX19pbml0X18oc2VsZik6CisgICAgICAgIG9wdGlvbnMgPSBXZWJLaXRBcHBseWluZ1Njcmlw dHMuYXBwbHlfb3B0aW9ucygpICsgV2ViS2l0TGFuZGluZ1NjcmlwdHMuY2xlYW5pbmdfb3B0aW9u cygpCisgICAgICAgIENvbW1hbmQuX19pbml0X18oc2VsZiwgJ0FwcGxpZXMgYW4gYXR0YWNobWVu dCB0byB0aGUgbG9jYWwgd29ya2luZyBkaXJlY3RvcnkuJywgJ0JVR0lEJywgb3B0aW9ucz1vcHRp b25zKQorCisgICAgZGVmIGV4ZWN1dGUoc2VsZiwgb3B0aW9ucywgYXJncywgdG9vbCk6CisgICAg ICAgIFdlYktpdEFwcGx5aW5nU2NyaXB0cy5zZXR1cF9mb3JfcGF0Y2hfYXBwbHkodG9vbC5zY20o KSwgb3B0aW9ucykKKyAgICAgICAgYXR0YWNobWVudF9pZCA9IGFyZ3NbMF0KKyAgICAgICAgYXR0 YWNobWVudCA9IHRvb2wuYnVncy5mZXRjaF9hdHRhY2htZW50KGF0dGFjaG1lbnRfaWQpCisgICAg ICAgIFdlYktpdEFwcGx5aW5nU2NyaXB0cy5hcHBseV9wYXRjaGVzX3dpdGhfb3B0aW9ucyh0b29s LnNjbSgpLCBbYXR0YWNobWVudF0sIG9wdGlvbnMpCisKKwogY2xhc3MgQXBwbHlQYXRjaGVzRnJv bUJ1ZyhDb21tYW5kKToKICAgICBkZWYgX19pbml0X18oc2VsZik6Ci0gICAgICAgIG9wdGlvbnMg PSBbCisgICAgICAgIG9wdGlvbnMgPSBXZWJLaXRBcHBseWluZ1NjcmlwdHMuYXBwbHlfb3B0aW9u cygpICsgV2ViS2l0TGFuZGluZ1NjcmlwdHMuY2xlYW5pbmdfb3B0aW9ucygpCisgICAgICAgIENv bW1hbmQuX19pbml0X18oc2VsZiwgJ0FwcGxpZXMgYWxsIHBhdGNoZXMgb24gYSBidWcgdG8gdGhl IGxvY2FsIHdvcmtpbmcgZGlyZWN0b3J5LicsICdCVUdJRCcsIG9wdGlvbnM9b3B0aW9ucykKKwor ICAgIGRlZiBleGVjdXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgorICAgICAgICBXZWJL aXRBcHBseWluZ1NjcmlwdHMuc2V0dXBfZm9yX3BhdGNoX2FwcGx5KHRvb2wuc2NtKCksIG9wdGlv bnMpCisgICAgICAgIGJ1Z19pZCA9IGFyZ3NbMF0KKyAgICAgICAgcGF0Y2hlcyA9IHRvb2wuYnVn cy5mZXRjaF9yZXZpZXdlZF9wYXRjaGVzX2Zyb21fYnVnKGJ1Z19pZCkKKyAgICAgICAgV2ViS2l0 QXBwbHlpbmdTY3JpcHRzLmFwcGx5X3BhdGNoZXNfd2l0aF9vcHRpb25zKHRvb2wuc2NtKCksIHBh dGNoZXMsIG9wdGlvbnMpCisKKworY2xhc3MgV2ViS2l0QXBwbHlpbmdTY3JpcHRzOgorICAgIEBz dGF0aWNtZXRob2QKKyAgICBkZWYgYXBwbHlfb3B0aW9ucygpOgorICAgICAgICByZXR1cm4gWwog ICAgICAgICAgICAgbWFrZV9vcHRpb24oIi0tbm8tdXBkYXRlIiwgYWN0aW9uPSJzdG9yZV9mYWxz ZSIsIGRlc3Q9InVwZGF0ZSIsIGRlZmF1bHQ9VHJ1ZSwgaGVscD0iRG9uJ3QgdXBkYXRlIHRoZSB3 b3JraW5nIGRpcmVjdG9yeSBiZWZvcmUgYXBwbHlpbmcgcGF0Y2hlcyIpLAogICAgICAgICAgICAg bWFrZV9vcHRpb24oIi0tbG9jYWwtY29tbWl0IiwgYWN0aW9uPSJzdG9yZV90cnVlIiwgZGVzdD0i bG9jYWxfY29tbWl0IiwgZGVmYXVsdD1GYWxzZSwgaGVscD0iTWFrZSBhIGxvY2FsIGNvbW1pdCBm b3IgZWFjaCBhcHBsaWVkIHBhdGNoIiksCiAgICAgICAgIF0KLSAgICAgICAgb3B0aW9ucyArPSBX ZWJLaXRMYW5kaW5nU2NyaXB0cy5jbGVhbmluZ19vcHRpb25zKCkKLSAgICAgICAgQ29tbWFuZC5f X2luaXRfXyhzZWxmLCAnQXBwbGllcyBhbGwgcGF0Y2hlcyBvbiBhIGJ1ZyB0byB0aGUgbG9jYWwg d29ya2luZyBkaXJlY3Rvcnkgd2l0aG91dCBjb21taXR0aW5nLicsICdCVUdJRCcsIG9wdGlvbnM9 b3B0aW9ucykKIAogICAgIEBzdGF0aWNtZXRob2QKLSAgICBkZWYgYXBwbHlfcGF0Y2hlcyhwYXRj aGVzLCBzY20sIGNvbW1pdF9lYWNoKToKKyAgICBkZWYgc2V0dXBfZm9yX3BhdGNoX2FwcGx5KHNj bSwgb3B0aW9ucyk6CisgICAgICAgIFdlYktpdExhbmRpbmdTY3JpcHRzLnByZXBhcmVfY2xlYW5f d29ya2luZ19kaXJlY3Rvcnkoc2NtLCBvcHRpb25zLCBhbGxvd19sb2NhbF9jb21taXRzPVRydWUp CisgICAgICAgIGlmIG9wdGlvbnMudXBkYXRlOgorICAgICAgICAgICAgc2NtLnVwZGF0ZV93ZWJr aXQoKQorCisgICAgQHN0YXRpY21ldGhvZAorICAgIGRlZiBhcHBseV9wYXRjaGVzX3dpdGhfb3B0 aW9ucyhzY20sIHBhdGNoZXMsIG9wdGlvbnMpOgorICAgICAgICBpZiBvcHRpb25zLmxvY2FsX2Nv bW1pdCBhbmQgbm90IHNjbS5zdXBwb3J0c19sb2NhbF9jb21taXRzKCk6CisgICAgICAgICAgICBl cnJvcigiLS1sb2NhbC1jb21taXQgcGFzc2VkLCBidXQgJXMgZG9lcyBub3Qgc3VwcG9ydCBsb2Nh bCBjb21taXRzIiAlIHNjbS5kaXNwbGF5X25hbWUoKSkKKwogICAgICAgICBmb3IgcGF0Y2ggaW4g cGF0Y2hlczoKKyAgICAgICAgICAgIGxvZygiQXBwbHlpbmcgYXR0YWNobWVudCAlcyBmcm9tIGJ1 ZyAlcyIgJSAocGF0Y2hbJ2lkJ10sIHBhdGNoWydidWdfaWQnXSkpCiAgICAgICAgICAgICBzY20u YXBwbHlfcGF0Y2gocGF0Y2gpCi0gICAgICAgICAgICBpZiBjb21taXRfZWFjaDoKKyAgICAgICAg ICAgIGlmIG9wdGlvbnMubG9jYWxfY29tbWl0OgogICAgICAgICAgICAgICAgIGNvbW1pdF9tZXNz YWdlID0gY29tbWl0X21lc3NhZ2VfZm9yX3RoaXNfY29tbWl0KHNjbSkKICAgICAgICAgICAgICAg ICBzY20uY29tbWl0X2xvY2FsbHlfd2l0aF9tZXNzYWdlKGNvbW1pdF9tZXNzYWdlLm1lc3NhZ2Uo KSBvciBwYXRjaFsnbmFtZSddKQogCi0gICAgZGVmIGV4ZWN1dGUoc2VsZiwgb3B0aW9ucywgYXJn cywgdG9vbCk6Ci0gICAgICAgIGJ1Z19pZCA9IGFyZ3NbMF0KLSAgICAgICAgcGF0Y2hlcyA9IHRv b2wuYnVncy5mZXRjaF9yZXZpZXdlZF9wYXRjaGVzX2Zyb21fYnVnKGJ1Z19pZCkKLSAgICAgICAg b3MuY2hkaXIodG9vbC5zY20oKS5jaGVja291dF9yb290KQotICAgICAgICBpZiBvcHRpb25zLmNs ZWFuOgotICAgICAgICAgICAgdG9vbC5zY20oKS5lbnN1cmVfY2xlYW5fd29ya2luZ19kaXJlY3Rv cnkob3B0aW9ucy5mb3JjZV9jbGVhbikKLSAgICAgICAgaWYgb3B0aW9ucy51cGRhdGU6Ci0gICAg ICAgICAgICB0b29sLnNjbSgpLnVwZGF0ZV93ZWJraXQoKQotICAgICAgICAKLSAgICAgICAgaWYg b3B0aW9ucy5sb2NhbF9jb21taXQgYW5kIG5vdCB0b29sLnNjbSgpLnN1cHBvcnRzX2xvY2FsX2Nv bW1pdHMoKToKLSAgICAgICAgICAgIGVycm9yKCItLWxvY2FsLWNvbW1pdCBwYXNzZWQsIGJ1dCAl cyBkb2VzIG5vdCBzdXBwb3J0IGxvY2FsIGNvbW1pdHMiICUgdG9vbC5zY20oKS5kaXNwbGF5X25h bWUoKSkKLSAgICAgICAgCi0gICAgICAgIHNlbGYuYXBwbHlfcGF0Y2hlcyhwYXRjaGVzLCB0b29s LnNjbSgpLCBvcHRpb25zLmxvY2FsX2NvbW1pdCkKLQogCiBjbGFzcyBXZWJLaXRMYW5kaW5nU2Ny aXB0czoKICAgICBAc3RhdGljbWV0aG9kCkBAIC0yNzcsOSArMjk2LDEwIEBAIGNsYXNzIFdlYktp dExhbmRpbmdTY3JpcHRzOgogICAgICAgICBjbHMucnVuX2FuZF90aHJvd19pZl9mYWlsKGFyZ3Mp CiAKICAgICBAc3RhdGljbWV0aG9kCi0gICAgZGVmIHNldHVwX2Zvcl9sYW5kaW5nKHNjbSwgb3B0 aW9ucyk6CisgICAgZGVmIHByZXBhcmVfY2xlYW5fd29ya2luZ19kaXJlY3Rvcnkoc2NtLCBvcHRp b25zLCBhbGxvd19sb2NhbF9jb21taXRzPUZhbHNlKToKICAgICAgICAgb3MuY2hkaXIoc2NtLmNo ZWNrb3V0X3Jvb3QpCi0gICAgICAgIHNjbS5lbnN1cmVfbm9fbG9jYWxfY29tbWl0cyhvcHRpb25z LmZvcmNlX2NsZWFuKQorICAgICAgICBpZiBub3QgYWxsb3dfbG9jYWxfY29tbWl0czoKKyAgICAg ICAgICAgIHNjbS5lbnN1cmVfbm9fbG9jYWxfY29tbWl0cyhvcHRpb25zLmZvcmNlX2NsZWFuKQog ICAgICAgICBpZiBvcHRpb25zLmNsZWFuOgogICAgICAgICAgICAgc2NtLmVuc3VyZV9jbGVhbl93 b3JraW5nX2RpcmVjdG9yeShmb3JjZV9jbGVhbj1vcHRpb25zLmZvcmNlX2NsZWFuKQogCkBAIC00 MTUsNyArNDM1LDcgQEAgY2xhc3MgTGFuZFBhdGNoZXNGcm9tQnVncyhDb21tYW5kKToKIAogICAg ICAgICBidWdzX3RvX3BhdGNoZXMgPSBzZWxmLl9mZXRjaF9saXN0X29mX3BhdGNoZXNfdG9fbGFu ZChvcHRpb25zLCBhcmdzLCB0b29sKQogCi0gICAgICAgIFdlYktpdExhbmRpbmdTY3JpcHRzLnNl dHVwX2Zvcl9sYW5kaW5nKHRvb2wuc2NtKCksIG9wdGlvbnMpCisgICAgICAgIFdlYktpdExhbmRp bmdTY3JpcHRzLnByZXBhcmVfY2xlYW5fd29ya2luZ19kaXJlY3RvcnkodG9vbC5zY20oKSwgb3B0 aW9ucykKIAogICAgICAgICBmb3IgYnVnX2lkIGluIGJ1Z3NfdG9fcGF0Y2hlcy5rZXlzKCk6CiAg ICAgICAgICAgICBzZWxmLmxhbmRfcGF0Y2hlcyhidWdfaWQsIGJ1Z3NfdG9fcGF0Y2hlc1tidWdf aWRdLCBvcHRpb25zLCB0b29sKQpAQCAtNTc1LDcgKzU5NSw3IEBAIGNsYXNzIFJvbGxvdXRDb21t aXQoQ29tbWFuZCk6CiAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAgIGxvZygiRmFp bGVkIHRvIHBhcnNlIGJ1ZyBudW1iZXIgZnJvbSBkaWZmLiAgTm8gYnVncyB3aWxsIGJlIHVwZGF0 ZWQvcmVvcGVuZWQgYWZ0ZXIgdGhlIHJvbGxvdXQuIikKIAotICAgICAgICBXZWJLaXRMYW5kaW5n U2NyaXB0cy5zZXR1cF9mb3JfbGFuZGluZyh0b29sLnNjbSgpLCBvcHRpb25zKQorICAgICAgICBX ZWJLaXRMYW5kaW5nU2NyaXB0cy5wcmVwYXJlX2NsZWFuX3dvcmtpbmdfZGlyZWN0b3J5KHRvb2wu c2NtKCksIG9wdGlvbnMpCiAgICAgICAgIHRvb2wuc2NtKCkudXBkYXRlX3dlYmtpdCgpCiAgICAg ICAgIHRvb2wuc2NtKCkuYXBwbHlfcmV2ZXJzZV9kaWZmKHJldmlzaW9uKQogICAgICAgICBzZWxm Ll9jcmVhdGVfY2hhbmdlbG9nc19mb3JfcmV2ZXJ0KHRvb2wuc2NtKCksIHJldmlzaW9uKQpAQCAt ODM5LDYgKzg1OSw3IEBAIGNsYXNzIEJ1Z3ppbGxhVG9vbDoKICAgICAgICAgICAgIHsgJ25hbWUn IDogJ3BhdGNoZXMtdG8tY29tbWl0JywgJ29iamVjdCcgOiBQYXRjaGVzSW5Db21taXRRdWV1ZSgp IH0sCiAgICAgICAgICAgICB7ICduYW1lJyA6ICdyZXZpZXdlZC1wYXRjaGVzJywgJ29iamVjdCcg OiBSZXZpZXdlZFBhdGNoZXNPbkJ1ZygpIH0sCiAgICAgICAgICAgICB7ICduYW1lJyA6ICdjcmVh dGUtYnVnJywgJ29iamVjdCcgOiBDcmVhdGVCdWcoKSB9LAorICAgICAgICAgICAgeyAnbmFtZScg OiAnYXBwbHktYXR0YWNobWVudCcsICdvYmplY3QnIDogQXBwbHlBdHRhY2htZW50KCkgfSwKICAg ICAgICAgICAgIHsgJ25hbWUnIDogJ2FwcGx5LXBhdGNoZXMnLCAnb2JqZWN0JyA6IEFwcGx5UGF0 Y2hlc0Zyb21CdWcoKSB9LAogICAgICAgICAgICAgeyAnbmFtZScgOiAnbGFuZC1kaWZmJywgJ29i amVjdCcgOiBMYW5kQW5kVXBkYXRlQnVnKCkgfSwKICAgICAgICAgICAgIHsgJ25hbWUnIDogJ2xh bmQtcGF0Y2hlcycsICdvYmplY3QnIDogTGFuZFBhdGNoZXNGcm9tQnVncygpIH0sCmRpZmYgLS1n aXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvYnVnemlsbGEucHkgYi9XZWJLaXRUb29s cy9TY3JpcHRzL21vZHVsZXMvYnVnemlsbGEucHkKaW5kZXggZmJiYWViYy4uZTY5MGIzMiAxMDA2 NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1Z3ppbGxhLnB5CisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWd6aWxsYS5weQpAQCAtMTk0LDYgKzE5NCwzMyBA QCBjbGFzcyBCdWd6aWxsYToKICAgICAgICAgICAgIGF0dGFjaG1lbnRzLmFwcGVuZChhdHRhY2ht ZW50KQogICAgICAgICByZXR1cm4gYXR0YWNobWVudHMKIAorICAgIGRlZiBfcGFyc2VfYnVnX2lk X2Zyb21fYXR0YWNobWVudF9wYWdlKHNlbGYsIHBhZ2UpOgorICAgICAgICB1cF9saW5rID0gQmVh dXRpZnVsU291cChwYWdlKS5maW5kKCdsaW5rJywgcmVsPSdVcCcpICMgVGhlICJVcCIgcmVsYXRp b24gaGFwcGVucyB0byBwb2ludCB0byB0aGUgYnVnLgorICAgICAgICBpZiBub3QgdXBfbGluazoK KyAgICAgICAgICAgIHJldHVybiBOb25lICMgVGhpcyBhdHRhY2htZW50IGRvZXMgbm90IGV4aXN0 IChvciB5b3UgZG9uJ3QgaGF2ZSBwZXJtaXNzaW9ucyB0byB2aWV3IGl0KS4KKyAgICAgICAgbWF0 Y2ggPSByZS5zZWFyY2goInNob3dfYnVnLmNnaVw/aWQ9KD9QPGJ1Z19pZD5cZCspIiwgdXBfbGlu a1snaHJlZiddKQorICAgICAgICByZXR1cm4gaW50KG1hdGNoLmdyb3VwKCdidWdfaWQnKSkKKwor ICAgIGRlZiBidWdfaWRfZm9yX2F0dGFjaG1lbnRfaWQoc2VsZiwgYXR0YWNobWVudF9pZCk6Cisg ICAgICAgIGF0dGFjaG1lbnRfdXJsID0gc2VsZi5hdHRhY2htZW50X3VybF9mb3JfaWQoYXR0YWNo bWVudF9pZCwgJ2VkaXQnKQorICAgICAgICBsb2coIkZldGNoaW5nOiAlcyIgJSBhdHRhY2htZW50 X3VybCkKKyAgICAgICAgcGFnZSA9IHVybGxpYjIudXJsb3BlbihhdHRhY2htZW50X3VybCkKKyAg ICAgICAgcmV0dXJuIHNlbGYuX3BhcnNlX2J1Z19pZF9mcm9tX2F0dGFjaG1lbnRfcGFnZShwYWdl KQorCisgICAgIyBUaGlzIHNob3VsZCByZWFsbHkgcmV0dXJuIGFuIEF0dGFjaG1lbnQgb2JqZWN0 CisgICAgIyB3aGljaCBjYW4gbGF6aWx5IGZldGNoIGFueSBtaXNzaW5nIGRhdGEuCisgICAgZGVm IGZldGNoX2F0dGFjaG1lbnQoc2VsZiwgYXR0YWNobWVudF9pZCk6CisgICAgICAgICMgV2UgY291 bGQgZ3JhYiBhbGwgdGhlIGF0dGFjaG1lbnQgZGV0YWlscyBvZmYgb2YgdGhlIGF0dGFjaG1lbnQg ZWRpdCBwYWdlCisgICAgICAgICMgYnV0IHdlIGFscmVhZHkgaGF2ZSB3b3JraW5nIGNvZGUgdG8g ZG8gc28gb2ZmIG9mIHRoZSBidWdzIHBhZ2UsIHNvIHJlLXVzZSB0aGF0LgorICAgICAgICBidWdf aWQgPSBzZWxmLmJ1Z19pZF9mb3JfYXR0YWNobWVudF9pZChhdHRhY2htZW50X2lkKQorICAgICAg ICBpZiBub3QgYnVnX2lkOgorICAgICAgICAgICAgcmV0dXJuIE5vbmUKKyAgICAgICAgYXR0YWNo bWVudHMgPSBzZWxmLmZldGNoX2F0dGFjaG1lbnRzX2Zyb21fYnVnKGJ1Z19pZCkKKyAgICAgICAg Zm9yIGF0dGFjaG1lbnQgaW4gYXR0YWNobWVudHM6CisgICAgICAgICAgICBpZiBhdHRhY2htZW50 WydpZCddID09IGF0dGFjaG1lbnRfaWQ6CisgICAgICAgICAgICAgICAgcmV0dXJuIGF0dGFjaG1l bnQKKyAgICAgICAgcmV0dXJuIE5vbmUgIyBUaGlzIHNob3VsZCBuZXZlciBiZSBoaXQuCisKICAg ICBkZWYgZmV0Y2hfdGl0bGVfZnJvbV9idWcoc2VsZiwgYnVnX2lkKToKICAgICAgICAgYnVnX3Vy bCA9IHNlbGYuYnVnX3VybF9mb3JfYnVnX2lkKGJ1Z19pZCwgeG1sPVRydWUpCiAgICAgICAgIHBh Z2UgPSB1cmxsaWIyLnVybG9wZW4oYnVnX3VybCkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvbW9kdWxlcy9idWd6aWxsYV91bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMv bW9kdWxlcy9idWd6aWxsYV91bml0dGVzdC5weQppbmRleCBmMDgwMzFlLi45NTk2NGYzIDEwMDY0 NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvYnVnemlsbGFfdW5pdHRlc3QucHkK KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1Z3ppbGxhX3VuaXR0ZXN0LnB5CkBA IC02OCw4ICs2OCwxMCBAQCBjbGFzcyBCdWd6aWxsYVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgog ICAgICAgICAndXJsJyA6ICJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9hdHRhY2htZW50LmNnaT9p ZD0zMzcyMSIsCiAgICAgICAgICduYW1lJyA6ICJGaXhlZCB3aGl0ZXNwYWNlIGlzc3VlIiwKICAg ICAgICAgJ3R5cGUnIDogInRleHQvcGxhaW4iLAorICAgICAgICAncmV2aWV3JyA6ICcrJywKICAg ICAgICAgJ3Jldmlld2VyX2VtYWlsJyA6ICdvbmVAdGVzdC5jb20nLAotICAgICAgICAnY29tbWl0 dGVyX2VtYWlsJyA6ICd0d29AdGVzdC5jb20nCisgICAgICAgICdjb21taXQtcXVldWUnIDogJysn LAorICAgICAgICAnY29tbWl0dGVyX2VtYWlsJyA6ICd0d29AdGVzdC5jb20nLAogICAgIH0KIAog ICAgIGRlZiB0ZXN0X2F0dGFjaG1lbnRfcGFyc2luZyhzZWxmKToKQEAgLTg2LDUgKzg4LDIwIEBA IGNsYXNzIEJ1Z3ppbGxhVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIGZvciBrZXks IGV4cGVjdGVkX3ZhbHVlIGluIHNlbGYuX2V4cGVjdGVkX2V4YW1wbGVfYXR0YWNobWVudF9wYXJz aW5nLml0ZW1zKCk6CiAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhhdHRhY2htZW50W2tl eV0sIGV4cGVjdGVkX3ZhbHVlLCAoIkZhaWx1cmUgZm9yIGtleTogJXM6IEFjdHVhbD0nJXMnIEV4 cGVjdGVkPSclcyciICUgKGtleSwgYXR0YWNobWVudFtrZXldLCBleHBlY3RlZF92YWx1ZSkpKQog CisgICAgX3NhbXBsZV9hdHRhY2htZW50X2RldGFpbF9wYWdlID0gIiIiCis8IURPQ1RZUEUgaHRt bCBQVUJMSUMgIi0vL1czQy8vRFREIEhUTUwgNC4wMSBUcmFuc2l0aW9uYWwvL0VOIgorICAgICAg ICAgICAgICAgICAgICAgICJodHRwOi8vd3d3LnczLm9yZy9UUi9odG1sNC9sb29zZS5kdGQiPgor PGh0bWw+CisgIDxoZWFkPgorICAgIDx0aXRsZT4KKyAgQXR0YWNobWVudCA0MTA3MyBEZXRhaWxz IGZvciBCdWcgMjczMTQ8L3RpdGxlPgorPGxpbmsgcmVsPSJUb3AiIGhyZWY9Imh0dHBzOi8vYnVn cy53ZWJraXQub3JnLyI+CisgICAgPGxpbmsgcmVsPSJVcCIgaHJlZj0ic2hvd19idWcuY2dpP2lk PTI3MzE0Ij4KKyIiIgorCisgICAgZGVmIHRlc3RfYXR0YWNobWVudF9kZXRhaWxfYnVnX3BhcnNp bmcoc2VsZik6CisgICAgICAgIGJ1Z3ppbGxhID0gQnVnemlsbGEoKQorICAgICAgICBzZWxmLmFz c2VydEVxdWFscygyNzMxNCwgYnVnemlsbGEuX3BhcnNlX2J1Z19pZF9mcm9tX2F0dGFjaG1lbnRf cGFnZShzZWxmLl9zYW1wbGVfYXR0YWNobWVudF9kZXRhaWxfcGFnZSkpCisKIGlmIF9fbmFtZV9f ID09ICdfX21haW5fXyc6CiAgICAgdW5pdHRlc3QubWFpbigp