28316 2009-08-14 13:25:23 -0700 commit-queue should auto-retry patches which fail to commit due to out of date files 2009-09-25 11:28:11 -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 commit-queue oldest_to_newest 140325 0 eric 2009-08-14 13:25:23 -0700 bugzilla-tool land-patches needs to know how to run update-webkit when commits fail If the commit fails due to an out-of-date file. I'm about to write a patch to fix this... 140335 1 34871 eric 2009-08-14 14:02:09 -0700 Created attachment 34871 First attempt 140336 2 eric 2009-08-14 14:11:34 -0700 I'm testing this patch on the commit-queue bot now. If it works well, I'll mark it for review (with a ChangeLog). 140425 3 abarth 2009-08-14 22:32:00 -0700 Nice! Have you tested the case where there are conflicts? 140432 4 eric 2009-08-14 23:04:25 -0700 If there are conflicts, the update will fail and throw and exception, and then the patch landing will fail like normal. 146676 5 abarth 2009-09-11 11:40:02 -0700 We should also not commit-queue- the patch when this happens because it's not the patches fault! 146680 6 eric 2009-09-11 11:42:37 -0700 Yes. I will post a patch to fix this as described in https://bugs.webkit.org/show_bug.cgi?id=28831#c16 shortly. 146869 7 eric 2009-09-11 19:08:15 -0700 Made some progress on this, but the fix will have to wait until next week at this point. 147609 8 eric 2009-09-16 13:47:52 -0700 *** Bug 27355 has been marked as a duplicate of this bug. *** 150052 9 eric 2009-09-25 10:37:04 -0700 Changing the title since I'm not yet able to automatically update and resolve ChangeLog conflicts. Right now we just auto-retry patches which failed due to files out of date. 150063 10 40122 eric 2009-09-25 10:46:23 -0700 Created attachment 40122 Add update auto-recovery 150068 11 40122 abarth 2009-09-25 10:53:16 -0700 Comment on attachment 40122 Add update auto-recovery Yay. I'm tired of having my patches rejected by this bug. 150082 12 40122 commit-queue 2009-09-25 11:28:01 -0700 Comment on attachment 40122 Add update auto-recovery Clearing flags on attachment: 40122 Committed r48762: <http://trac.webkit.org/changeset/48762> 150083 13 commit-queue 2009-09-25 11:28:11 -0700 All reviewed patches have been landed. Closing bug. 34871 2009-08-14 14:02:09 -0700 2009-09-25 10:46:16 -0700 First attempt bug-28316-20090814140208.patch text/plain 1442 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbCBiL1dlYktpdFRv b2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbAppbmRleCAyZTY2Y2VhLi5iZTA3MjVjIDEwMDc1NQot LS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wKKysrIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy9idWd6aWxsYS10b29sCkBAIC0yOTMsNyArMjkzLDcgQEAgY2xhc3MgV2ViS2l0TGFu ZGluZ1NjcmlwdHM6CiAgICAgICAgICAgICBpZiBvcHRpb25zLnRlc3Q6CiAgICAgICAgICAgICAg ICAgY2xzLnJ1bl93ZWJraXRfdGVzdHMobGF1bmNoX3NhZmFyaT1ub3Qgb3B0aW9ucy5jb21taXRf cXVldWUsIHF1aWV0PW9wdGlvbnMucXVpZXQpCiAgICAgICAgIGNvbW1pdF9tZXNzYWdlID0gY29t bWl0X21lc3NhZ2VfZm9yX3RoaXNfY29tbWl0KHNjbSkKLSAgICAgICAgY29tbWl0X2xvZyA9IHNj bS5jb21taXRfd2l0aF9tZXNzYWdlKGNvbW1pdF9tZXNzYWdlLm1lc3NhZ2UoKSkKKyAgICAgICAg Y29tbWl0X2xvZyA9IHNjbS5jb21taXRfd2l0aF9tZXNzYWdlKHNjbSkKICAgICAgICAgcmV0dXJu IGJ1Z19jb21tZW50X2Zyb21fY29tbWl0X3RleHQoc2NtLCBjb21taXRfbG9nKQogCiAKZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY20ucHkgYi9XZWJLaXRUb29scy9T Y3JpcHRzL21vZHVsZXMvc2NtLnB5CmluZGV4IDEwYjc5OWEuLmViMTQwMGQgMTAwNjQ0Ci0tLSBh L1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY20ucHkKKysrIGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy9tb2R1bGVzL3NjbS5weQpAQCAtMjc5LDYgKzI3OSw3IEBAIGNsYXNzIFNWTihTQ00pOgog ICAgIGRlZiBjb21taXRfd2l0aF9tZXNzYWdlKHNlbGYsIG1lc3NhZ2UpOgogICAgICAgICBpZiBz ZWxmLmRyeXJ1bjoKICAgICAgICAgICAgIHJldHVybiAiRHJ5IHJ1biwgbm8gcmVtb3RlIGNvbW1p dC4iCisgICAgICAgIHNlbGYudXBkYXRlX3dlYmtpdCgpICMgVXBkYXRlIGJlZm9yZSBjb21taXR0 aW5nIHRvIGF2b2lkIG91dC1vZi1kYXRlIHRyZWUgZXJyb3JzLgogICAgICAgICByZXR1cm4gc2Vs Zi5ydW5fY29tbWFuZChbJ3N2bicsICdjb21taXQnLCAnLW0nLCBtZXNzYWdlXSkKIAogCkBAIC0z NDIsNiArMzQzLDcgQEAgY2xhc3MgR2l0KFNDTSk6CiAKICAgICBkZWYgY29tbWl0X3dpdGhfbWVz c2FnZShzZWxmLCBtZXNzYWdlKToKICAgICAgICAgc2VsZi5jb21taXRfbG9jYWxseV93aXRoX21l c3NhZ2UobWVzc2FnZSkKKyAgICAgICAgc2VsZi51cGRhdGVfd2Via2l0KCkgIyBVcGRhdGUgYmVm b3JlIGNvbW1pdHRpbmcgdG8gYXZvaWQgb3V0LW9mLWRhdGUgdHJlZSBlcnJvcnMuCiAgICAgICAg IHJldHVybiBzZWxmLnB1c2hfbG9jYWxfY29tbWl0c190b19zZXJ2ZXIoKQogCiAgICAgIyBHaXQt c3BlY2lmaWMgbWV0aG9kczo= 40122 2009-09-25 10:46:23 -0700 2009-09-25 11:28:01 -0700 Add update auto-recovery bug-28316-20090925104622.patch text/plain 10249 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA1MzAwYzk0Li5hMWZkOTg3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMDktMDkt MjUgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNvbW1pdC1xdWV1ZSBzaG91bGQgYXV0by1yZXRy eSBwYXRjaGVzIHdoaWNoIGZhaWwgdG8gY29tbWl0IGR1ZSB0byBvdXQgb2YgZGF0ZSBmaWxlcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjgzMTYKKwor ICAgICAgICAqIFNjcmlwdHMvYnVnemlsbGEtdG9vbDoKKyAgICAgICAgIC0gSGFuZGxlIG5ldyBD aGVja291dE5lZWRzVXBkYXRlIGV4Y2VwdGlvbi4KKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMv bG9nZ2luZ191bml0dGVzdC5weToKKyAgICAgICAgIC0gQ2FsbCB0aGUgU2NyaXB0RXJyb3IgY29u c3RydWN0b3IgY29ycmVjdGx5ICh0aGlzIHRlc3QgaGFkIHJlZ3Jlc3NlZCkuCisgICAgICAgICog U2NyaXB0cy9tb2R1bGVzL3NjbS5weToKKyAgICAgICAgIC0gQWRkZWQgdGhlIGFiaWxpdHkgdG8g ZGVmaW5lIGN1c3RvbSBlcnJvciBoYW5kbGVycyBmb3IgcnVuX2NvbW1hbmQKKyAgICAgICAgICAg YW5kIGFkZGVkIGEgY29tbWl0X2Vycm9yX2hhbmRsZXIgd2hpY2ggdGhyb3dzIENoZWNrb3V0TmVl ZHNVcGRhdGUKKyAgICAgICAgICAgaW5zdGVhZCBvZiBTY3JpcHRFcnJvci4KKyAgICAgICAgIC0g UmUtb3JkZXJlZCBTY3JpcHRFcnJvciBjb25zdHJ1Y3RvciBhcmd1bWVudHMgdG8gbWFrZSBTY3Jp cHRFcnJvcigibWVzc2FnZSB0ZXh0IikgdXNhZ2UgcG9zc2libGUuCisgICAgICAgICogU2NyaXB0 cy9tb2R1bGVzL3NjbV91bml0dGVzdC5weToKKyAgICAgICAgIC0gQWRkZWQgdGVzdHMgb2YgbmV3 IGVycm9yIGhhbmRsZXJzLgorCiAyMDA5LTA5LTE2ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0 Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KZGlmZiAtLWdpdCBh L1dlYktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbCBiL1dlYktpdFRvb2xzL1NjcmlwdHMv YnVnemlsbGEtdG9vbAppbmRleCBmOTA5YWM4Li5lYzVhYTBkIDEwMDc1NQotLS0gYS9XZWJLaXRU b29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6 aWxsYS10b29sCkBAIC00NSw3ICs0NSw3IEBAIGZyb20gbW9kdWxlcy5idWd6aWxsYSBpbXBvcnQg QnVnemlsbGEsIHBhcnNlX2J1Z19pZAogZnJvbSBtb2R1bGVzLmNoYW5nZWxvZ3MgaW1wb3J0IENo YW5nZUxvZwogZnJvbSBtb2R1bGVzLmNvbW1lbnRzIGltcG9ydCBidWdfY29tbWVudF9mcm9tX2Nv bW1pdF90ZXh0CiBmcm9tIG1vZHVsZXMubG9nZ2luZyBpbXBvcnQgZXJyb3IsIGxvZywgdGVlCi1m cm9tIG1vZHVsZXMuc2NtIGltcG9ydCBDb21taXRNZXNzYWdlLCBkZXRlY3Rfc2NtX3N5c3RlbSwg U2NyaXB0RXJyb3IKK2Zyb20gbW9kdWxlcy5zY20gaW1wb3J0IENvbW1pdE1lc3NhZ2UsIGRldGVj dF9zY21fc3lzdGVtLCBTY3JpcHRFcnJvciwgQ2hlY2tvdXROZWVkc1VwZGF0ZQogZnJvbSBtb2R1 bGVzLmJ1aWxkYm90IGltcG9ydCBCdWlsZEJvdAogZnJvbSBtb2R1bGVzLnN0YXR1c2JvdCBpbXBv cnQgU3RhdHVzQm90CiAKQEAgLTM0MSw2ICszNDEsMTAgQEAgY2xhc3MgTGFuZFBhdGNoZXNGcm9t QnVncyhDb21tYW5kKToKIAogICAgICAgICAgICAgaWYgb3B0aW9ucy5jbG9zZV9idWc6CiAgICAg ICAgICAgICAgICAgdG9vbC5idWdzLmNsb3NlX2J1Z19hc19maXhlZChidWdfaWQsICJBbGwgcmV2 aWV3ZWQgcGF0Y2hlcyBoYXZlIGJlZW4gbGFuZGVkLiAgQ2xvc2luZyBidWcuIikKKyAgICAgICAg ZXhjZXB0IENoZWNrb3V0TmVlZHNVcGRhdGUsIGU6CisgICAgICAgICAgICBsb2coIkNvbW1pdCB3 YXMgcmVqZWN0ZWQgYmVjYXVzZSB0aGUgY2hlY2tvdXQgaXMgb3V0IG9mIGRhdGUuICBQbGVhc2Ug dXBkYXRlIGFuZCB0cnkgYWdhaW4uIikKKyAgICAgICAgICAgIGxvZygiWW91IGNhbiBwYXNzIC0t bm8tYnVpbGQgdG8gc2tpcCBidWlsZGluZy90ZXN0aW5nIGFmdGVyIHVwZGF0ZSBpZiB5b3UgYmVs aWV2ZSB0aGUgbmV3IGNvbW1pdHMgZGlkIG5vdCBhZmZlY3QgdGhlIHJlc3VsdHMuIikKKyAgICAg ICAgICAgIGVycm9yKGUpCiAgICAgICAgIGV4Y2VwdCBTY3JpcHRFcnJvciwgZToKICAgICAgICAg ICAgICMgTWFyayB0aGUgcGF0Y2ggYXMgY29tbWl0LXF1ZXVlLSBhbmQgY29tbWVudCBpbiB0aGUg YnVnLgogICAgICAgICAgICAgdG9vbC5idWdzLnJlamVjdF9wYXRjaF9mcm9tX2NvbW1pdF9xdWV1 ZShwYXRjaFsnaWQnXSwgZS5tZXNzYWdlX3dpdGhfb3V0cHV0KCkpCmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9TY3JpcHRzL21vZHVsZXMvbG9nZ2luZ191bml0dGVzdC5weSBiL1dlYktpdFRvb2xz L1NjcmlwdHMvbW9kdWxlcy9sb2dnaW5nX3VuaXR0ZXN0LnB5CmluZGV4IDJkYzU5NDYuLjdkNDFl NTYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9sb2dnaW5nX3VuaXR0 ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9sb2dnaW5nX3VuaXR0ZXN0 LnB5CkBAIC01NCw3ICs1NCw3IEBAIGNsYXNzIExvZ2dpbmdUZXN0KHVuaXR0ZXN0LlRlc3RDYXNl KToKICAgICAgICAgc2VsZi5hc3NlcnRfbG9nX2VxdWFscygidGVzdCIsICJ0ZXN0XG4iKQogCiAg ICAgICAgICMgVGVzdCB0aGF0IGxvZygpIGRvZXMgbm90IHRocm93IGFuIGV4Y2VwdGlvbiB3aGVu IHBhc3NlZCBhbiBvYmplY3QgaW5zdGVhZCBvZiBhIHN0cmluZy4KLSAgICAgICAgc2VsZi5hc3Nl cnRfbG9nX2VxdWFscyhTY3JpcHRFcnJvcigiU2NyaXB0RXJyb3IiKSwgIlNjcmlwdEVycm9yXG4i KQorICAgICAgICBzZWxmLmFzc2VydF9sb2dfZXF1YWxzKFNjcmlwdEVycm9yKG1lc3NhZ2U9IlNj cmlwdEVycm9yIiksICJTY3JpcHRFcnJvclxuIikKIAogCiBpZiBfX25hbWVfXyA9PSAnX19tYWlu X18nOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3NjbS5weSBiL1dl YktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY20ucHkKaW5kZXggZTM3YjYzYy4uM2RhZWNiYyAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3NjbS5weQorKysgYi9XZWJL aXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtLnB5CkBAIC03OCw3ICs3OCw3IEBAIGNsYXNzIENv bW1pdE1lc3NhZ2U6CiAKIAogY2xhc3MgU2NyaXB0RXJyb3IoRXhjZXB0aW9uKToKLSAgICBkZWYg X19pbml0X18oc2VsZiwgc2NyaXB0X2FyZ3M9Tm9uZSwgZXhpdF9jb2RlPU5vbmUsIG1lc3NhZ2U9 Tm9uZSwgb3V0cHV0PU5vbmUsIGN3ZD1Ob25lKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgbWVz c2FnZT1Ob25lLCBzY3JpcHRfYXJncz1Ob25lLCBleGl0X2NvZGU9Tm9uZSwgb3V0cHV0PU5vbmUs IGN3ZD1Ob25lKToKICAgICAgICAgaWYgbm90IG1lc3NhZ2U6CiAgICAgICAgICAgICBtZXNzYWdl ID0gJ0ZhaWxlZCB0byBydW4gIiVzIicgJSBzY3JpcHRfYXJncwogICAgICAgICAgICAgaWYgZXhp dF9jb2RlOgpAQCAtOTksNiArOTksMjMgQEAgY2xhc3MgU2NyaXB0RXJyb3IoRXhjZXB0aW9uKToK ICAgICAgICAgICAgIHJldHVybiAiJXNcbiVzIiAlIChzZWxmLCBzZWxmLm91dHB1dCkKICAgICAg ICAgcmV0dXJuIHN0cihzZWxmKQogCisKK2NsYXNzIENoZWNrb3V0TmVlZHNVcGRhdGUoU2NyaXB0 RXJyb3IpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBzY3JpcHRfYXJncywgZXhpdF9jb2RlLCBv dXRwdXQsIGN3ZCk6CisgICAgICAgIFNjcmlwdEVycm9yLl9faW5pdF9fKHNlbGYsIHNjcmlwdF9h cmdzPXNjcmlwdF9hcmdzLCBleGl0X2NvZGU9ZXhpdF9jb2RlLCBvdXRwdXQ9b3V0cHV0LCBjd2Q9 Y3dkKQorCisKK2RlZiBkZWZhdWx0X2Vycm9yX2hhbmRsZXIoZXJyb3IpOgorICAgIHJhaXNlIGVy cm9yCisKK2RlZiBjb21taXRfZXJyb3JfaGFuZGxlcihlcnJvcik6CisgICAgaWYgcmUuc2VhcmNo KCJyZXNvdXJjZSBvdXQgb2YgZGF0ZSIsIGVycm9yLm91dHB1dCk6CisgICAgICAgIHJhaXNlIENo ZWNrb3V0TmVlZHNVcGRhdGUoc2NyaXB0X2FyZ3M9ZXJyb3Iuc2NyaXB0X2FyZ3MsIGV4aXRfY29k ZT1lcnJvci5leGl0X2NvZGUsIG91dHB1dD1lcnJvci5vdXRwdXQsIGN3ZD1lcnJvci5jd2QpCisg ICAgZGVmYXVsdF9lcnJvcl9oYW5kbGVyKGVycm9yKQorCitkZWYgaWdub3JlX2Vycm9yKGVycm9y KToKKyAgICBwYXNzCisKIGNsYXNzIFNDTToKICAgICBkZWYgX19pbml0X18oc2VsZiwgY3dkLCBk cnlydW49RmFsc2UpOgogICAgICAgICBzZWxmLmN3ZCA9IGN3ZApAQCAtMTA2LDEzICsxMjMsMTQg QEAgY2xhc3MgU0NNOgogICAgICAgICBzZWxmLmRyeXJ1biA9IGRyeXJ1bgogCiAgICAgQHN0YXRp Y21ldGhvZAotICAgIGRlZiBydW5fY29tbWFuZChhcmdzLCBjd2Q9Tm9uZSwgaW5wdXQ9Tm9uZSwg cmFpc2Vfb25fZmFpbHVyZT1UcnVlLCByZXR1cm5fZXhpdF9jb2RlPUZhbHNlKToKKyAgICBkZWYg cnVuX2NvbW1hbmQoYXJncywgY3dkPU5vbmUsIGlucHV0PU5vbmUsIGVycm9yX2hhbmRsZXI9ZGVm YXVsdF9lcnJvcl9oYW5kbGVyLCByZXR1cm5fZXhpdF9jb2RlPUZhbHNlKToKICAgICAgICAgc3Rk aW4gPSBzdWJwcm9jZXNzLlBJUEUgaWYgaW5wdXQgZWxzZSBOb25lCiAgICAgICAgIHByb2Nlc3Mg PSBzdWJwcm9jZXNzLlBvcGVuKGFyZ3MsIHN0ZGluPXN0ZGluLCBzdGRvdXQ9c3VicHJvY2Vzcy5Q SVBFLCBzdGRlcnI9c3VicHJvY2Vzcy5TVERPVVQsIGN3ZD1jd2QpCiAgICAgICAgIG91dHB1dCA9 IHByb2Nlc3MuY29tbXVuaWNhdGUoaW5wdXQpWzBdLnJzdHJpcCgpCiAgICAgICAgIGV4aXRfY29k ZSA9IHByb2Nlc3Mud2FpdCgpCi0gICAgICAgIGlmIHJhaXNlX29uX2ZhaWx1cmUgYW5kIGV4aXRf Y29kZToKLSAgICAgICAgICAgIHJhaXNlIFNjcmlwdEVycm9yKHNjcmlwdF9hcmdzPWFyZ3MsIGV4 aXRfY29kZT1leGl0X2NvZGUsIG91dHB1dD1vdXRwdXQsIGN3ZD1jd2QpCisgICAgICAgIGlmIGV4 aXRfY29kZToKKyAgICAgICAgICAgIHNjcmlwdF9lcnJvciA9IFNjcmlwdEVycm9yKHNjcmlwdF9h cmdzPWFyZ3MsIGV4aXRfY29kZT1leGl0X2NvZGUsIG91dHB1dD1vdXRwdXQsIGN3ZD1jd2QpCisg ICAgICAgICAgICBlcnJvcl9oYW5kbGVyKHNjcmlwdF9lcnJvcikKICAgICAgICAgaWYgcmV0dXJu X2V4aXRfY29kZToKICAgICAgICAgICAgIHJldHVybiBleGl0X2NvZGUKICAgICAgICAgcmV0dXJu IG91dHB1dApAQCAtMTI1LDcgKzE0Myw3IEBAIGNsYXNzIFNDTToKIAogICAgIGRlZiBlbnN1cmVf Y2xlYW5fd29ya2luZ19kaXJlY3Rvcnkoc2VsZiwgZm9yY2UpOgogICAgICAgICBpZiBub3QgZm9y Y2UgYW5kIG5vdCBzZWxmLndvcmtpbmdfZGlyZWN0b3J5X2lzX2NsZWFuKCk6Ci0gICAgICAgICAg ICBwcmludCBzZWxmLnJ1bl9jb21tYW5kKHNlbGYuc3RhdHVzX2NvbW1hbmQoKSwgcmFpc2Vfb25f ZmFpbHVyZT1GYWxzZSkKKyAgICAgICAgICAgIHByaW50IHNlbGYucnVuX2NvbW1hbmQoc2VsZi5z dGF0dXNfY29tbWFuZCgpLCBlcnJvcl9oYW5kbGVyPWlnbm9yZV9lcnJvcikKICAgICAgICAgICAg IHJhaXNlIFNjcmlwdEVycm9yKG1lc3NhZ2U9IldvcmtpbmcgZGlyZWN0b3J5IGhhcyBtb2RpZmlj YXRpb25zLCBwYXNzIC0tZm9yY2UtY2xlYW4gb3IgLS1uby1jbGVhbiB0byBjb250aW51ZS4iKQog ICAgICAgICAKICAgICAgICAgbG9nKCJDbGVhbmluZyB3b3JraW5nIGRpcmVjdG9yeSIpCkBAIC0z MDAsNyArMzE4LDcgQEAgY2xhc3MgU1ZOKFNDTSk6CiAgICAgQHN0YXRpY21ldGhvZAogICAgIGRl ZiBjb21taXRfc3VjY2Vzc19yZWdleHAoKToKICAgICAgICAgcmV0dXJuICJeQ29tbWl0dGVkIHJl dmlzaW9uICg/UDxzdm5fcmV2aXNpb24+XGQrKVwuJCIKLSAgICAKKwogICAgIGRlZiBzdm5fdmVy c2lvbihzZWxmKToKICAgICAgICAgaWYgbm90IHNlbGYuY2FjaGVkX3ZlcnNpb246CiAgICAgICAg ICAgICBzZWxmLmNhY2hlZF92ZXJzaW9uID0gc2VsZi5ydW5fY29tbWFuZChbJ3N2bicsICctLXZl cnNpb24nLCAnLS1xdWlldCddKQpAQCAtMzU2LDcgKzM3NCw3IEBAIGNsYXNzIFNWTihTQ00pOgog ICAgICAgICBpZiBzZWxmLmRyeXJ1bjoKICAgICAgICAgICAgICMgUmV0dXJuIGEgc3RyaW5nIHdo aWNoIGxvb2tzIGxpa2UgYSBjb21taXQgc28gdGhhdCB0aGluZ3Mgd2hpY2ggcGFyc2UgdGhpcyBv dXRwdXQgd2lsbCBzdWNjZWVkLgogICAgICAgICAgICAgcmV0dXJuICJEcnkgcnVuLCBubyBjb21t aXQuXG5Db21taXR0ZWQgcmV2aXNpb24gMC4iCi0gICAgICAgIHJldHVybiBzZWxmLnJ1bl9jb21t YW5kKFsnc3ZuJywgJ2NvbW1pdCcsICctbScsIG1lc3NhZ2VdKQorICAgICAgICByZXR1cm4gc2Vs Zi5ydW5fY29tbWFuZChbJ3N2bicsICdjb21taXQnLCAnLW0nLCBtZXNzYWdlXSwgZXJyb3JfaGFu ZGxlcj1jb21taXRfZXJyb3JfaGFuZGxlcikKIAogICAgIGRlZiBzdm5fY29tbWl0X2xvZyhzZWxm LCBzdm5fcmV2aXNpb24pOgogICAgICAgICBzdm5fcmV2aXNpb24gPSBzZWxmLnN0cmlwX3JfZnJv bV9zdm5fcmV2aXNpb24oc3RyKHN2bl9yZXZpc2lvbikpCkBAIC0zODgsNyArNDA2LDggQEAgY2xh c3MgR2l0KFNDTSk6CiAgICAgQHN0YXRpY21ldGhvZAogICAgIGRlZiBjb21taXRfc3VjY2Vzc19y ZWdleHAoKToKICAgICAgICAgcmV0dXJuICJeQ29tbWl0dGVkIHIoP1A8c3ZuX3JldmlzaW9uPlxk KykkIgotICAgIAorCisKICAgICBkZWYgZGlzY2FyZF9sb2NhbF9jb21taXRzKHNlbGYpOgogICAg ICAgICBzZWxmLnJ1bl9jb21tYW5kKFsnZ2l0JywgJ3Jlc2V0JywgJy0taGFyZCcsICd0cnVuaydd KQogICAgIApAQCAtNDQ4LDcgKzQ2Nyw3IEBAIGNsYXNzIEdpdChTQ00pOgogCiAgICAgICAgICMg SSB0aGluayB0aGlzIHdpbGwgYWx3YXlzIGZhaWwgZHVlIHRvIENoYW5nZUxvZ3MuCiAgICAgICAg ICMgRklYTUU6IFdlIG5lZWQgdG8gZGV0ZWMgc3BlY2lmaWMgZmFpbHVyZSBjb25kaXRpb25zIGFu ZCBoYW5kbGUgdGhlbS4KLSAgICAgICAgc2VsZi5ydW5fY29tbWFuZChbJ2dpdCcsICdyZXZlcnQn LCAnLS1uby1jb21taXQnLCBnaXRfY29tbWl0XSwgcmFpc2Vfb25fZmFpbHVyZT1GYWxzZSkKKyAg ICAgICAgc2VsZi5ydW5fY29tbWFuZChbJ2dpdCcsICdyZXZlcnQnLCAnLS1uby1jb21taXQnLCBn aXRfY29tbWl0XSwgZXJyb3JfaGFuZGxlcj1pZ25vcmVfZXJyb3IpCiAKICAgICAgICAgIyBGaXgg YW55IENoYW5nZUxvZ3MgaWYgbmVjZXNzYXJ5LgogICAgICAgICBjaGFuZ2Vsb2dfcGF0aHMgPSBz ZWxmLm1vZGlmaWVkX2NoYW5nZWxvZ3MoKQpAQCAtNDg0LDcgKzUwMyw3IEBAIGNsYXNzIEdpdChT Q00pOgogICAgICAgICBpZiBzZWxmLmRyeXJ1bjoKICAgICAgICAgICAgICMgUmV0dXJuIGEgc3Ry aW5nIHdoaWNoIGxvb2tzIGxpa2UgYSBjb21taXQgc28gdGhhdCB0aGluZ3Mgd2hpY2ggcGFyc2Ug dGhpcyBvdXRwdXQgd2lsbCBzdWNjZWVkLgogICAgICAgICAgICAgcmV0dXJuICJEcnkgcnVuLCBu byByZW1vdGUgY29tbWl0LlxuQ29tbWl0dGVkIHIwIgotICAgICAgICByZXR1cm4gc2VsZi5ydW5f Y29tbWFuZChbJ2dpdCcsICdzdm4nLCAnZGNvbW1pdCddKQorICAgICAgICByZXR1cm4gc2VsZi5y dW5fY29tbWFuZChbJ2dpdCcsICdzdm4nLCAnZGNvbW1pdCddLCBlcnJvcl9oYW5kbGVyPWNvbW1p dF9lcnJvcl9oYW5kbGVyKQogCiAgICAgIyBUaGlzIGZ1bmN0aW9uIHN1cHBvcnRzIHRoZSBmb2xs b3dpbmcgYXJndW1lbnQgZm9ybWF0czoKICAgICAjIG5vIGFyZ3MgOiByZXYtbGlzdCB0cnVuay4u SEVBRApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3NjbV91bml0dGVz dC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY21fdW5pdHRlc3QucHkKaW5kZXgg OWNhMzA4Yy4uNTg0OTRhMCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVz L3NjbV91bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtX3Vu aXR0ZXN0LnB5CkBAIC0zNSw3ICszNSw3IEBAIGltcG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgdGVt cGZpbGUKIGltcG9ydCB1bml0dGVzdAogaW1wb3J0IHVybGxpYgotZnJvbSBtb2R1bGVzLnNjbSBp bXBvcnQgZGV0ZWN0X3NjbV9zeXN0ZW0sIFNDTSwgU2NyaXB0RXJyb3IKK2Zyb20gbW9kdWxlcy5z Y20gaW1wb3J0IGRldGVjdF9zY21fc3lzdGVtLCBTQ00sIFNjcmlwdEVycm9yLCBDaGVja291dE5l ZWRzVXBkYXRlLCBpZ25vcmVfZXJyb3IsIGNvbW1pdF9lcnJvcl9oYW5kbGVyCiAKIAogIyBFdmVu dHVhbGx5IHdlIHdpbGwgd2FudCB0byB3cml0ZSB0ZXN0cyB3aGljaCB3b3JrIGZvciBib3RoIHNj bXMuIChsaWtlIHVwZGF0ZV93ZWJraXQsIGNoYW5nZWRfZmlsZXMsIGV0Yy4pCkBAIC0xMzMsNiAr MTMzLDI1IEBAIGNsYXNzIFNDTVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBvcy5t a2Rpcihvcy5wYXRoLmRpcm5hbWUobG9jYWxfc2NyaXB0c19kaXJlY3RvcnkpKQogICAgICAgICBv cy5zeW1saW5rKHdlYmtpdF9zY3JpcHRzX2RpcmVjdG9yeSwgbG9jYWxfc2NyaXB0c19kaXJlY3Rv cnkpCiAKKyAgICBkZWYgdGVzdF9lcnJvcl9oYW5kbGVycyhzZWxmKToKKyAgICAgICAgZ2l0X2Zh aWx1cmVfbWVzc2FnZT0iTWVyZ2UgY29uZmxpY3QgZHVyaW5nIGNvbW1pdDogWW91ciBmaWxlIG9y IGRpcmVjdG9yeSAnV2ViQ29yZS9DaGFuZ2VMb2cnIGlzIHByb2JhYmx5IG91dC1vZi1kYXRlOiBy ZXNvdXJjZSBvdXQgb2YgZGF0ZTsgdHJ5IHVwZGF0aW5nIGF0IC91c3IvbG9jYWwvbGliZXhlYy9n aXQtY29yZS8vZ2l0LXN2biBsaW5lIDQ2OSIKKyAgICAgICAgc3ZuX2ZhaWx1cmVfbWVzc2FnZT0i IiJzdm46IENvbW1pdCBmYWlsZWQgKGRldGFpbHMgZm9sbG93KToKK3N2bjogRmlsZSBvciBkaXJl Y3RvcnkgJ0NoYW5nZUxvZycgaXMgb3V0IG9mIGRhdGU7IHRyeSB1cGRhdGluZworc3ZuOiByZXNv dXJjZSBvdXQgb2YgZGF0ZTsgdHJ5IHVwZGF0aW5nCisiIiIKKyAgICAgICAgY29tbWFuZF9kb2Vz X25vdF9leGlzdCA9IFsnZG9lc19ub3RfZXhpc3QnLCAnaW52YWxpZF9vcHRpb24nXQorICAgICAg ICBzZWxmLmFzc2VydFJhaXNlcyhPU0Vycm9yLCBTQ00ucnVuX2NvbW1hbmQsIGNvbW1hbmRfZG9l c19ub3RfZXhpc3QpCisgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKE9TRXJyb3IsIFNDTS5ydW5f Y29tbWFuZCwgY29tbWFuZF9kb2VzX25vdF9leGlzdCwgZXJyb3JfaGFuZGxlcj1pZ25vcmVfZXJy b3IpCisKKyAgICAgICAgY29tbWFuZF9yZXR1cm5zX25vbl96ZXJvID0gWycvYmluL3NoJywgJy0t aW52YWxpZC1vcHRpb24nXQorICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhTY3JpcHRFcnJvciwg U0NNLnJ1bl9jb21tYW5kLCBjb21tYW5kX3JldHVybnNfbm9uX3plcm8pCisgICAgICAgIHNlbGYu YXNzZXJ0VHJ1ZShTQ00ucnVuX2NvbW1hbmQoY29tbWFuZF9yZXR1cm5zX25vbl96ZXJvLCBlcnJv cl9oYW5kbGVyPWlnbm9yZV9lcnJvcikpCisKKyAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoQ2hl Y2tvdXROZWVkc1VwZGF0ZSwgY29tbWl0X2Vycm9yX2hhbmRsZXIsIFNjcmlwdEVycm9yKG91dHB1 dD1naXRfZmFpbHVyZV9tZXNzYWdlKSkKKyAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoQ2hlY2tv dXROZWVkc1VwZGF0ZSwgY29tbWl0X2Vycm9yX2hhbmRsZXIsIFNjcmlwdEVycm9yKG91dHB1dD1z dm5fZmFpbHVyZV9tZXNzYWdlKSkKKyAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoU2NyaXB0RXJy b3IsIGNvbW1pdF9lcnJvcl9oYW5kbGVyLCBTY3JpcHRFcnJvcihvdXRwdXQ9J2JsYWggYmxhaCBi bGFoJykpCisKKwogICAgICMgVGVzdHMgd2hpY2ggYm90aCBHaXRUZXN0IGFuZCBTVk5UZXN0IHNo b3VsZCBydW4uCiAgICAgIyBGSVhNRTogVGhlcmUgbXVzdCBiZSBhIHNpbXBsZXIgd2F5IHRvIGFk ZCB0aGVzZSB3L28gYWRkaW5nIGEgd3JhcHBlciBtZXRob2QgdG8gYm90aCBzdWJjbGFzc2VzCiAg ICAgZGVmIF9zaGFyZWRfdGVzdF9jb21taXRfd2l0aF9tZXNzYWdlKHNlbGYpOg==