86779 2012-05-17 15:05:34 -0700 scm.add() doesn't work properly with svn 1.7 2012-05-18 15:22:49 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 86801 1 dpranke dpranke abarth aroben eric ojan pkasting webkit.review.bot oldest_to_newest 627023 0 dpranke 2012-05-17 15:05:34 -0700 in order to determine if the directory of a file being added is already under version control, the code looks for a ".svn" in the directory alongside the file. SVN 1.7 no longer uses ".svn" in every directory, so the check fails, the code starts crawling upwards, and ends up trying to do things it shouldn't. 627033 1 abarth 2012-05-17 15:17:18 -0700 What's the right way of doing this check? We could run "svn info"... 627035 2 dpranke 2012-05-17 15:18:22 -0700 that might be it. I am attempting to repro/fix it right now (suppose I might as well assign this to me, then :). 627036 3 pkasting 2012-05-17 15:18:32 -0700 Yep, AFAIK "svn info" is the right way to go, and is backwards-compatible. Too bad it's a lot slower. However, I think it can get you to the root in one shot instead of needing to recurse. 627127 4 142586 dpranke 2012-05-17 16:46:29 -0700 Created attachment 142586 Patch 627132 5 142586 tony 2012-05-17 16:55:38 -0700 Comment on attachment 142586 Patch Could we check for .svn and if it doesn't exist, run svn info? That would optimize for the common case until svn 1.7 usage grows. 627156 6 dpranke 2012-05-17 17:40:55 -0700 (In reply to comment #5) > (From update of attachment 142586 [details]) > Could we check for .svn and if it doesn't exist, run svn info? That would optimize for the common case until svn 1.7 usage grows. Sure. It's not clear to me that 'svn info' is particularly slow - I think it's a local call - but that's a simple enough optimization. 627162 7 142595 dpranke 2012-05-17 17:45:51 -0700 Created attachment 142595 add shortcut for svn < 1.7 627218 8 dpranke 2012-05-17 19:04:27 -0700 Committed r117526: <http://trac.webkit.org/changeset/117526> 627277 9 webkit.review.bot 2012-05-17 20:10:56 -0700 Re-opened since this is blocked by 86801 627283 10 pkasting 2012-05-17 20:18:15 -0700 Rolled out ( :( ) because the Chromium Mac 10.5 layout test canaries broke. Here's a sample output: http://build.chromium.org/p/chromium.webkit/builders/Webkit%20Mac10.5/builds/11591/steps/webkit_lint/logs/stdio 627904 11 142595 rniwa 2012-05-18 12:11:19 -0700 Comment on attachment 142595 add shortcut for svn < 1.7 Clearing ? from the patch that had been landed and rolled out. 628120 12 142794 dpranke 2012-05-18 15:03:23 -0700 Created attachment 142794 Patch 628127 13 142794 eric 2012-05-18 15:07:36 -0700 Comment on attachment 142794 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=142794&action=review OK. > Tools/ChangeLog:9 > + Re-land the change in r117526 with a fix to maintain > + compatibility with SVN 1.4.4 (yay Leopard!); turns out Really? Leopard be damned, no? 628136 14 dpranke 2012-05-18 15:11:27 -0700 (In reply to comment #13) > > Tools/ChangeLog:9 > > + Re-land the change in r117526 with a fix to maintain > > + compatibility with SVN 1.4.4 (yay Leopard!); turns out > > Really? Leopard be damned, no? Chromium still has Leopard bots. 628146 15 dpranke 2012-05-18 15:21:53 -0700 Committed r117643: <http://trac.webkit.org/changeset/117643> 628147 16 ojan 2012-05-18 15:22:49 -0700 (In reply to comment #14) > (In reply to comment #13) > > > Tools/ChangeLog:9 > > > + Re-land the change in r117526 with a fix to maintain > > > + compatibility with SVN 1.4.4 (yay Leopard!); turns out > > > > Really? Leopard be damned, no? > > Chromium still has Leopard bots. Current plan is to kill them sometime this Summer. 142586 2012-05-17 16:46:29 -0700 2012-05-17 17:45:46 -0700 Patch bug-86779-20120517164628.patch text/plain 2544 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NTA3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODk5ZmVmYTljNmEwNGJkNTkwMzQ5ZDQzNmE2NGM3Yzg2 MmEyMzliNy4uNmQ2MmYzYjdmMmMxOGZiZGRjYzBlMTc3OGRlNjMxZTMwZjFiYTc1ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDEyLTA1LTE3ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIHNjbS5hZGQoKSBkb2Vzbid0IHdvcmsgcHJvcGVybHkgd2l0aCBzdm4gMS43CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Njc3OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBjb2RlIHJlbGll ZCBvbiAnLnN2bicgZGlyZWN0b3JpZXMgYmVpbmcgcHJlc2VudAorICAgICAgICBpbiBvcmRlciB0 byB0ZWxsIGlmIGEgZGlyZWN0b3J5IGhhZCBhbHJlYWR5IGJlZW4gYWRkZWQgdG8gdGhlCisgICAg ICAgIHJlcG9zaXRvcnk7IHRoaXMgaXMgbm8gbG9uZ2VyIHRydWUgaW4gU1ZOIDEuNy4KKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHk6CisgICAg ICAgIChTQ00pOgorICAgICAgICAoU0NNLmluX3dvcmtpbmdfZGlyZWN0b3J5KToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5OgorICAgICAgICAo U1ZOKToKKyAgICAgICAgKFNWTi5pbl93b3JraW5nX2RpcmVjdG9yeSk6CisKIDIwMTItMDUtMTcg IENhaW8gTWFyY2VsbyBkZSBPbGl2ZWlyYSBGaWxobyAgPGNhaW8ub2xpdmVpcmFAb3BlbmJvc3Nh Lm9yZz4KIAogICAgICAgICBbUXRdIEZpeCBNaW5pQnJvd3NlciBieSB1c2luZyBjb3JyZWN0IHN5 bnRheCBmb3IgcXJjIFVSTHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NoZWNrb3V0L3NjbS9zY20ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vc2NtLnB5CmluZGV4IGNiY2UzNjFlNTQwYzEwMjUwOGQwMWJhNTc5OGQ5OTA2 YjI1YWM2NDEuLjlmZjllNWY3N2I0NjFlNzhmYTAyNjkxYzhlZTc2MWViZDE5MDMzMjYgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weQpA QCAtMTMzLDggKzEzMyw4IEBAIGNsYXNzIFNDTToKICAgICBkZWYgX3N1YmNsYXNzX211c3RfaW1w bGVtZW50KCk6CiAgICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IoInN1YmNsYXNzZXMg bXVzdCBpbXBsZW1lbnQiKQogCi0gICAgQHN0YXRpY21ldGhvZAotICAgIGRlZiBpbl93b3JraW5n X2RpcmVjdG9yeShwYXRoKToKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgaW5fd29ya2luZ19k aXJlY3RvcnkoY2xzLCBwYXRoKToKICAgICAgICAgU0NNLl9zdWJjbGFzc19tdXN0X2ltcGxlbWVu dCgpCiAKICAgICBkZWYgZmluZF9jaGVja291dF9yb290KHBhdGgpOgpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkKaW5kZXggYWYwM2Y4ZDcw NzdhMWE0OGM0MWQxN2JkZDhhNmY0NTJiMWY4YTU4My4uMTU0ZDdlYWFjMjZjZGI4NmU3MmQxYzhh MTIzN2YyYTg2ZTZlZmNlMSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vY2hlY2tvdXQvc2NtL3N2bi5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jaGVja291dC9zY20vc3ZuLnB5CkBAIC04MiwxMCArODIsMTEgQEAgY2xhc3MgU1ZOKFNDTSwg U1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBzZWxmLl9wYXRjaF9k aXJlY3RvcmllcyA9IHBhdGNoX2RpcmVjdG9yaWVzCiAKLSAgICBAc3RhdGljbWV0aG9kCi0gICAg ZGVmIGluX3dvcmtpbmdfZGlyZWN0b3J5KHBhdGgpOgotICAgICAgICByZXR1cm4gb3MucGF0aC5p c2Rpcihvcy5wYXRoLmpvaW4ocGF0aCwgJy5zdm4nKSkKLQorICAgIEBjbGFzc21ldGhvZAorICAg IGRlZiBpbl93b3JraW5nX2RpcmVjdG9yeShjbHMsIHBhdGgpOgorICAgICAgICBzdm5faW5mb19h cmdzID0gW2Nscy5leGVjdXRhYmxlX25hbWUsICdpbmZvJywgcGF0aF0KKyAgICAgICAgZXhpdF9j b2RlID0gRXhlY3V0aXZlKCkucnVuX2NvbW1hbmQoc3ZuX2luZm9fYXJncywgcmV0dXJuX2V4aXRf Y29kZT1UcnVlKQorICAgICAgICByZXR1cm4gKGV4aXRfY29kZSA9PSAwKQogICAgIGRlZiBmaW5k X3V1aWQoc2VsZiwgcGF0aCk6CiAgICAgICAgIGlmIG5vdCBzZWxmLmluX3dvcmtpbmdfZGlyZWN0 b3J5KHBhdGgpOgogICAgICAgICAgICAgcmV0dXJuIE5vbmUK 142595 2012-05-17 17:45:51 -0700 2012-05-18 15:03:20 -0700 add shortcut for svn < 1.7 bug-86779-20120517174550.patch text/plain 2739 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NTA3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODk5ZmVmYTljNmEwNGJkNTkwMzQ5ZDQzNmE2NGM3Yzg2 MmEyMzliNy4uNmQ2MmYzYjdmMmMxOGZiZGRjYzBlMTc3OGRlNjMxZTMwZjFiYTc1ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDEyLTA1LTE3ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIHNjbS5hZGQoKSBkb2Vzbid0IHdvcmsgcHJvcGVybHkgd2l0aCBzdm4gMS43CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Njc3OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBjb2RlIHJlbGll ZCBvbiAnLnN2bicgZGlyZWN0b3JpZXMgYmVpbmcgcHJlc2VudAorICAgICAgICBpbiBvcmRlciB0 byB0ZWxsIGlmIGEgZGlyZWN0b3J5IGhhZCBhbHJlYWR5IGJlZW4gYWRkZWQgdG8gdGhlCisgICAg ICAgIHJlcG9zaXRvcnk7IHRoaXMgaXMgbm8gbG9uZ2VyIHRydWUgaW4gU1ZOIDEuNy4KKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHk6CisgICAg ICAgIChTQ00pOgorICAgICAgICAoU0NNLmluX3dvcmtpbmdfZGlyZWN0b3J5KToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5OgorICAgICAgICAo U1ZOKToKKyAgICAgICAgKFNWTi5pbl93b3JraW5nX2RpcmVjdG9yeSk6CisKIDIwMTItMDUtMTcg IENhaW8gTWFyY2VsbyBkZSBPbGl2ZWlyYSBGaWxobyAgPGNhaW8ub2xpdmVpcmFAb3BlbmJvc3Nh Lm9yZz4KIAogICAgICAgICBbUXRdIEZpeCBNaW5pQnJvd3NlciBieSB1c2luZyBjb3JyZWN0IHN5 bnRheCBmb3IgcXJjIFVSTHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL2NoZWNrb3V0L3NjbS9zY20ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vc2NtLnB5CmluZGV4IGNiY2UzNjFlNTQwYzEwMjUwOGQwMWJhNTc5OGQ5OTA2 YjI1YWM2NDEuLjlmZjllNWY3N2I0NjFlNzhmYTAyNjkxYzhlZTc2MWViZDE5MDMzMjYgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weQpA QCAtMTMzLDggKzEzMyw4IEBAIGNsYXNzIFNDTToKICAgICBkZWYgX3N1YmNsYXNzX211c3RfaW1w bGVtZW50KCk6CiAgICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IoInN1YmNsYXNzZXMg bXVzdCBpbXBsZW1lbnQiKQogCi0gICAgQHN0YXRpY21ldGhvZAotICAgIGRlZiBpbl93b3JraW5n X2RpcmVjdG9yeShwYXRoKToKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgaW5fd29ya2luZ19k aXJlY3RvcnkoY2xzLCBwYXRoKToKICAgICAgICAgU0NNLl9zdWJjbGFzc19tdXN0X2ltcGxlbWVu dCgpCiAKICAgICBkZWYgZmluZF9jaGVja291dF9yb290KHBhdGgpOgpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3N2bi5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkKaW5kZXggYWYwM2Y4ZDcw NzdhMWE0OGM0MWQxN2JkZDhhNmY0NTJiMWY4YTU4My4uNmQzYzNjMTZmOTc0MmI4OGZlOWEzODVl ZTI2NzhjYmVjMzgxOTRjMCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vY2hlY2tvdXQvc2NtL3N2bi5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jaGVja291dC9zY20vc3ZuLnB5CkBAIC04Miw5ICs4MiwxNiBAQCBjbGFzcyBTVk4oU0NNLCBT Vk5SZXBvc2l0b3J5KToKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHNlbGYuX3BhdGNoX2Rp cmVjdG9yaWVzID0gcGF0Y2hfZGlyZWN0b3JpZXMKIAotICAgIEBzdGF0aWNtZXRob2QKLSAgICBk ZWYgaW5fd29ya2luZ19kaXJlY3RvcnkocGF0aCk6Ci0gICAgICAgIHJldHVybiBvcy5wYXRoLmlz ZGlyKG9zLnBhdGguam9pbihwYXRoLCAnLnN2bicpKQorICAgIEBjbGFzc21ldGhvZAorICAgIGRl ZiBpbl93b3JraW5nX2RpcmVjdG9yeShjbHMsIHBhdGgpOgorICAgICAgICBpZiBvcy5wYXRoLmlz ZGlyKG9zLnBhdGguam9pbihwYXRoLCAnLnN2bicpKToKKyAgICAgICAgICAgICMgVGhpcyBpcyBh IGZhc3Qgc2hvcnRjdXQgZm9yIHN2biBpbmZvIHRoYXQgaXMgdXN1YWxseSBjb3JyZWN0IGZvciBT Vk4gPCAxLjcsCisgICAgICAgICAgICAjIGJ1dCBkb2Vzbid0IHdvcmsgZm9yIFNWTiA+PSAxLjcu CisgICAgICAgICAgICByZXR1cm4gVHJ1ZQorCisgICAgICAgIHN2bl9pbmZvX2FyZ3MgPSBbY2xz LmV4ZWN1dGFibGVfbmFtZSwgJ2luZm8nLCBwYXRoXQorICAgICAgICBleGl0X2NvZGUgPSBFeGVj dXRpdmUoKS5ydW5fY29tbWFuZChzdm5faW5mb19hcmdzLCByZXR1cm5fZXhpdF9jb2RlPVRydWUp CisgICAgICAgIHJldHVybiAoZXhpdF9jb2RlID09IDApCiAKICAgICBkZWYgZmluZF91dWlkKHNl bGYsIHBhdGgpOgogICAgICAgICBpZiBub3Qgc2VsZi5pbl93b3JraW5nX2RpcmVjdG9yeShwYXRo KToK 142794 2012-05-18 15:03:23 -0700 2012-05-18 15:07:36 -0700 Patch bug-86779-20120518150322.patch text/plain 2957 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NjM4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMmI3MTFiZjVmYWZjYTZiOTkzZDMwYjIwNjk5MGEwMDRm ZjE1YjQ0NC4uNDYwNzEzYjQ2MGY1ODM3MDNiMjE0NzYxYTAwNWQ5YTBiNzEwYjQ0MCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDEyLTA1LTE4ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIHNjbS5hZGQoKSBkb2Vzbid0IHdvcmsgcHJvcGVybHkgd2l0aCBzdm4gMS43CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Njc3OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlLWxhbmQgdGhlIGNo YW5nZSBpbiByMTE3NTI2IHdpdGggYSBmaXggdG8gbWFpbnRhaW4KKyAgICAgICAgY29tcGF0aWJp bGl0eSB3aXRoIFNWTiAxLjQuNCAoeWF5IExlb3BhcmQhKTsgdHVybnMgb3V0CisgICAgICAgIHRo YXQgInN2biBpbmZvIGZvbyIgd29ya3MgY29ycmVjdGx5IGluIDEuNC40IGJ1dAorICAgICAgICAi c3ZuIGluZm8iIGZyb20gdGhlIGRpcmVjdG9yeSAiZm9vIiBkb2Vzbid0IGlmIGZvbyBpcworICAg ICAgICBub3QgcGFydCBvZiBhIGNoZWNrb3V0LiBpbl93b3JraW5nX2RpcmVjdG9yeSgpIGFuZAor ICAgICAgICB2YWx1ZV9mcm9tX3N2bl9pbmZvKCkgd2VyZSB1c2luZyB0aGUgYXJndW1lbnRzIGlu Y29uc2lzdGVudGx5LAorICAgICAgICBsZWFkaW5nIHRvIHdlaXJkIGVycm9ycy4KKworICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHk6CisgICAgICAg IChTQ00pOgorICAgICAgICAoU0NNLmluX3dvcmtpbmdfZGlyZWN0b3J5KToKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5OgorICAgICAgICAoU1ZO KToKKyAgICAgICAgKFNWTi5pbl93b3JraW5nX2RpcmVjdG9yeSk6CisKIDIwMTItMDUtMTggIFRo aWFnbyBNYXJjb3MgUC4gU2FudG9zICA8dGhpYWdvLnNhbnRvc0BpbnRlbC5jb20+CiAKICAgICAg ICAgW0VGTF0gQnVpbGRib3Qgb3V0cHV0IGRvZXMgbm90IHByaW50IHJlc3VsdCBzdGF0cyBhbnlt b3JlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9z Y20vc2NtLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3Nj bS5weQppbmRleCBjYmNlMzYxZTU0MGMxMDI1MDhkMDFiYTU3OThkOTkwNmIyNWFjNjQxLi45ZmY5 ZTVmNzdiNDYxZTc4ZmEwMjY5MWM4ZWU3NjFlYmQxOTAzMzI2IDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY20ucHkKQEAgLTEzMyw4ICsxMzMs OCBAQCBjbGFzcyBTQ006CiAgICAgZGVmIF9zdWJjbGFzc19tdXN0X2ltcGxlbWVudCgpOgogICAg ICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yKCJzdWJjbGFzc2VzIG11c3QgaW1wbGVtZW50 IikKIAotICAgIEBzdGF0aWNtZXRob2QKLSAgICBkZWYgaW5fd29ya2luZ19kaXJlY3RvcnkocGF0 aCk6CisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIGluX3dvcmtpbmdfZGlyZWN0b3J5KGNscywg cGF0aCk6CiAgICAgICAgIFNDTS5fc3ViY2xhc3NfbXVzdF9pbXBsZW1lbnQoKQogCiAgICAgZGVm IGZpbmRfY2hlY2tvdXRfcm9vdChwYXRoKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zdm4ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jaGVja291dC9zY20vc3ZuLnB5CmluZGV4IGFmMDNmOGQ3MDc3YTFhNDhjNDFkMTdi ZGQ4YTZmNDUyYjFmOGE1ODMuLjZhMmUxMzE5YjdiOTQ2YTkzNDQ5ZTcyNDA0YmE4NDA1OGEyZTQz OGIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3Nj bS9zdm4ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2Nt L3N2bi5weQpAQCAtODIsOSArODIsMTYgQEAgY2xhc3MgU1ZOKFNDTSwgU1ZOUmVwb3NpdG9yeSk6 CiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBzZWxmLl9wYXRjaF9kaXJlY3RvcmllcyA9IHBh dGNoX2RpcmVjdG9yaWVzCiAKLSAgICBAc3RhdGljbWV0aG9kCi0gICAgZGVmIGluX3dvcmtpbmdf ZGlyZWN0b3J5KHBhdGgpOgotICAgICAgICByZXR1cm4gb3MucGF0aC5pc2Rpcihvcy5wYXRoLmpv aW4ocGF0aCwgJy5zdm4nKSkKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgaW5fd29ya2luZ19k aXJlY3RvcnkoY2xzLCBwYXRoKToKKyAgICAgICAgaWYgb3MucGF0aC5pc2Rpcihvcy5wYXRoLmpv aW4ocGF0aCwgJy5zdm4nKSk6CisgICAgICAgICAgICAjIFRoaXMgaXMgYSBmYXN0IHNob3J0Y3V0 IGZvciBzdm4gaW5mbyB0aGF0IGlzIHVzdWFsbHkgY29ycmVjdCBmb3IgU1ZOIDwgMS43LAorICAg ICAgICAgICAgIyBidXQgZG9lc24ndCB3b3JrIGZvciBTVk4gPj0gMS43LgorICAgICAgICAgICAg cmV0dXJuIFRydWUKKworICAgICAgICBzdm5faW5mb19hcmdzID0gW2Nscy5leGVjdXRhYmxlX25h bWUsICdpbmZvJ10KKyAgICAgICAgZXhpdF9jb2RlID0gRXhlY3V0aXZlKCkucnVuX2NvbW1hbmQo c3ZuX2luZm9fYXJncywgY3dkPXBhdGgsIHJldHVybl9leGl0X2NvZGU9VHJ1ZSkKKyAgICAgICAg cmV0dXJuIChleGl0X2NvZGUgPT0gMCkKIAogICAgIGRlZiBmaW5kX3V1aWQoc2VsZiwgcGF0aCk6 CiAgICAgICAgIGlmIG5vdCBzZWxmLmluX3dvcmtpbmdfZGlyZWN0b3J5KHBhdGgpOgo=