36891 2010-03-31 10:18:59 -0700 webkitpy: Refactor two os.path.relpath() replacements to use the same method 2010-03-31 14:46:12 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 cjerdonek cjerdonek abarth cjerdonek eric hamaji oldest_to_newest 206567 0 cjerdonek 2010-03-31 10:18:59 -0700 We reimplemented os.path.relpath() twice. We should share code there. 206571 1 52185 cjerdonek 2010-03-31 10:33:18 -0700 Created attachment 52185 Proposed patch 206575 2 cjerdonek 2010-03-31 10:42:49 -0700 FYI, I added a section to this page about consequences of not using Python 2.6: http://trac.webkit.org/wiki/PythonGuidelines 206589 3 52185 eric 2010-03-31 11:04:55 -0700 Comment on attachment 52185 Proposed patch YAY! But what the heck is "opsys". Seems like a strange module name. 206591 4 eric 2010-03-31 11:05:45 -0700 Seems like we should update that page to say that our scripts require 2.5, period. 206593 5 cjerdonek 2010-03-31 11:09:26 -0700 (In reply to comment #3) > (From update of attachment 52185 [details]) > YAY! But what the heck is "opsys". Seems like a strange module name. Operating system. My preference was "os", but that presented problems for other modules in the package calling "import os". I'm open to other suggestions. 206597 6 cjerdonek 2010-03-31 11:10:49 -0700 (In reply to comment #4) > Seems like we should update that page to say that our scripts require 2.5, > period. Thanks -- yeah, I just noticed that, too. I'll change it. 206599 7 eric 2010-03-31 11:13:44 -0700 Why not just call the module relpath? 206602 8 cjerdonek 2010-03-31 11:21:47 -0700 (In reply to comment #7) > Why not just call the module relpath? I thought about that, but then figured there was going to be at least one more os-related method at some point. I suppose we can always rename the file. I'll change it to relpath. 206603 9 52185 cjerdonek 2010-03-31 11:22:09 -0700 Comment on attachment 52185 Proposed patch cq- so I can rename the file to relpath. 206607 10 eric 2010-03-31 11:29:22 -0700 Maybe a name to designate that we're expanding on missing pieces of OS, like osadditions or something like that if that would be more clear than osys/relpath? In the end it doesn't matter. Feel free to name it as you choose. :) 206732 11 cjerdonek 2010-03-31 14:46:12 -0700 Committed: http://trac.webkit.org/changeset/56870 I split the difference between os and relpath and chose ospath. 52185 2010-03-31 10:33:18 -0700 2010-03-31 11:22:09 -0700 Proposed patch _patch-36891-1.diff text/plain 14333 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBjNDQ1ZTIyLi5kZjFmOTE5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTAtMDMt MzEgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gd2Via2l0cHksIHJlZmFjdG9y ZWQgdHdvIGNhbGxzIHRvIG9zLnBhdGgucmVscGF0aCgpIHJlcGxhY2VtZW50cworICAgICAgICB0 byB1c2UgYSBjb21tb24gbWV0aG9kLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0zNjg5MQorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21t b24vbmV0L2J1Z3ppbGxhLnB5OgorICAgICAgICAgIC0gUmVwbGFjZWQgdGhlIHJlbHBhdGggaW1w bGVtZW50YXRpb24gd2l0aCBhIGNhbGwgdG8KKyAgICAgICAgICAgIHdlYmtpdHB5LmNvbW1vbi5z eXN0ZW0ub3BzeXMucmVscGF0aCgpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21t b24vc3lzdGVtL29wc3lzLnB5OiBBZGRlZC4KKyAgICAgICAgICAtIE1vdmVkIHRoZSByZWxwYXRo KCkgaW1wbGVtZW50YXRpb24gZnJvbSBzdHlsZS9tYWluLnB5LgorCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9jb21tb24vc3lzdGVtL29wc3lzX3VuaXR0ZXN0LnB5OiBBZGRlZC4KKyAgICAg ICAgICAtIE1vdmVkIHRoZSByZWxwYXRoKCkgdW5pdCB0ZXN0cyBmcm9tIHN0eWxlL21haW5fdW5p dHRlc3QucHkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL21haW4ucHk6Cisg ICAgICAgICAgLSBSZXBsYWNlZCB0aGUgcmVscGF0aCBpbXBsZW1lbnRhdGlvbiB3aXRoIGEgY2Fs bCB0bworICAgICAgICAgICAgd2Via2l0cHkuY29tbW9uLnN5c3RlbS5vcHN5cy5yZWxwYXRoKCku CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL21haW5fdW5pdHRlc3QucHk6Cisg ICAgICAgICAgLSBNb3ZlZCB0aGUgcmVscGF0aCB1bml0IHRlc3RzIHRvIG9wc3lzX3VuaXR0ZXN0 LnB5LgorCiAyMDEwLTAzLTMxICBEaWVnbyBHb256YWxleiAgPGRpZWdvLmdvbnphbGV6QG9wZW5i b3NzYS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5z ZW4uCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQv YnVnemlsbGEucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVn emlsbGEucHkKaW5kZXggNDgyYTNiZC4uNWY2OGQ5MyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxhLnB5CisrKyBiL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS5weQpAQCAtNDAsNiArNDAsNyBA QCBmcm9tIGRhdGV0aW1lIGltcG9ydCBkYXRldGltZSAjIHVzZWQgaW4gdGltZXN0YW1wKCkKIGZy b20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5kZXByZWNhdGVkX2xvZ2dpbmcgaW1wb3J0IGVycm9y LCBsb2cKIGZyb20gd2Via2l0cHkuY29tbW9uLmNvbmZpZyBpbXBvcnQgY29tbWl0dGVycwogZnJv bSB3ZWJraXRweS5jb21tb24ubmV0LmNyZWRlbnRpYWxzIGltcG9ydCBDcmVkZW50aWFscworZnJv bSB3ZWJraXRweS5jb21tb24uc3lzdGVtLm9wc3lzIGltcG9ydCByZWxwYXRoCiBmcm9tIHdlYmtp dHB5LmNvbW1vbi5zeXN0ZW0udXNlciBpbXBvcnQgVXNlcgogZnJvbSB3ZWJraXRweS50aGlyZHBh cnR5LmF1dG9pbnN0YWxsZWQgaW1wb3J0IEJyb3dzZXIKIApAQCAtMjg1LDE4ICsyODYsMTIgQEAg Y2xhc3MgQ29tbWl0dGVyVmFsaWRhdG9yKG9iamVjdCk6CiAgICAgICAgIHRvb2xzX2luZGV4ID0g Y29tcG9uZW50cy5pbmRleCgiV2ViS2l0VG9vbHMiKQogICAgICAgICByZXR1cm4gb3Muc2VwLmpv aW4oY29tcG9uZW50c1s6dG9vbHNfaW5kZXhdKQogCi0gICAgZGVmIF9yZWxwYXRoKHNlbGYsIHBh dGgsIHN0YXJ0KToKLSAgICAgICAgIyBGSVhNRTogV2hlbiB3ZSdyZSBhbGxvd2VkIHRvIHVzZSBw eXRob24gMi42IHdlIGNhbiB1c2UgdGhlIHJlYWwgb3MucGF0aC5yZWxwYXRoCi0gICAgICAgIHBh dGhfY29tcG9uZW50cyA9IG9zLnBhdGgucmVhbHBhdGgocGF0aCkuc3BsaXQob3Muc2VwKQotICAg ICAgICBzdGFydF9jb21wb25lbnRzID0gb3MucGF0aC5yZWFscGF0aChzdGFydCkuc3BsaXQob3Mu c2VwKQotICAgICAgICBpZiBwYXRoX2NvbXBvbmVudHNbbGVuKHN0YXJ0X2NvbXBvbmVudHMpIC0g MV0ubG93ZXIoKSAhPSBzdGFydF9jb21wb25lbnRzWy0xXS5sb3dlcigpOgotICAgICAgICAgICAg cmFpc2UgIlRoaXMgb3MucGF0aC5yZWxwYXRoIGhhY2sgY2FuJ3QgaGFuZGxlIHBhdGg9JXMgc3Rh cnQ9JXMiICUgKHBhdGgsIHN0YXJ0KQotICAgICAgICByZXR1cm4gb3Muc2VwLmpvaW4ocGF0aF9j b21wb25lbnRzW2xlbihzdGFydF9jb21wb25lbnRzKTpdKQotCiAgICAgZGVmIF9jb21taXR0ZXJz X3B5X3BhdGgoc2VsZik6CiAgICAgICAgICMgZXh0ZW5zaW9uIGNhbiBzb21ldGltZXMgYmUgLnB5 Yywgd2UgYWx3YXlzIHdhbnQgLnB5CiAgICAgICAgIChwYXRoLCBleHRlbnNpb24pID0gb3MucGF0 aC5zcGxpdGV4dChjb21taXR0ZXJzLl9fZmlsZV9fKQotICAgICAgICBwYXRoID0gc2VsZi5fcmVs cGF0aChwYXRoLCBzZWxmLl9jaGVja291dF9yb290KCkpCisgICAgICAgICMgRklYTUU6IFdoZW4g d2UncmUgYWxsb3dlZCB0byB1c2UgcHl0aG9uIDIuNiB3ZSBjYW4gdXNlIHRoZSByZWFsCisgICAg ICAgICMgb3MucGF0aC5yZWxwYXRoCisgICAgICAgIHBhdGggPSByZWxwYXRoKHBhdGgsIHNlbGYu X2NoZWNrb3V0X3Jvb3QoKSkKICAgICAgICAgcmV0dXJuICIuIi5qb2luKFtwYXRoLCAicHkiXSkK IAogICAgIGRlZiBfZmxhZ19wZXJtaXNzaW9uX3JlamVjdGlvbl9tZXNzYWdlKHNlbGYsIHNldHRl cl9lbWFpbCwgZmxhZ19uYW1lKToKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL3N5c3RlbS9vcHN5cy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL3N5c3RlbS9vcHN5cy5weQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwLi5hZWQ3YTNkCi0tLSAvZGV2L251bGwKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vc3lzdGVtL29wc3lzLnB5CkBAIC0wLDAgKzEsODMgQEAKKyMgQ29weXJpZ2h0 IChDKSAyMDEwIENocmlzIEplcmRvbmVrIChjamVyZG9uZWtAd2Via2l0Lm9yZykKKyMKKyMgUmVk aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3 aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucworIyBhcmUgbWV0OgorIyAxLiAgUmVkaXN0cmlidXRpb25zIG9m IHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgIG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4K KyMgMi4gIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUg YWJvdmUgY29weXJpZ2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisjICAgICBkb2N1bWVudGF0aW9uIGFu ZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorIwor IyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklC VVRPUlMgYGBBUyBJUycnIEFORAorIyBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMs IElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAorIyBXQVJSQU5USUVT IE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0Ug QVJFCisjIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENP TlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SCisjIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVO VEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwKKyMgREFNQUdFUyAoSU5D TFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09P RFMgT1IKKyMgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJ TkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIKKyMgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9G IExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwKKyMgT1Ig VE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBX QVkgT1VUIE9GIFRIRSBVU0UKKyMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9G IFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKworIiIiQ29udGFpbnMgYSBzdWJzdGl0 dXRlIGZvciBQeXRob24gMi42J3Mgb3MucGF0aC5yZWxwYXRoKCkuIiIiCisKK2ltcG9ydCBvcwor CisKKyMgVGhpcyBmdW5jdGlvbiBpcyBhIHJlcGxhY2VtZW50IGZvciBvcy5wYXRoLnJlbHBhdGgo KSwgd2hpY2ggaXMgb25seQorIyBhdmFpbGFibGUgaW4gUHl0aG9uIDIuNjoKKyMKKyMgaHR0cDov L2RvY3MucHl0aG9uLm9yZy9saWJyYXJ5L29zLnBhdGguaHRtbCNvcy5wYXRoLnJlbHBhdGgKKyMK KyMgSXQgc2hvdWxkIGJlaGF2ZSBlc3NlbnRpYWxseSB0aGUgc2FtZSBhcyBvcy5wYXRoLnJlbHBh dGgoKSwgZXhjZXB0IGZvcgorIyByZXR1cm5pbmcgTm9uZSBvbiBwYXRocyBub3QgY29udGFpbmVk IGluIGFic19zdGFydF9wYXRoLgorZGVmIHJlbHBhdGgocGF0aCwgc3RhcnRfcGF0aCwgb3NfcGF0 aF9hYnNwYXRoPU5vbmUpOgorICAgICIiIlJldHVybiBhIHBhdGggcmVsYXRpdmUgdG8gdGhlIGdp dmVuIHN0YXJ0IHBhdGgsIG9yIE5vbmUuCisKKyAgICBSZXR1cm5zIE5vbmUgaWYgdGhlIHBhdGgg aXMgbm90IGNvbnRhaW5lZCBpbiB0aGUgZGlyZWN0b3J5IHN0YXJ0X3BhdGguCisKKyAgICBBcmdz OgorICAgICAgcGF0aDogQW4gYWJzb2x1dGUgb3IgcmVsYXRpdmUgcGF0aCB0byBjb252ZXJ0IHRv IGEgcmVsYXRpdmUgcGF0aC4KKyAgICAgIHN0YXJ0X3BhdGg6IFRoZSBwYXRoIHJlbGF0aXZlIHRv IHdoaWNoIHRoZSBnaXZlbiBwYXRoIHNob3VsZCBiZQorICAgICAgICAgICAgICAgICAgY29udmVy dGVkLgorICAgICAgb3NfcGF0aF9hYnNwYXRoOiBBIHJlcGxhY2VtZW50IGZ1bmN0aW9uIGZvciB1 bml0IHRlc3RpbmcuICBUaGlzCisgICAgICAgICAgICAgICAgICAgICAgIGZ1bmN0aW9uIHNob3Vs ZCBzdHJpcCB0cmFpbGluZyBzbGFzaGVzIGp1c3QgbGlrZQorICAgICAgICAgICAgICAgICAgICAg ICBvcy5wYXRoLmFic3BhdGgoKS4gIERlZmF1bHRzIHRvIG9zLnBhdGguYWJzcGF0aC4KKworICAg ICIiIgorICAgIGlmIG9zX3BhdGhfYWJzcGF0aCBpcyBOb25lOgorICAgICAgICBvc19wYXRoX2Fi c3BhdGggPSBvcy5wYXRoLmFic3BhdGgKKworICAgICMgU2luY2Ugb3NfcGF0aF9hYnNwYXRoKCkg Y2FsbHMgb3MucGF0aC5ub3JtcGF0aCgpLS0KKyAgICAjCisgICAgIyAoc2VlIGh0dHA6Ly9kb2Nz LnB5dGhvbi5vcmcvbGlicmFyeS9vcy5wYXRoLmh0bWwjb3MucGF0aC5hYnNwYXRoICkKKyAgICAj CisgICAgIyBpdCBhbHNvIHJlbW92ZXMgdHJhaWxpbmcgc2xhc2hlcyBhbmQgY29udmVydHMgZm9y d2FyZCBhbmQgYmFja3dhcmQKKyAgICAjIHNsYXNoZXMgdG8gdGhlIHByZWZlcnJlZCBzbGFzaCBv cy5zZXAuCisgICAgc3RhcnRfcGF0aCA9IG9zX3BhdGhfYWJzcGF0aChzdGFydF9wYXRoKQorICAg IHBhdGggPSBvc19wYXRoX2Fic3BhdGgocGF0aCkKKworICAgIGlmIG5vdCBwYXRoLmxvd2VyKCku c3RhcnRzd2l0aChzdGFydF9wYXRoLmxvd2VyKCkpOgorICAgICAgICAjIFRoZW4gcGF0aCBpcyBv dXRzaWRlIHRoZSBkaXJlY3RvcnkgZ2l2ZW4gYnkgc3RhcnRfcGF0aC4KKyAgICAgICAgcmV0dXJu IE5vbmUKKworICAgIHJlbF9wYXRoID0gcGF0aFtsZW4oc3RhcnRfcGF0aCk6XQorCisgICAgaWYg bm90IHJlbF9wYXRoOgorICAgICAgICAjIFRoZW4gdGhlIHBhdGhzIGFyZSB0aGUgc2FtZS4KKyAg ICAgICAgcGFzcworICAgIGVsaWYgcmVsX3BhdGhbMF0gPT0gb3Muc2VwOgorICAgICAgICAjIEl0 IGlzIHByb2JhYmx5IHN1ZmZpY2llbnQgdG8gcmVtb3ZlIGp1c3QgdGhlIGZpcnN0IGNoYXJhY3Rl cgorICAgICAgICAjIHNpbmNlIG9zLnBhdGgubm9ybXBhdGgoKSBjb2xsYXBzZXMgc2VwYXJhdG9y cywgYnV0IHdlIHVzZQorICAgICAgICAjIGxzdHJpcCgpIGp1c3QgdG8gYmUgc3VyZS4KKyAgICAg ICAgcmVsX3BhdGggPSByZWxfcGF0aC5sc3RyaXAob3Muc2VwKQorICAgIGVsc2U6CisgICAgICAg ICMgV2UgYXJlIGluIHRoZSBjYXNlIHR5cGlmaWVkIGJ5IHRoZSBmb2xsb3dpbmcgZXhhbXBsZToK KyAgICAgICAgIworICAgICAgICAjIHN0YXJ0X3BhdGggPSAiL3RtcC9mb28iCisgICAgICAgICMg cGF0aCA9ICIvdG1wL2Zvb2JhciIKKyAgICAgICAgIyByZWxfcGF0aCA9ICJiYXIiCisgICAgICAg IHJldHVybiBOb25lCisKKyAgICByZXR1cm4gcmVsX3BhdGgKZGlmZiAtLWdpdCBhL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9vcHN5c191bml0dGVzdC5weSBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9vcHN5c191bml0dGVzdC5w eQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45YmFkNjBhCi0tLSAvZGV2L251 bGwKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL29wc3lz X3VuaXR0ZXN0LnB5CkBAIC0wLDAgKzEsNjIgQEAKKyMgQ29weXJpZ2h0IChDKSAyMDEwIENocmlz IEplcmRvbmVrIChjamVyZG9uZWtAd2Via2l0Lm9yZykKKyMKKyMgUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlm aWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0 aW9ucworIyBhcmUgbWV0OgorIyAxLiAgUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11 c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgIG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMgMi4gIFJlZGlzdHJp YnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0 CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIgaW4gdGhlCisjICAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRl cmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorIworIyBUSElTIFNPRlRXQVJF IElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycn IEFORAorIyBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVU IE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAorIyBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJ TElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFCisjIERJU0NMQUlN RUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUyBCRSBM SUFCTEUgRk9SCisjIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBF WEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwKKyMgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9U IExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IKKyMgU0VSVklD RVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJ T04pIEhPV0VWRVIKKyMgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hF VEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwKKyMgT1IgVE9SVCAoSU5DTFVESU5H IE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBV U0UKKyMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElU WSBPRiBTVUNIIERBTUFHRS4KKworIiIiVW5pdCB0ZXN0cyBmb3Igb3MucHkuIiIiCisKK2ltcG9y dCBvcworaW1wb3J0IHVuaXR0ZXN0CisKK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5vcHN5 cyBpbXBvcnQgcmVscGF0aAorCisKKyMgTWFrZSBzdXJlIHRoZSB0ZXN0cyBpbiB0aGlzIGNsYXNz IGFyZSBwbGF0Zm9ybSBpbmRlcGVuZGVudC4KK2NsYXNzIFJlbFBhdGhUZXN0KHVuaXR0ZXN0LlRl c3RDYXNlKToKKworICAgICIiIlRlc3RzIHJlbHBhdGgoKS4iIiIKKworICAgIG9zX3BhdGhfYWJz cGF0aCA9IGxhbWJkYSBzZWxmLCBwYXRoOiBwYXRoCisKKyAgICBkZWYgX3JlbF9wYXRoKHNlbGYs IHBhdGgsIGFic19zdGFydF9wYXRoKToKKyAgICAgICAgcmV0dXJuIHJlbHBhdGgocGF0aCwgYWJz X3N0YXJ0X3BhdGgsIHNlbGYub3NfcGF0aF9hYnNwYXRoKQorCisgICAgZGVmIHRlc3Rfc2FtZV9w YXRoKHNlbGYpOgorICAgICAgICByZWxfcGF0aCA9IHNlbGYuX3JlbF9wYXRoKCJXZWJLaXQiLCAi V2ViS2l0IikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocmVsX3BhdGgsICIiKQorCisgICAg ZGVmIHRlc3RfbG9uZ19yZWxfcGF0aChzZWxmKToKKyAgICAgICAgc3RhcnRfcGF0aCA9ICJXZWJL aXQiCisgICAgICAgIGV4cGVjdGVkX3JlbF9wYXRoID0gb3MucGF0aC5qb2luKCJ0ZXN0IiwgIkZv by50eHQiKQorICAgICAgICBwYXRoID0gb3MucGF0aC5qb2luKHN0YXJ0X3BhdGgsIGV4cGVjdGVk X3JlbF9wYXRoKQorCisgICAgICAgIHJlbF9wYXRoID0gc2VsZi5fcmVsX3BhdGgocGF0aCwgc3Rh cnRfcGF0aCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoZXhwZWN0ZWRfcmVsX3BhdGgsIHJl bF9wYXRoKQorCisgICAgZGVmIHRlc3Rfbm9uZV9yZWxfcGF0aChzZWxmKToKKyAgICAgICAgIiIi VGVzdCBfcmVsX3BhdGgoKSB3aXRoIE5vbmUgcmV0dXJuIHZhbHVlLiIiIgorICAgICAgICBzdGFy dF9wYXRoID0gIldlYktpdCIKKyAgICAgICAgcGF0aCA9IG9zLnBhdGguam9pbigib3RoZXJfZGly IiwgImZvby50eHQiKQorCisgICAgICAgIHJlbF9wYXRoID0gc2VsZi5fcmVsX3BhdGgocGF0aCwg c3RhcnRfcGF0aCkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHJlbF9wYXRoIGlzIE5vbmUpCisK KyAgICAgICAgcmVsX3BhdGggPSBzZWxmLl9yZWxfcGF0aCgiV2ViS2l0VG9vbHMiLCAiV2ViS2l0 IikKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHJlbF9wYXRoIGlzIE5vbmUpCmRpZmYgLS1naXQg YS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL21haW4ucHkgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL21haW4ucHkKaW5kZXggZjRjODFlMi4uNDFlM2U1MSAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9tYWluLnB5Cisr KyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvbWFpbi5weQpAQCAtMjQsNjMg KzI0LDEwIEBAIGltcG9ydCBsb2dnaW5nCiBpbXBvcnQgb3MKIGltcG9ydCBzeXMKIAorZnJvbSB3 ZWJraXRweS5jb21tb24uc3lzdGVtLm9wc3lzIGltcG9ydCByZWxwYXRoIGFzIF9yZWxwYXRoCiAK LV9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKLQotCi0jIFRoaXMgZnVuY3Rpb24g aXMgYSByZXBsYWNlbWVudCBmb3Igb3MucGF0aC5yZWxwYXRoKCksIHdoaWNoIGlzIG9ubHkKLSMg YXZhaWxhYmxlIGluIFB5dGhvbiAyLjYuICBJdCBzaG91bGQgYmVoYXZlIGVzc2VudGlhbGx5IHRo ZSBzYW1lIGFzCi0jIG9zLnBhdGgucmVscGF0aCgpLCBleGNlcHQgZm9yIHJldHVybmluZyBOb25l IG9uIHBhdGhzIG5vdCBjb250YWluZWQKLSMgaW4gYWJzX3N0YXJ0X3BhdGguCi1kZWYgX3JlbF9w YXRoKHBhdGgsIHN0YXJ0X3BhdGgsIG9zX3BhdGhfYWJzcGF0aD1Ob25lKToKLSAgICAiIiJSZXR1 cm4gYSBwYXRoIHJlbGF0aXZlIHRvIHRoZSBnaXZlbiBzdGFydCBwYXRoLCBvciBOb25lLgotCi0g ICAgUmV0dXJucyBOb25lIGlmIHRoZSBwYXRoIGlzIG5vdCBjb250YWluZWQgaW4gdGhlIGRpcmVj dG9yeSBzdGFydF9wYXRoLgotCi0gICAgQXJnczoKLSAgICAgIHBhdGg6IEFuIGFic29sdXRlIG9y IHJlbGF0aXZlIHBhdGggdG8gY29udmVydCB0byBhIHJlbGF0aXZlIHBhdGguCi0gICAgICBzdGFy dF9wYXRoOiBUaGUgcGF0aCByZWxhdGl2ZSB0byB3aGljaCB0aGUgZ2l2ZW4gcGF0aCBzaG91bGQg YmUKLSAgICAgICAgICAgICAgICAgIGNvbnZlcnRlZC4KLSAgICAgIG9zX3BhdGhfYWJzcGF0aDog QSByZXBsYWNlbWVudCBmdW5jdGlvbiBmb3IgdW5pdCB0ZXN0aW5nLiAgVGhpcwotICAgICAgICAg ICAgICAgICAgICAgICBmdW5jdGlvbiBzaG91bGQgc3RyaXAgdHJhaWxpbmcgc2xhc2hlcyBqdXN0 IGxpa2UKLSAgICAgICAgICAgICAgICAgICAgICAgb3MucGF0aC5hYnNwYXRoKCkuICBEZWZhdWx0 cyB0byBvcy5wYXRoLmFic3BhdGguCiAKLSAgICAiIiIKLSAgICBpZiBvc19wYXRoX2Fic3BhdGgg aXMgTm9uZToKLSAgICAgICAgb3NfcGF0aF9hYnNwYXRoID0gb3MucGF0aC5hYnNwYXRoCi0KLSAg ICAjIFNpbmNlIG9zX3BhdGhfYWJzcGF0aCgpIGNhbGxzIG9zLnBhdGgubm9ybXBhdGgoKS0tCi0g ICAgIwotICAgICMgKHNlZSBodHRwOi8vZG9jcy5weXRob24ub3JnL2xpYnJhcnkvb3MucGF0aC5o dG1sI29zLnBhdGguYWJzcGF0aCApCi0gICAgIwotICAgICMgaXQgYWxzbyByZW1vdmVzIHRyYWls aW5nIHNsYXNoZXMgYW5kIGNvbnZlcnRzIGZvcndhcmQgYW5kIGJhY2t3YXJkCi0gICAgIyBzbGFz aGVzIHRvIHRoZSBwcmVmZXJyZWQgc2xhc2ggb3Muc2VwLgotICAgIHN0YXJ0X3BhdGggPSBvc19w YXRoX2Fic3BhdGgoc3RhcnRfcGF0aCkKLSAgICBwYXRoID0gb3NfcGF0aF9hYnNwYXRoKHBhdGgp Ci0KLSAgICBpZiBub3QgcGF0aC5sb3dlcigpLnN0YXJ0c3dpdGgoc3RhcnRfcGF0aC5sb3dlcigp KToKLSAgICAgICAgIyBUaGVuIHBhdGggaXMgb3V0c2lkZSB0aGUgZGlyZWN0b3J5IGdpdmVuIGJ5 IHN0YXJ0X3BhdGguCi0gICAgICAgIHJldHVybiBOb25lCi0KLSAgICByZWxfcGF0aCA9IHBhdGhb bGVuKHN0YXJ0X3BhdGgpOl0KLQotICAgIGlmIG5vdCByZWxfcGF0aDoKLSAgICAgICAgIyBUaGVu IHRoZSBwYXRocyBhcmUgdGhlIHNhbWUuCi0gICAgICAgIHBhc3MKLSAgICBlbGlmIHJlbF9wYXRo WzBdID09IG9zLnNlcDoKLSAgICAgICAgIyBJdCBpcyBwcm9iYWJseSBzdWZmaWNpZW50IHRvIHJl bW92ZSBqdXN0IHRoZSBmaXJzdCBjaGFyYWN0ZXIKLSAgICAgICAgIyBzaW5jZSBvcy5wYXRoLm5v cm1wYXRoKCkgY29sbGFwc2VzIHNlcGFyYXRvcnMsIGJ1dCB3ZSB1c2UKLSAgICAgICAgIyBsc3Ry aXAoKSBqdXN0IHRvIGJlIHN1cmUuCi0gICAgICAgIHJlbF9wYXRoID0gcmVsX3BhdGgubHN0cmlw KG9zLnNlcCkKLSAgICBlbHNlOgotICAgICAgICAjIFdlIGFyZSBpbiB0aGUgY2FzZSB0eXBpZmll ZCBieSB0aGUgZm9sbG93aW5nIGV4YW1wbGU6Ci0gICAgICAgICMKLSAgICAgICAgIyBzdGFydF9w YXRoID0gIi90bXAvZm9vIgotICAgICAgICAjIHBhdGggPSAiL3RtcC9mb29iYXIiCi0gICAgICAg ICMgcmVsX3BhdGggPSAiYmFyIgotICAgICAgICByZXR1cm4gTm9uZQotCi0gICAgcmV0dXJuIHJl bF9wYXRoCitfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCiAKIAogZGVmIGNoYW5n ZV9kaXJlY3RvcnkoY2hlY2tvdXRfcm9vdCwgcGF0aHMsIG1vY2tfb3M9Tm9uZSk6CkBAIC0xNTAs NyArOTcsNyBAQCBkZWYgY2hhbmdlX2RpcmVjdG9yeShjaGVja291dF9yb290LCBwYXRocywgbW9j a19vcz1Ob25lKToKICAgICAgICAgIyB0aGUgY2hlY2tvdXQgcm9vdC4KICAgICAgICAgcmVsX3Bh dGhzID0gW10KICAgICAgICAgZm9yIHBhdGggaW4gcGF0aHM6Ci0gICAgICAgICAgICByZWxfcGF0 aCA9IF9yZWxfcGF0aChwYXRoLCBjaGVja291dF9yb290KQorICAgICAgICAgICAgcmVsX3BhdGgg PSBfcmVscGF0aChwYXRoLCBjaGVja291dF9yb290KQogICAgICAgICAgICAgaWYgcmVsX3BhdGgg aXMgTm9uZToKICAgICAgICAgICAgICAgICAjIFRoZW4gdGhlIHBhdGggaXMgbm90IGJlbG93IHRo ZSBjaGVja291dCByb290LiAgU2luY2UgYWxsCiAgICAgICAgICAgICAgICAgIyBwYXRocyBzaG91 bGQgYmUgaW50ZXJwcmV0ZWQgcmVsYXRpdmUgdG8gdGhlIHNhbWUgcm9vdCwKZGlmZiAtLWdpdCBh L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvbWFpbl91bml0dGVzdC5weSBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvbWFpbl91bml0dGVzdC5weQppbmRleCBh ZGFiODQyLi5mZTQ0OGY1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3N0eWxlL21haW5fdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9tYWluX3VuaXR0ZXN0LnB5CkBAIC0yNSw0NSArMjUsMTAgQEAKIGltcG9ydCBvcwog aW1wb3J0IHVuaXR0ZXN0CiAKLWZyb20gbWFpbiBpbXBvcnQgX3JlbF9wYXRoCiBmcm9tIG1haW4g aW1wb3J0IGNoYW5nZV9kaXJlY3RvcnkKIGZyb20gd2Via2l0cHkuc3R5bGVfcmVmZXJlbmNlcyBp bXBvcnQgTG9nVGVzdGluZwogCiAKLSMgTWFrZSBzdXJlIHRoZSB0ZXN0cyBpbiB0aGlzIGNsYXNz IGFyZSBwbGF0Zm9ybSBpbmRlcGVuZGVudC4KLWNsYXNzIFJlbFBhdGhUZXN0KHVuaXR0ZXN0LlRl c3RDYXNlKToKLQotICAgICIiIlRlc3RzIF9yZWxfcGF0aCgpLiIiIgotCi0gICAgb3NfcGF0aF9h YnNwYXRoID0gbGFtYmRhIHNlbGYsIHBhdGg6IHBhdGgKLQotICAgIGRlZiBfcmVsX3BhdGgoc2Vs ZiwgcGF0aCwgYWJzX3N0YXJ0X3BhdGgpOgotICAgICAgICByZXR1cm4gX3JlbF9wYXRoKHBhdGgs IGFic19zdGFydF9wYXRoLCBzZWxmLm9zX3BhdGhfYWJzcGF0aCkKLQotICAgIGRlZiB0ZXN0X3Nh bWVfcGF0aChzZWxmKToKLSAgICAgICAgcmVsX3BhdGggPSBzZWxmLl9yZWxfcGF0aCgiV2ViS2l0 IiwgIldlYktpdCIpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHJlbF9wYXRoLCAiIikKLQot ICAgIGRlZiB0ZXN0X2xvbmdfcmVsX3BhdGgoc2VsZik6Ci0gICAgICAgIHN0YXJ0X3BhdGggPSAi V2ViS2l0IgotICAgICAgICBleHBlY3RlZF9yZWxfcGF0aCA9IG9zLnBhdGguam9pbigidGVzdCIs ICJGb28udHh0IikKLSAgICAgICAgcGF0aCA9IG9zLnBhdGguam9pbihzdGFydF9wYXRoLCBleHBl Y3RlZF9yZWxfcGF0aCkKLQotICAgICAgICByZWxfcGF0aCA9IHNlbGYuX3JlbF9wYXRoKHBhdGgs IHN0YXJ0X3BhdGgpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKGV4cGVjdGVkX3JlbF9wYXRo LCByZWxfcGF0aCkKLQotICAgIGRlZiB0ZXN0X25vbmVfcmVsX3BhdGgoc2VsZik6Ci0gICAgICAg ICIiIlRlc3QgX3JlbF9wYXRoKCkgd2l0aCBOb25lIHJldHVybiB2YWx1ZS4iIiIKLSAgICAgICAg c3RhcnRfcGF0aCA9ICJXZWJLaXQiCi0gICAgICAgIHBhdGggPSBvcy5wYXRoLmpvaW4oIm90aGVy X2RpciIsICJmb28udHh0IikKLQotICAgICAgICByZWxfcGF0aCA9IHNlbGYuX3JlbF9wYXRoKHBh dGgsIHN0YXJ0X3BhdGgpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShyZWxfcGF0aCBpcyBOb25l KQotCi0gICAgICAgIHJlbF9wYXRoID0gc2VsZi5fcmVsX3BhdGgoIldlYktpdFRvb2xzIiwgIldl YktpdCIpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShyZWxfcGF0aCBpcyBOb25lKQotCi0KIGNs YXNzIENoYW5nZURpcmVjdG9yeVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogCiAgICAgIiIiVGVz dHMgY2hhbmdlX2RpcmVjdG9yeSgpLiIiIgo=