167231 2017-01-19 23:07:51 -0800 Make sync-commits.py robust against missing Subversion authors and missing parent Git commits 2017-01-20 14:05:36 -0800 1 1 1 Unclassified WebKit Perf Dashboard WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa cdumez kling koivisto rniwa slewis oldest_to_newest 1268371 0 rniwa 2017-01-19 23:07:51 -0800 Some repositories are failing to sync in our internal dashboard because sync-commits.py can't handle: 1. Missing author information in a subversion commit 2. Missing parent git commit which got merged as a part of larger commits if those commits were dated before the last synced commit. 1268376 1 299324 rniwa 2017-01-19 23:22:28 -0800 Created attachment 299324 Fixes the bug 1268559 2 rniwa 2017-01-20 14:05:36 -0800 Committed r210982: <http://trac.webkit.org/changeset/210982> 299324 2017-01-19 23:22:28 -0800 2017-01-20 14:01:44 -0800 Fixes the bug bug-167231-20170119232036.patch text/plain 9993 rniwa SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkocmV2aXNpb24gMjEwOTU0KQorKysg V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMzIEBACisyMDE3LTAxLTE5ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIE1ha2Ugc3luYy1jb21taXRzLnB5IHJvYnVzdCBhZ2FpbnN0IG1pc3NpbmcgU3Vi dmVyc2lvbiBhdXRob3JzIGFuZCBtaXNzaW5nIHBhcmVudCBHaXQgY29tbWl0cworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3MjMxCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4ZWQgYSBidWcgdGhhdCBh IHN1YnZlcnNpb24gY29tbWl0IHRoYXQncyBtaXNzaW5nIGF1dGhvciBuYW1lIChhbm9ueW1vdXMg Y29tbWl0KSByZXN1bHRzIGluIGFuIG91dCBvZiBib3VuZAorICAgICAgICBleGNlcHRpb24sIGFu ZCBhIGJ1ZyB0aGF0IHN5bmNpbmcgYSBnaXQgcmVwb3NpdG9yeSBzdGFydHMgZmFpbGluZyBvbmNl IHRoZXJlIHdhcyBhIG1lcmdlIGNvbW1pdCB3aGljaCBwdWxsZWQKKyAgICAgICAgaW4gYSBjb21t aXQgZGF0YSBlYXJsaWVyIHRoYW4gdGhhdCBvZiB0aGUgbGFzdCByZXBvcnRlZCBjb21taXQuCisK KyAgICAgICAgRm9yIHRoZSBsYXR0ZXIgZml4LCBhZGRlZCAtLW1heC1hbmNlc3Rvci1mZXRjaC1j b3VudCB0byBzcGVjaWZ5IHRoZSBudW1iZXIgb2YgbWF4aW11bSBjb21taXRzIHRvIGxvb2sgYmFj ay4KKworICAgICAgICAqIHRvb2xzL3N5bmMtY29tbWl0cy5weToKKyAgICAgICAgKG1haW4pOiBB ZGRlZCAtLW1heC1hbmNlc3Rvci1mZXRjaC1jb3VudC4KKyAgICAgICAgKFJlcG9zaXRvcnkuZmV0 Y2hfY29tbWl0c19hbmRfc3VibWl0KTogSWYgc3VibWl0X2NvbW1pdHMgZmFpbHMgd2l0aCBGYWls ZWRUb0ZpbmRQYXJlbnRDb21taXQsIGZldGNoIHRoZSBwYXJlbnQKKyAgICAgICAgY29tbWl0J3Mg aW5mb3JtYXRpb24gdW50aWwgd2UndmUgcmVzb2x2ZWQgdGhlbSBhbGwuCisgICAgICAgIChSZXBv c2l0b3J5LmZldGNoX25leHRfY29tbWl0KTogUmVuYW1lZCBmcm9tIGZldGNoX2NvbW1pdC4KKyAg ICAgICAgKFNWTlJlcG9zaXRvcnkuZmV0Y2hfbmV4dF9jb21taXQpOiBSZW5hbWVkIGZyb20gZmV0 Y2hfY29tbWl0LiBEb24ndCB0cnkgdG8gZ2V0IHRoZSBhdXRob3IgbmFtZSBpZiBpdCdzIG1pc3Np bmcKKyAgICAgICAgZHVlIHRvIGFuIGFub255bW91cyBjb21taXQuIEl0J3MgaW1wb3J0YW50IHRv IG5ldmVyIGluY2x1ZGUgdGhlICJhdXRob3IiIGZpZWxkIGluIHRoZSBKU09OIHN1Ym1pdHRlZCB0 bworICAgICAgICBhIGRhc2hib2FyZCBzaW5jZSBpdCByZWplY3RzIHdoZW4gImF1dGhvciIgZmll bGQgaXMgbm90IGFuIGFycmF5IChlLmcuIG51bGwpLiAKKyAgICAgICAgKEdpdFJlcG9zaXRvcnku ZmV0Y2hfbmV4dF9jb21taXQpOiBSZW5hbWVkIGZyb20gZmV0Y2hfY29tbWl0LgorICAgICAgICAo R2l0UmVwb3NpdG9yeS5mZXRjaF9jb21taXQpOiBBZGRlZC4gRmV0Y2hlcyB0aGUgY29tbWl0IGlu Zm9ybWF0aW9uIGZvciBhIGdpdmVuIGdpdCBoYXNoLiBVc2VkIHRvIHJldHJpZXZlCisgICAgICAg IG1pc3NpbmcgcGFyZW50IGNvbW1pdHMuCisgICAgICAgIChHaXRSZXBvc2l0b3J5Ll9yZXZpc2lv bl9mcm9tX3Rva2Vucyk6IEV4dHJhY3RlZCBmcm9tIGZldGNoX2NvbW1pdC4KKworICAgICAgICAq IHRvb2xzL3V0aWwucHk6CisgICAgICAgIChzdWJtaXRfY29tbWl0cyk6IE9wdGlvbmFsbHkgdGFr ZXMgc3RhdHVzX3RvX2FjY2VwdCB0byBhdm9pZCB0aHJvd2luZyBpbiB0aGUgY2FzZSBvZiBGYWls ZWRUb0ZpbmRQYXJlbnRDb21taXQKKyAgICAgICAgYW5kIHJldHVybnMgdGhlIHJlc3BvbnNlIEpT T04uCisKIDIwMTctMDEtMTkgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgbWVhc3VyZW1lbnQtc2V0cyBBUEkgY2FuIGluY29ycmVjdGx5IG9yZGVyIHBvaW50cyB3 aXRoIE9TIHZlcnNpb24gd2l0aG91dCBjb21taXQgdGltZQpJbmRleDogV2Vic2l0ZXMvcGVyZi53 ZWJraXQub3JnL3Rvb2xzL3N5bmMtY29tbWl0cy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy9w ZXJmLndlYmtpdC5vcmcvdG9vbHMvc3luYy1jb21taXRzLnB5CShyZXZpc2lvbiAyMTA5NTIpCisr KyBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvc3luYy1jb21taXRzLnB5CSh3b3JraW5n IGNvcHkpCkBAIC0yMyw2ICsyMyw3IEBAIGRlZiBtYWluKGFyZ3YpOgogICAgIHBhcnNlci5hZGRf YXJndW1lbnQoJy0tc2VydmVyLWNvbmZpZy1qc29uJywgcmVxdWlyZWQ9VHJ1ZSwgaGVscD0nVGhl IHBhdGggdG8gYSBKU09OIGZpbGUgdGhhdCBzcGVjaWZpZXMgdGhlIHBlcmYgZGFzaGJvYXJkJykK ICAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLXNlY29uZHMtdG8tc2xlZXAnLCB0eXBlPWZsb2F0 LCBkZWZhdWx0PTkwMCwgaGVscD0nVGhlIHNlY29uZHMgdG8gc2xlZXAgYmV0d2VlbiBpdGVyYXRp b25zJykKICAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLW1heC1mZXRjaC1jb3VudCcsIHR5cGU9 aW50LCBkZWZhdWx0PTEwLCBoZWxwPSdUaGUgbnVtYmVyIG9mIGNvbW1pdHMgdG8gZmV0Y2ggYXQg b25jZScpCisgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1tYXgtYW5jZXN0b3ItZmV0Y2gtY291 bnQnLCB0eXBlPWludCwgZGVmYXVsdD0xMDAsIGhlbHA9J1RoZSBudW1iZXIgb2YgY29tbWl0cyB0 byBmZXRjaCBhdCBvbmNlIGlmIHNvbWUgY29tbWl0cyBhcmUgbWlzc2luZyBwYXJlbnRzJykKICAg ICBhcmdzID0gcGFyc2VyLnBhcnNlX2FyZ3MoKQogCiAgICAgd2l0aCBvcGVuKGFyZ3MucmVwb3Np dG9yeV9jb25maWdfanNvbikgYXMgcmVwb3NpdG9yeV9jb25maWdfanNvbjoKQEAgLTMyLDcgKzMz LDcgQEAgZGVmIG1haW4oYXJndik6CiAgICAgICAgIHNlcnZlcl9jb25maWcgPSBsb2FkX3NlcnZl cl9jb25maWcoYXJncy5zZXJ2ZXJfY29uZmlnX2pzb24pCiAgICAgICAgIGZvciByZXBvc2l0b3J5 IGluIHJlcG9zaXRvcmllczoKICAgICAgICAgICAgIHRyeToKLSAgICAgICAgICAgICAgICByZXBv c2l0b3J5LmZldGNoX2NvbW1pdHNfYW5kX3N1Ym1pdChzZXJ2ZXJfY29uZmlnLCBhcmdzLm1heF9m ZXRjaF9jb3VudCkKKyAgICAgICAgICAgICAgICByZXBvc2l0b3J5LmZldGNoX2NvbW1pdHNfYW5k X3N1Ym1pdChzZXJ2ZXJfY29uZmlnLCBhcmdzLm1heF9mZXRjaF9jb3VudCwgYXJncy5tYXhfYW5j ZXN0b3JfZmV0Y2hfY291bnQpCiAgICAgICAgICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGVycm9y OgogICAgICAgICAgICAgICAgIHByaW50ICJGYWlsZWQgdG8gZmV0Y2ggYW5kIHN5bmM6IiwgZXJy b3IKIApAQCAtNTYsMTQgKzU3LDE0IEBAIGNsYXNzIFJlcG9zaXRvcnkob2JqZWN0KToKICAgICAg ICAgc2VsZi5fbmFtZSA9IG5hbWUKICAgICAgICAgc2VsZi5fbGFzdF9mZXRjaGVkID0gTm9uZQog Ci0gICAgZGVmIGZldGNoX2NvbW1pdHNfYW5kX3N1Ym1pdChzZWxmLCBzZXJ2ZXJfY29uZmlnLCBt YXhfZmV0Y2hfY291bnQpOgorICAgIGRlZiBmZXRjaF9jb21taXRzX2FuZF9zdWJtaXQoc2VsZiwg c2VydmVyX2NvbmZpZywgbWF4X2ZldGNoX2NvdW50LCBtYXhfYW5jZXN0b3JfZmV0Y2hfY291bnQp OgogICAgICAgICBpZiBub3Qgc2VsZi5fbGFzdF9mZXRjaGVkOgogICAgICAgICAgICAgcHJpbnQg IkRldGVybWluaW5nIHRoZSBzdGF0aW5nIHJldmlzaW9uIGZvciAlcyIgJSBzZWxmLl9uYW1lCiAg ICAgICAgICAgICBzZWxmLl9sYXN0X2ZldGNoZWQgPSBzZWxmLmRldGVybWluZV9sYXN0X3JlcG9y dGVkX3JldmlzaW9uKHNlcnZlcl9jb25maWcpCiAKICAgICAgICAgcGVuZGluZ19jb21taXRzID0g W10KICAgICAgICAgZm9yIHVudXNlZCBpbiByYW5nZShtYXhfZmV0Y2hfY291bnQpOgotICAgICAg ICAgICAgY29tbWl0ID0gc2VsZi5mZXRjaF9jb21taXQoc2VydmVyX2NvbmZpZywgc2VsZi5fbGFz dF9mZXRjaGVkKQorICAgICAgICAgICAgY29tbWl0ID0gc2VsZi5mZXRjaF9uZXh0X2NvbW1pdChz ZXJ2ZXJfY29uZmlnLCBzZWxmLl9sYXN0X2ZldGNoZWQpCiAgICAgICAgICAgICBpZiBub3QgY29t bWl0OgogICAgICAgICAgICAgICAgIGJyZWFrCiAgICAgICAgICAgICBwZW5kaW5nX2NvbW1pdHMg Kz0gW2NvbW1pdF0KQEAgLTczLDE3ICs3NCwzMyBAQCBjbGFzcyBSZXBvc2l0b3J5KG9iamVjdCk6 CiAgICAgICAgICAgICBwcmludCAiTm8gbmV3IHJldmlzaW9uIGZvdW5kIGZvciAlcyAobGFzdCBm ZXRjaGVkOiAlcykiICUgKHNlbGYuX25hbWUsIHNlbGYuZm9ybWF0X3JldmlzaW9uKHNlbGYuX2xh c3RfZmV0Y2hlZCkpCiAgICAgICAgICAgICByZXR1cm4KIAotICAgICAgICByZXZpc2lvbl9saXN0 ID0gJywgJy5qb2luKFtzZWxmLmZvcm1hdF9yZXZpc2lvbihjb21taXRbJ3JldmlzaW9uJ10pIGZv ciBjb21taXQgaW4gcGVuZGluZ19jb21taXRzXSkKKyAgICAgICAgZm9yIHVudXNlZCBpbiByYW5n ZShtYXhfYW5jZXN0b3JfZmV0Y2hfY291bnQpOgorICAgICAgICAgICAgcmV2aXNpb25fbGlzdCA9 ICcsICcuam9pbihbc2VsZi5mb3JtYXRfcmV2aXNpb24oY29tbWl0WydyZXZpc2lvbiddKSBmb3Ig Y29tbWl0IGluIHBlbmRpbmdfY29tbWl0c10pCisgICAgICAgICAgICBwcmludCAiU3VibWl0dGlu ZyByZXZpc2lvbnMgJXMgZm9yICVzIHRvICVzIiAlIChyZXZpc2lvbl9saXN0LCBzZWxmLl9uYW1l LCBzZXJ2ZXJfY29uZmlnWydzZXJ2ZXInXVsndXJsJ10pCiAKLSAgICAgICAgcHJpbnQgIlN1Ym1p dHRpbmcgcmV2aXNpb25zICVzIGZvciAlcyB0byAlcyIgJSAocmV2aXNpb25fbGlzdCwgc2VsZi5f bmFtZSwgc2VydmVyX2NvbmZpZ1snc2VydmVyJ11bJ3VybCddKQorICAgICAgICAgICAgcmVzdWx0 ID0gc3VibWl0X2NvbW1pdHMocGVuZGluZ19jb21taXRzLCBzZXJ2ZXJfY29uZmlnWydzZXJ2ZXIn XVsndXJsJ10sCisgICAgICAgICAgICAgICAgc2VydmVyX2NvbmZpZ1snc2xhdmUnXVsnbmFtZSdd LCBzZXJ2ZXJfY29uZmlnWydzbGF2ZSddWydwYXNzd29yZCddLCBbJ09LJywgJ0ZhaWxlZFRvRmlu ZFBhcmVudENvbW1pdCddKQogCi0gICAgICAgIHN1Ym1pdF9jb21taXRzKHBlbmRpbmdfY29tbWl0 cywgc2VydmVyX2NvbmZpZ1snc2VydmVyJ11bJ3VybCddLAotICAgICAgICAgICAgc2VydmVyX2Nv bmZpZ1snc2xhdmUnXVsnbmFtZSddLCBzZXJ2ZXJfY29uZmlnWydzbGF2ZSddWydwYXNzd29yZCdd KQorICAgICAgICAgICAgaWYgcmVzdWx0LmdldCgnc3RhdHVzJykgPT0gJ09LJzoKKyAgICAgICAg ICAgICAgICBicmVhaworCisgICAgICAgICAgICBpZiByZXN1bHQuZ2V0KCdzdGF0dXMnKSA9PSAn RmFpbGVkVG9GaW5kUGFyZW50Q29tbWl0JzoKKyAgICAgICAgICAgICAgICBwYXJlbnRfY29tbWl0 ID0gc2VsZi5mZXRjaF9jb21taXQoc2VydmVyX2NvbmZpZywgcmVzdWx0Wydjb21taXQnXVsncGFy ZW50J10pCisgICAgICAgICAgICAgICAgaWYgbm90IHBhcmVudF9jb21taXQ6CisgICAgICAgICAg ICAgICAgICAgIHJhaXNlIEV4Y2VwdGlvbignQ291bGQgbm90IGZpbmQgdGhlIHBhcmVudCAlcyBv ZiAlcycgJSAocmVzdWx0Wydjb21taXQnXVsncGFyZW50J10sIHJlc3VsdFsnY29tbWl0J11bJ3Jl dmlzaW9uJ10pKQorICAgICAgICAgICAgICAgIHBlbmRpbmdfY29tbWl0cyA9IFtwYXJlbnRfY29t bWl0XSArIHBlbmRpbmdfY29tbWl0cworCisgICAgICAgIGlmIHJlc3VsdC5nZXQoJ3N0YXR1cycp ICE9ICdPSyc6CisgICAgICAgICAgICByYWlzZSBFeGNlcHRpb24ocmVzdWx0KQogCiAgICAgICAg IHByaW50ICJTdWNjZXNzZnVsbHkgc3VibWl0dGVkLiIKICAgICAgICAgcHJpbnQKIAogICAgIEBh YnN0cmFjdG1ldGhvZAorICAgIGRlZiBmZXRjaF9uZXh0X2NvbW1pdChzZWxmLCBzZXJ2ZXJfY29u ZmlnLCBsYXN0X2ZldGNoZWQpOgorICAgICAgICBwYXNzCisKKyAgICBAYWJzdHJhY3RtZXRob2QK ICAgICBkZWYgZmV0Y2hfY29tbWl0KHNlbGYsIHNlcnZlcl9jb25maWcsIGxhc3RfZmV0Y2hlZCk6 CiAgICAgICAgIHBhc3MKIApAQCAtMTE1LDcgKzEzMiw3IEBAIGNsYXNzIFNWTlJlcG9zaXRvcnko UmVwb3NpdG9yeSk6CiAgICAgICAgIHNlbGYuX3VzZV9zZXJ2ZXJfYXV0aCA9IHVzZV9zZXJ2ZXJf YXV0aAogICAgICAgICBzZWxmLl9hY2NvdW50X25hbWVfc2NyaXB0X3BhdGggPSBhY2NvdW50X25h bWVfc2NyaXB0X3BhdGgKIAotICAgIGRlZiBmZXRjaF9jb21taXQoc2VsZiwgc2VydmVyX2NvbmZp ZywgbGFzdF9mZXRjaGVkKToKKyAgICBkZWYgZmV0Y2hfbmV4dF9jb21taXQoc2VsZiwgc2VydmVy X2NvbmZpZywgbGFzdF9mZXRjaGVkKToKICAgICAgICAgaWYgbm90IGxhc3RfZmV0Y2hlZDoKICAg ICAgICAgICAgICMgRklYTUU6IFRoaXMgaXMgYSBwcm9ibGVtYXRpYyBpZiBkYXNoYm9hcmQgY2Fu IGdldCByZXN1bHRzIGZvciByZXZpc2lvbnMgb2xkZXIgdGhhbiBvbGRlc3RfcmV2aXNpb24KICAg ICAgICAgICAgICMgaW4gdGhlIGZ1dHVyZSBiZWNhdXNlIHdlIG5ldmVyIHJlZmV0Y2ggb2xkZXIg cmV2aXNpb25zLgpAQCAtMTM5LDE5ICsxNTYsMjQgQEAgY2xhc3MgU1ZOUmVwb3NpdG9yeShSZXBv c2l0b3J5KToKIAogICAgICAgICB4bWwgPSBwYXJzZVhtbFN0cmluZyhvdXRwdXQpCiAgICAgICAg IHRpbWUgPSB0ZXh0X2NvbnRlbnQoeG1sLmdldEVsZW1lbnRzQnlUYWdOYW1lKCJkYXRlIilbMF0p Ci0gICAgICAgIGF1dGhvcl9hY2NvdW50ID0gdGV4dF9jb250ZW50KHhtbC5nZXRFbGVtZW50c0J5 VGFnTmFtZSgiYXV0aG9yIilbMF0pCisgICAgICAgIGF1dGhvcl9lbGVtZW50cyA9IHhtbC5nZXRF bGVtZW50c0J5VGFnTmFtZSgiYXV0aG9yIikKKyAgICAgICAgYXV0aG9yX2FjY291bnQgPSB0ZXh0 X2NvbnRlbnQoYXV0aG9yX2VsZW1lbnRzWzBdKSBpZiBhdXRob3JfZWxlbWVudHMubGVuZ3RoIGVs c2UgTm9uZQogICAgICAgICBtZXNzYWdlID0gdGV4dF9jb250ZW50KHhtbC5nZXRFbGVtZW50c0J5 VGFnTmFtZSgibXNnIilbMF0pCiAKLSAgICAgICAgbmFtZSA9IHNlbGYuX3Jlc29sdmVfYXV0aG9y X25hbWUoYXV0aG9yX2FjY291bnQpIGlmIHNlbGYuX2FjY291bnRfbmFtZV9zY3JpcHRfcGF0aCBl bHNlIE5vbmUKKyAgICAgICAgbmFtZSA9IHNlbGYuX3Jlc29sdmVfYXV0aG9yX25hbWUoYXV0aG9y X2FjY291bnQpIGlmIGF1dGhvcl9hY2NvdW50IGFuZCBzZWxmLl9hY2NvdW50X25hbWVfc2NyaXB0 X3BhdGggZWxzZSBOb25lCiAKLSAgICAgICAgcmV0dXJuIHsKKyAgICAgICAgcmVzdWx0ID0gewog ICAgICAgICAgICAgJ3JlcG9zaXRvcnknOiBzZWxmLl9uYW1lLAogICAgICAgICAgICAgJ3Jldmlz aW9uJzogcmV2aXNpb25fdG9fZmV0Y2gsCiAgICAgICAgICAgICAndGltZSc6IHRpbWUsCi0gICAg ICAgICAgICAnYXV0aG9yJzogeydhY2NvdW50JzogYXV0aG9yX2FjY291bnQsICduYW1lJzogbmFt ZX0sCiAgICAgICAgICAgICAnbWVzc2FnZSc6IG1lc3NhZ2UsCiAgICAgICAgIH0KIAorICAgICAg ICBpZiBhdXRob3JfYWNjb3VudDoKKyAgICAgICAgICAgIHJlc3VsdFsnYXV0aG9yJ10gPSB7J2Fj Y291bnQnOiBhdXRob3JfYWNjb3VudCwgJ25hbWUnOiBuYW1lfQorCisgICAgICAgIHJldHVybiBy ZXN1bHQKKwogICAgIGRlZiBfcmVzb2x2ZV9hdXRob3JfbmFtZShzZWxmLCBhY2NvdW50KToKICAg ICAgICAgdHJ5OgogICAgICAgICAgICAgb3V0cHV0ID0gc3VicHJvY2Vzcy5jaGVja19vdXRwdXQo c2VsZi5fYWNjb3VudF9uYW1lX3NjcmlwdF9wYXRoICsgW2FjY291bnRdKQpAQCAtMTc3LDcgKzE5 OSw3IEBAIGNsYXNzIEdpdFJlcG9zaXRvcnkoUmVwb3NpdG9yeSk6CiAgICAgICAgIHNlbGYuX2dp dF91cmwgPSBnaXRfdXJsCiAgICAgICAgIHNlbGYuX3Rva2VuaXplZF9oYXNoZXMgPSBbXQogCi0g ICAgZGVmIGZldGNoX2NvbW1pdChzZWxmLCBzZXJ2ZXJfY29uZmlnLCBsYXN0X2ZldGNoZWQpOgor ICAgIGRlZiBmZXRjaF9uZXh0X2NvbW1pdChzZWxmLCBzZXJ2ZXJfY29uZmlnLCBsYXN0X2ZldGNo ZWQpOgogICAgICAgICBpZiBub3QgbGFzdF9mZXRjaGVkOgogICAgICAgICAgICAgc2VsZi5fZmV0 Y2hfYWxsX2hhc2hlcygpCiAgICAgICAgICAgICB0b2tlbnMgPSBzZWxmLl90b2tlbml6ZWRfaGFz aGVzWzBdCkBAIC0xODgsNyArMjEwLDE2IEBAIGNsYXNzIEdpdFJlcG9zaXRvcnkoUmVwb3NpdG9y eSk6CiAgICAgICAgICAgICAgICAgdG9rZW5zID0gc2VsZi5fZmluZF9uZXh0X2hhc2gobGFzdF9m ZXRjaGVkKQogICAgICAgICAgICAgICAgIGlmIG5vdCB0b2tlbnM6CiAgICAgICAgICAgICAgICAg ICAgIHJldHVybiBOb25lCisgICAgICAgIHJldHVybiBzZWxmLl9yZXZpc2lvbl9mcm9tX3Rva2Vu cyh0b2tlbnMpCisKKyAgICBkZWYgZmV0Y2hfY29tbWl0KHNlbGYsIHNlcnZlcl9jb25maWcsIGhh c2hfdG9fZmluZCk6CisgICAgICAgIGFzc2VydChzZWxmLl90b2tlbml6ZWRfaGFzaGVzKQorICAg ICAgICBmb3IgaSwgdG9rZW5zIGluIGVudW1lcmF0ZShzZWxmLl90b2tlbml6ZWRfaGFzaGVzKToK KyAgICAgICAgICAgIGlmIHRva2VucyBhbmQgdG9rZW5zWzBdID09IGhhc2hfdG9fZmluZDoKKyAg ICAgICAgICAgICAgICByZXR1cm4gc2VsZi5fcmV2aXNpb25fZnJvbV90b2tlbnModG9rZW5zKQor ICAgICAgICByZXR1cm4gTm9uZQogCisgICAgZGVmIF9yZXZpc2lvbl9mcm9tX3Rva2VucyhzZWxm LCB0b2tlbnMpOgogICAgICAgICBjdXJyZW50X2hhc2ggPSB0b2tlbnNbMF0KICAgICAgICAgY29t bWl0X3RpbWUgPSBpbnQodG9rZW5zWzFdKQogICAgICAgICBhdXRob3JfZW1haWwgPSB0b2tlbnNb Ml0KSW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy91dGlsLnB5Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy91dGlsLnB5CShyZXZpc2lvbiAy MTA5NTIpCisrKyBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvdXRpbC5weQkod29ya2lu ZyBjb3B5KQpAQCAtMyw3ICszLDcgQEAgaW1wb3J0IHN5cwogaW1wb3J0IHVybGxpYjIKIAogCi1k ZWYgc3VibWl0X2NvbW1pdHMoY29tbWl0cywgZGFzaGJvYXJkX3VybCwgc2xhdmVfbmFtZSwgc2xh dmVfcGFzc3dvcmQpOgorZGVmIHN1Ym1pdF9jb21taXRzKGNvbW1pdHMsIGRhc2hib2FyZF91cmws IHNsYXZlX25hbWUsIHNsYXZlX3Bhc3N3b3JkLCBzdGF0dXNfdG9fYWNjZXB0PVsnT0snXSk6CiAg ICAgdHJ5OgogICAgICAgICBwYXlsb2FkID0ganNvbi5kdW1wcyh7CiAgICAgICAgICAgICAnc2xh dmVOYW1lJzogc2xhdmVfbmFtZSwKQEAgLTIwLDggKzIwLDkgQEAgZGVmIHN1Ym1pdF9jb21taXRz KGNvbW1pdHMsIGRhc2hib2FyZF91cgogICAgICAgICBleGNlcHQgRXhjZXB0aW9uLCBlcnJvcjoK ICAgICAgICAgICAgIHJhaXNlIEV4Y2VwdGlvbihlcnJvciwgb3V0cHV0KQogCi0gICAgICAgIGlm IHJlc3VsdC5nZXQoJ3N0YXR1cycpICE9ICdPSyc6CisgICAgICAgIGlmIHJlc3VsdC5nZXQoJ3N0 YXR1cycpIG5vdCBpbiBzdGF0dXNfdG9fYWNjZXB0OgogICAgICAgICAgICAgcmFpc2UgRXhjZXB0 aW9uKHJlc3VsdCkKKyAgICAgICAgcmV0dXJuIHJlc3VsdAogICAgIGV4Y2VwdCBFeGNlcHRpb24g YXMgZXJyb3I6CiAgICAgICAgIHN5cy5leGl0KCdGYWlsZWQgdG8gc3VibWl0IGNvbW1pdHM6ICVz JyAlIHN0cihlcnJvcikpCiAK