48075 2010-10-21 10:05:03 -0700 webkit-patch doesn't get along with renamed files 2011-08-08 11:03:20 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 tonyg abarth abarth aroben dbates eric evan gavinp jknotten kamaji mihaip simonjam tommyw tonyg wcarss webkit.review.bot oldest_to_newest 297481 0 tonyg 2010-10-21 10:05:03 -0700 https://bug-47560-attachments.webkit.org/attachment.cgi?id=71447 adds files in two different ways: # new file: WebCore/dom/IgnoreDestructiveWriteCountIncrementer.h # renamed: LayoutTests/fast/dom/HTMLScriptElement/defer-double-defer-wr\ ite-expected.txt -> LayoutTests/fast/dom/HTMLScriptElement/write-after-ignored-w\ rite-expected.txt In a git diff, both show up as "create mode" and diff as expected. However, webkit-patch pretty-diff only shows the "new file", not the "renamed". I suspect this is related to: https://bugs.webkit.org/show_bug.cgi?id=47940 297535 1 abarth 2010-10-21 11:48:12 -0700 Hum... Maybe changed_files() doesn't find them? The other approach is to remove the "run stat less often" optimization. It seems to be causing more problems than its worth. 306407 2 tonyg 2010-11-08 15:32:11 -0800 I think this bit James in https://bugs.webkit.org/show_bug.cgi?id=48919. 314398 3 gavinp 2010-11-29 07:25:45 -0800 Burned me in https://bugs.webkit.org/show_bug.cgi?id=35404 too, had to run git diff --binary manually (and of course I got it wrong the first time) 388223 4 eric 2011-04-18 19:08:21 -0700 *** Bug 49154 has been marked as a duplicate of this bug. *** 388225 5 eric 2011-04-18 19:08:30 -0700 *** Bug 57686 has been marked as a duplicate of this bug. *** 388226 6 eric 2011-04-18 19:08:50 -0700 This is a really bad bug. We need to remove the changed_files optimization if it's broken. 426102 7 tonyg 2011-06-23 05:42:18 -0700 Another victim: https://bugs.webkit.org/show_bug.cgi?id=63122 429196 8 98981 wcarss 2011-06-28 15:38:52 -0700 Created attachment 98981 Patch 429251 9 98981 abarth 2011-06-28 16:33:32 -0700 Comment on attachment 98981 Patch Is this going to cause us to lose history when we commit? I assume not since you haven't changed the commit command... 429854 10 wcarss 2011-06-29 13:54:10 -0700 (In reply to comment #9) > (From update of attachment 98981 [details]) > Is this going to cause us to lose history when we commit? I assume not since you haven't changed the commit command... I'm not sure what sort of history you mean.. On further investigation, this probably isn't a good enough fix. It will show the deletion of the previous file and the creation of the new file, but it can't highlight changes between the two the same way svn does. So, this fixes a symptom, but I think it more or less bypasses the actual problem: the script probably just isn't interpreting git's rename and copy information correctly. As far as a temporary improvement, this *does* make it so that git won't lose files / muck up rename operations, but it makes close review difficult. 429857 11 abarth 2011-06-29 13:55:43 -0700 > On further investigation, this probably isn't a good enough fix. It will show the deletion of the previous file and the creation of the new file, but it can't highlight changes between the two the same way svn does. So, this fixes a symptom, but I think it more or less bypasses the actual problem: the script probably just isn't interpreting git's rename and copy information correctly. That's how this used to work before we broke it, so that's probably a step in the right direction. 433012 12 eric 2011-07-06 14:03:42 -0700 OK. So dbates has landed his amazing "make the scm.py tests 4x faster" patch, so it should be relatively easy to unit test this bugger. Once it has a unit test, I would like evmar to sign-off on the git changes. Then it's good to go! 433013 13 98981 eric 2011-07-06 14:04:22 -0700 Comment on attachment 98981 Patch r- for lack of tests. Should be easy to do now that one can actually run the scm unit tests. try test-webkitpy --all 433061 14 98981 aroben 2011-07-06 15:01:09 -0700 Comment on attachment 98981 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98981&action=review > Tools/ChangeLog:13 > + ultimately the behaviour we want. The old file is shown deleted, > + then the new file is shown added, followed by any changes that > + occurred. Also gets rid of the problem where deleting one file This presentation will be worse for reviewing patches. I wonder if we can teach the review tool to reconstruct the rename patch? 447885 15 103214 jochen 2011-08-08 00:41:06 -0700 Created attachment 103214 Patch 447887 16 abarth 2011-08-08 00:43:19 -0700 Eric should review this patch. 447898 17 103219 jochen 2011-08-08 01:09:04 -0700 Created attachment 103219 Patch 447997 18 evan 2011-08-08 07:54:18 -0700 (git review) The patch seems to do what the review says it does, though I'm a little confused as to why your tools don't support renames. 448027 19 103219 eric 2011-08-08 09:07:51 -0700 Comment on attachment 103219 Patch Seems reasonable. Would be nice to have more testing. 448110 20 103219 webkit.review.bot 2011-08-08 11:03:14 -0700 Comment on attachment 103219 Patch Clearing flags on attachment: 103219 Committed r92609: <http://trac.webkit.org/changeset/92609> 448111 21 webkit.review.bot 2011-08-08 11:03:20 -0700 All reviewed patches have been landed. Closing bug. 98981 2011-06-28 15:38:52 -0700 2011-08-08 00:41:00 -0700 Patch bug-48075-20110628153851.patch text/plain 5280 wcarss U3VidmVyc2lvbiBSZXZpc2lvbjogODk5NTcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1N2MxMmNkOTNlODc0OWI3MWJlMzQzOWM5NTEwNWRiMjgx ZGE1MDQ5Li4yMGVmMDU2NzUyZDEyNzE5ZGNhNzU0OTc3ZGMzNzAyMWQ2ZDcxODczIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTEtMDYtMjggIFd5YXR0IENhcnNzICA8d2NhcnNzQGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICB3ZWJraXQtcGF0Y2gg ZG9lc24ndCBnZXQgYWxvbmcgd2l0aCByZW5hbWVkIGZpbGVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00ODA3NQorCisgICAgICAgIFBvc3NpYmx5IGEg Yml0IGhlYXZ5IGhhbmRlZCAtIEkgcmVtb3ZlZCBhbGwgaW5zdGFuY2VzIG9mIC1DIGFuZAorICAg ICAgICBjaGFuZ2VkIGV2ZXJ5IGluc3RhbmNlIG9mIC1NIHdpdGggJy0tbm8tcmVuYW1lcycgaW4g Z2l0LnB5LiBUaGlzCisgICAgICAgIGZvcmNlcyBnaXQgdG8gbm90IHRyeSB0byB0ZWxsIHVzIGFi b3V0IHJlbmFtZXMgYXQgYWxsLCB3aGljaCBpcworICAgICAgICB1bHRpbWF0ZWx5IHRoZSBiZWhh dmlvdXIgd2Ugd2FudC4gVGhlIG9sZCBmaWxlIGlzIHNob3duIGRlbGV0ZWQsCisgICAgICAgIHRo ZW4gdGhlIG5ldyBmaWxlIGlzIHNob3duIGFkZGVkLCBmb2xsb3dlZCBieSBhbnkgY2hhbmdlcyB0 aGF0CisgICAgICAgIG9jY3VycmVkLiBBbHNvIGdldHMgcmlkIG9mIHRoZSBwcm9ibGVtIHdoZXJl IGRlbGV0aW5nIG9uZSBmaWxlCisgICAgICAgIGFuZCBhZGRpbmcgYW5vdGhlciBmaWxlIHdoaWNo IGhhcyBzaW1pbGFyIGNvbnRlbnQgd291bGQgCisgICAgICAgIHVuZXhwZWN0ZWRseSBzaG93IHVw IGFzIGEgcmVuYW1lLCBhbmQgZmFsbCBvdXQgb2YgYSBkaWZmLgorCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weToKKwogMjAxMS0wNi0yOCAgRXJp YyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVG9ueSBD aGFuZy4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0 L3NjbS9naXQucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20v Z2l0LnB5CmluZGV4IDUzN2VjNjZkOGI2YjVhNmEwZDA4NTk1OWM1OGZlOWQxOGFkYjIwYjguLmFm NDNlYmFlMWYzMzQyNDc3N2U2YzllZjgzZDI2MTA3YmE2YjlmOGUgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQpAQCAtMTI2LDcgKzEy Niw3IEBAIGNsYXNzIEdpdChTQ00sIFNWTlJlcG9zaXRvcnkpOgogICAgICAgICByZXR1cm4gb3Mu cGF0aC5leGlzdHMob3MucGF0aC5qb2luKHNlbGYuY2hlY2tvdXRfcm9vdCwgJy5naXQvcmViYXNl LWFwcGx5JykpCiAKICAgICBkZWYgd29ya2luZ19kaXJlY3RvcnlfaXNfY2xlYW4oc2VsZik6Ci0g ICAgICAgIHJldHVybiBzZWxmLnJ1bihbJ2dpdCcsICdkaWZmJywgJ0hFQUQnLCAnLS1uYW1lLW9u bHknXSwgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCkgPT0gIiIKKyAgICAgICAgcmV0dXJuIHNlbGYu cnVuKFsnZ2l0JywgJ2RpZmYnLCAnSEVBRCcsICctLW5vLXJlbmFtZXMnLCAnLS1uYW1lLW9ubHkn XSwgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCkgPT0gIiIKIAogICAgIGRlZiBjbGVhbl93b3JraW5n X2RpcmVjdG9yeShzZWxmKToKICAgICAgICAgIyBGSVhNRTogVGhlc2Ugc2hvdWxkIHByb2JhYmx5 IHVzZSBjd2Q9c2VsZi5jaGVja291dF9yb290LgpAQCAtMTM5LDcgKzEzOSw3IEBAIGNsYXNzIEdp dChTQ00sIFNWTlJlcG9zaXRvcnkpOgogICAgIGRlZiBzdGF0dXNfY29tbWFuZChzZWxmKToKICAg ICAgICAgIyBnaXQgc3RhdHVzIHJldHVybnMgbm9uLXplcm8gd2hlbiB0aGVyZSBhcmUgY2hhbmdl cywgc28gd2UgdXNlIGdpdCBkaWZmIG5hbWUgLS1uYW1lLXN0YXR1cyBIRUFEIGluc3RlYWQuCiAg ICAgICAgICMgTm8gZmlsZSBjb250ZW50cyBwcmludGVkLCB0aHVzIHV0Zi04IGF1dG9kZWNvZGlu ZyBpbiBzZWxmLnJ1biBpcyBmaW5lLgotICAgICAgICByZXR1cm4gWyJnaXQiLCAiZGlmZiIsICIt LW5hbWUtc3RhdHVzIiwgIkhFQUQiXQorICAgICAgICByZXR1cm4gWyJnaXQiLCAiZGlmZiIsICIt LW5hbWUtc3RhdHVzIiwgIi0tbm8tcmVuYW1lcyIsICJIRUFEIl0KIAogICAgIGRlZiBfc3RhdHVz X3JlZ2V4cChzZWxmLCBleHBlY3RlZF90eXBlcyk6CiAgICAgICAgIHJldHVybiAnXig/UDxzdGF0 dXM+WyVzXSlcdCg/UDxmaWxlbmFtZT4uKykkJyAlIGV4cGVjdGVkX3R5cGVzCkBAIC0xNjgsNyAr MTY4LDcgQEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAKICAgICBkZWYgY2hhbmdl ZF9maWxlcyhzZWxmLCBnaXRfY29tbWl0PU5vbmUpOgogICAgICAgICAjIEZJWE1FOiAtLWRpZmYt ZmlsdGVyIGNvdWxkIGJlIHVzZWQgdG8gYXZvaWQgdGhlICJleHRyYWN0X2ZpbGVuYW1lcyIgc3Rl cC4KLSAgICAgICAgc3RhdHVzX2NvbW1hbmQgPSBbJ2dpdCcsICdkaWZmJywgJy1yJywgJy0tbmFt ZS1zdGF0dXMnLCAnLUMnLCAnLU0nLCAiLS1uby1leHQtZGlmZiIsICItLWZ1bGwtaW5kZXgiLCBz ZWxmLm1lcmdlX2Jhc2UoZ2l0X2NvbW1pdCldCisgICAgICAgIHN0YXR1c19jb21tYW5kID0gWydn aXQnLCAnZGlmZicsICctcicsICctLW5hbWUtc3RhdHVzJywgIi0tbm8tcmVuYW1lcyIsICItLW5v LWV4dC1kaWZmIiwgIi0tZnVsbC1pbmRleCIsIHNlbGYubWVyZ2VfYmFzZShnaXRfY29tbWl0KV0K ICAgICAgICAgIyBGSVhNRTogSSdtIG5vdCBzdXJlIHdlJ3JlIHJldHVybmluZyB0aGUgc2FtZSBz ZXQgb2YgZmlsZXMgdGhhdCBTVk4uY2hhbmdlZF9maWxlcyBpcy4KICAgICAgICAgIyBBZGRlZCAo QSksIENvcGllZCAoQyksIERlbGV0ZWQgKEQpLCBNb2RpZmllZCAoTSksIFJlbmFtZWQgKFIpCiAg ICAgICAgIHJldHVybiBzZWxmLnJ1bl9zdGF0dXNfYW5kX2V4dHJhY3RfZmlsZW5hbWVzKHN0YXR1 c19jb21tYW5kLCBzZWxmLl9zdGF0dXNfcmVnZXhwKCJBRE0iKSkKQEAgLTE5MSw3ICsxOTEsNyBA QCBjbGFzcyBHaXQoU0NNLCBTVk5SZXBvc2l0b3J5KToKICAgICBkZWYgY29uZmxpY3RlZF9maWxl cyhzZWxmKToKICAgICAgICAgIyBXZSBkbyBub3QgbmVlZCB0byBwYXNzIGRlY29kZV9vdXRwdXQg Zm9yIHRoaXMgZGlmZiBjb21tYW5kCiAgICAgICAgICMgYXMgd2UncmUgcGFzc2luZyAtLW5hbWUt c3RhdHVzIHdoaWNoIGRvZXMgbm90IG91dHB1dCBhbnkgZGF0YS4KLSAgICAgICAgc3RhdHVzX2Nv bW1hbmQgPSBbJ2dpdCcsICdkaWZmJywgJy0tbmFtZS1zdGF0dXMnLCAnLUMnLCAnLU0nLCAnLS1k aWZmLWZpbHRlcj1VJ10KKyAgICAgICAgc3RhdHVzX2NvbW1hbmQgPSBbJ2dpdCcsICdkaWZmJywg Jy0tbmFtZS1zdGF0dXMnLCAnLS1uby1yZW5hbWVzJywgJy0tZGlmZi1maWx0ZXI9VSddCiAgICAg ICAgIHJldHVybiBzZWxmLnJ1bl9zdGF0dXNfYW5kX2V4dHJhY3RfZmlsZW5hbWVzKHN0YXR1c19j b21tYW5kLCBzZWxmLl9zdGF0dXNfcmVnZXhwKCJVIikpCiAKICAgICBkZWYgYWRkZWRfZmlsZXMo c2VsZik6CkBAIC0yMjUsNyArMjI1LDcgQEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6 CiAgICAgICAgICIiIlJldHVybnMgYSBieXRlIGFycmF5IChzdHIoKSkgcmVwcmVzZW50aW5nIHRo ZSBwYXRjaCBmaWxlLgogICAgICAgICBQYXRjaCBmaWxlcyBhcmUgZWZmZWN0aXZlbHkgYmluYXJ5 IHNpbmNlIHRoZXkgbWF5IGNvbnRhaW4KICAgICAgICAgZmlsZXMgb2YgbXVsdGlwbGUgZGlmZmVy ZW50IGVuY29kaW5ncy4iIiIKLSAgICAgICAgY29tbWFuZCA9IFsnZ2l0JywgJ2RpZmYnLCAnLS1i aW5hcnknLCAiLS1uby1leHQtZGlmZiIsICItLWZ1bGwtaW5kZXgiLCAiLU0iLCBzZWxmLm1lcmdl X2Jhc2UoZ2l0X2NvbW1pdCksICItLSJdCisgICAgICAgIGNvbW1hbmQgPSBbJ2dpdCcsICdkaWZm JywgJy0tYmluYXJ5JywgIi0tbm8tZXh0LWRpZmYiLCAiLS1mdWxsLWluZGV4IiwgIi0tbm8tcmVu YW1lcyIsIHNlbGYubWVyZ2VfYmFzZShnaXRfY29tbWl0KSwgIi0tIl0KICAgICAgICAgaWYgY2hh bmdlZF9maWxlczoKICAgICAgICAgICAgIGNvbW1hbmQgKz0gY2hhbmdlZF9maWxlcwogICAgICAg ICByZXR1cm4gc2VsZi5wcmVwZW5kX3N2bl9yZXZpc2lvbihzZWxmLnJ1bihjb21tYW5kLCBkZWNv ZGVfb3V0cHV0PUZhbHNlLCBjd2Q9c2VsZi5jaGVja291dF9yb290KSkKQEAgLTI2Myw3ICsyNjMs NyBAQCBjbGFzcyBHaXQoU0NNLCBTVk5SZXBvc2l0b3J5KToKICAgICAgICAgcmV0dXJuIHNlbGYu Y3JlYXRlX3BhdGNoKGdpdF9jb21taXQpCiAKICAgICBkZWYgZGlmZl9mb3JfZmlsZShzZWxmLCBw YXRoLCBsb2c9Tm9uZSk6Ci0gICAgICAgIHJldHVybiBzZWxmLnJ1bihbJ2dpdCcsICdkaWZmJywg J0hFQUQnLCAnLS0nLCBwYXRoXSwgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCkKKyAgICAgICAgcmV0 dXJuIHNlbGYucnVuKFsnZ2l0JywgJ2RpZmYnLCAnSEVBRCcsICctLW5vLXJlbmFtZXMnLCAnLS0n LCBwYXRoXSwgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCkKIAogICAgIGRlZiBzaG93X2hlYWQoc2Vs ZiwgcGF0aCk6CiAgICAgICAgIHJldHVybiBzZWxmLnJ1bihbJ2dpdCcsICdzaG93JywgJ0hFQUQ6 JyArIHNlbGYudG9fb2JqZWN0X25hbWUocGF0aCldLCBkZWNvZGVfb3V0cHV0PUZhbHNlKQpAQCAt NDQyLDQgKzQ0Miw0IEBAIGNsYXNzIEdpdChTQ00sIFNWTlJlcG9zaXRvcnkpOgogICAgICAgICBy ZXR1cm4gQ29tbWl0TWVzc2FnZShjb21taXRfbGluZXNbZmlyc3RfbGluZV9hZnRlcl9oZWFkZXJz Ol0pCiAKICAgICBkZWYgZmlsZXNfY2hhbmdlZF9zdW1tYXJ5X2Zvcl9jb21taXQoc2VsZiwgY29t bWl0X2lkKToKLSAgICAgICAgcmV0dXJuIHNlbGYucnVuKFsnZ2l0JywgJ2RpZmYtdHJlZScsICct LXNob3J0c3RhdCcsICctLW5vLWNvbW1pdC1pZCcsIGNvbW1pdF9pZF0pCisgICAgICAgIHJldHVy biBzZWxmLnJ1bihbJ2dpdCcsICdkaWZmLXRyZWUnLCAnLS1zaG9ydHN0YXQnLCAnLS1uby1yZW5h bWVzJywgJy0tbm8tY29tbWl0LWlkJywgY29tbWl0X2lkXSkK 103214 2011-08-08 00:41:06 -0700 2011-08-08 01:08:58 -0700 Patch bug-48075-20110808094104.patch text/plain 6372 jochen U3VidmVyc2lvbiBSZXZpc2lvbjogOTI1NTQKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlODRiZDM5ZTRjYTM5OTU0ZWVjZTA3MWM2MzQyNGQ3MGU0 MDUyMjc3Li4wMDA2NjNkZmU3MjY4MmYyMDYwMGYzNjBjM2ZjMzdlY2NhZmJkODlkIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTEtMDgtMDYgIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgd2Via2l0LXBhdGNoIGRvZXNuJ3QgZ2V0IGFsb25nIHdpdGggcmVuYW1lZCBmaWxl cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDgwNzUK KworICAgICAgICBQb3NzaWJseSBhIGJpdCBoZWF2eSBoYW5kZWQgLSBJIHJlbW92ZWQgYWxsIGlu c3RhbmNlcyBvZiAtQyBhbmQKKyAgICAgICAgY2hhbmdlZCBldmVyeSBpbnN0YW5jZSBvZiAtTSB3 aXRoICctLW5vLXJlbmFtZXMnIGluIGdpdC5weS4gVGhpcworICAgICAgICBmb3JjZXMgZ2l0IHRv IG5vdCB0cnkgdG8gdGVsbCB1cyBhYm91dCByZW5hbWVzIGF0IGFsbCwgd2hpY2ggaXMKKyAgICAg ICAgdWx0aW1hdGVseSB0aGUgYmVoYXZpb3VyIHdlIHdhbnQuIFRoZSBvbGQgZmlsZSBpcyBzaG93 biBkZWxldGVkLAorICAgICAgICB0aGVuIHRoZSBuZXcgZmlsZSBpcyBzaG93biBhZGRlZCwgZm9s bG93ZWQgYnkgYW55IGNoYW5nZXMgdGhhdAorICAgICAgICBvY2N1cnJlZC4gQWxzbyBnZXRzIHJp ZCBvZiB0aGUgcHJvYmxlbSB3aGVyZSBkZWxldGluZyBvbmUgZmlsZQorICAgICAgICBhbmQgYWRk aW5nIGFub3RoZXIgZmlsZSB3aGljaCBoYXMgc2ltaWxhciBjb250ZW50IHdvdWxkCisgICAgICAg IHVuZXhwZWN0ZWRseSBzaG93IHVwIGFzIGEgcmVuYW1lLCBhbmQgZmFsbCBvdXQgb2YgYSBkaWZm LgorCisgICAgICAgIEJhc2VkIG9uIGEgcGF0Y2ggYnkgV3lhdHQgQ2Fyc3MuCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5OgorCiAyMDExLTA4LTA1ICBEaW1pdHJpIEdsYXpr b3YgIDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRml4IHVuaXQgdGVzdCBicmVh a2FnZSBieSBwbHVtYmluZyBjb252ZXJ0XzQwNF90b19Ob25lIGluIE1vY2tXZWIuCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQppbmRleCBl N2E4YTY0MWM4NzQ1MTIwMDRiYzk3ZDNiMGUwOTlkNDc5YjdjYmFhLi4xNmM2Yjk2ZmZhY2ZjZDhj NmViY2JhZWVhOWQ0MWFiNWIxNmRjNzhlIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkKQEAgLTE0NCw3ICsxNDQsNyBAQCBjbGFzcyBH aXQoU0NNLCBTVk5SZXBvc2l0b3J5KToKICAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0u ZXhpc3RzKHNlbGYuYWJzb2x1dGVfcGF0aChzZWxmLl9maWxlc3lzdGVtLmpvaW4oJy5naXQnLCAn cmViYXNlLWFwcGx5JykpKQogCiAgICAgZGVmIHdvcmtpbmdfZGlyZWN0b3J5X2lzX2NsZWFuKHNl bGYpOgotICAgICAgICByZXR1cm4gc2VsZi5ydW4oWydnaXQnLCAnZGlmZicsICdIRUFEJywgJy0t bmFtZS1vbmx5J10sIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QpID09ICIiCisgICAgICAgIHJldHVy biBzZWxmLnJ1bihbJ2dpdCcsICdkaWZmJywgJ0hFQUQnLCAnLS1uby1yZW5hbWVzJywgJy0tbmFt ZS1vbmx5J10sIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QpID09ICIiCiAKICAgICBkZWYgY2xlYW5f d29ya2luZ19kaXJlY3Rvcnkoc2VsZik6CiAgICAgICAgICMgRklYTUU6IFRoZXNlIHNob3VsZCBw cm9iYWJseSB1c2UgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdC4KQEAgLTE1Nyw3ICsxNTcsNyBAQCBj bGFzcyBHaXQoU0NNLCBTVk5SZXBvc2l0b3J5KToKICAgICBkZWYgc3RhdHVzX2NvbW1hbmQoc2Vs Zik6CiAgICAgICAgICMgZ2l0IHN0YXR1cyByZXR1cm5zIG5vbi16ZXJvIHdoZW4gdGhlcmUgYXJl IGNoYW5nZXMsIHNvIHdlIHVzZSBnaXQgZGlmZiBuYW1lIC0tbmFtZS1zdGF0dXMgSEVBRCBpbnN0 ZWFkLgogICAgICAgICAjIE5vIGZpbGUgY29udGVudHMgcHJpbnRlZCwgdGh1cyB1dGYtOCBhdXRv ZGVjb2RpbmcgaW4gc2VsZi5ydW4gaXMgZmluZS4KLSAgICAgICAgcmV0dXJuIFsiZ2l0IiwgImRp ZmYiLCAiLS1uYW1lLXN0YXR1cyIsICJIRUFEIl0KKyAgICAgICAgcmV0dXJuIFsiZ2l0IiwgImRp ZmYiLCAiLS1uYW1lLXN0YXR1cyIsICItLW5vLXJlbmFtZXMiLCAiSEVBRCJdCiAKICAgICBkZWYg X3N0YXR1c19yZWdleHAoc2VsZiwgZXhwZWN0ZWRfdHlwZXMpOgogICAgICAgICByZXR1cm4gJ14o P1A8c3RhdHVzPlslc10pXHQoP1A8ZmlsZW5hbWU+LispJCcgJSBleHBlY3RlZF90eXBlcwpAQCAt MTg2LDcgKzE4Niw3IEBAIGNsYXNzIEdpdChTQ00sIFNWTlJlcG9zaXRvcnkpOgogCiAgICAgZGVm IGNoYW5nZWRfZmlsZXMoc2VsZiwgZ2l0X2NvbW1pdD1Ob25lKToKICAgICAgICAgIyBGSVhNRTog LS1kaWZmLWZpbHRlciBjb3VsZCBiZSB1c2VkIHRvIGF2b2lkIHRoZSAiZXh0cmFjdF9maWxlbmFt ZXMiIHN0ZXAuCi0gICAgICAgIHN0YXR1c19jb21tYW5kID0gWydnaXQnLCAnZGlmZicsICctcics ICctLW5hbWUtc3RhdHVzJywgJy1DJywgJy1NJywgIi0tbm8tZXh0LWRpZmYiLCAiLS1mdWxsLWlu ZGV4Iiwgc2VsZi5tZXJnZV9iYXNlKGdpdF9jb21taXQpXQorICAgICAgICBzdGF0dXNfY29tbWFu ZCA9IFsnZ2l0JywgJ2RpZmYnLCAnLXInLCAnLS1uYW1lLXN0YXR1cycsICItLW5vLXJlbmFtZXMi LCAiLS1uby1leHQtZGlmZiIsICItLWZ1bGwtaW5kZXgiLCBzZWxmLm1lcmdlX2Jhc2UoZ2l0X2Nv bW1pdCldCiAgICAgICAgICMgRklYTUU6IEknbSBub3Qgc3VyZSB3ZSdyZSByZXR1cm5pbmcgdGhl IHNhbWUgc2V0IG9mIGZpbGVzIHRoYXQgU1ZOLmNoYW5nZWRfZmlsZXMgaXMuCiAgICAgICAgICMg QWRkZWQgKEEpLCBDb3BpZWQgKEMpLCBEZWxldGVkIChEKSwgTW9kaWZpZWQgKE0pLCBSZW5hbWVk IChSKQogICAgICAgICByZXR1cm4gc2VsZi5ydW5fc3RhdHVzX2FuZF9leHRyYWN0X2ZpbGVuYW1l cyhzdGF0dXNfY29tbWFuZCwgc2VsZi5fc3RhdHVzX3JlZ2V4cCgiQURNIikpCkBAIC0yMDksNyAr MjA5LDcgQEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgZGVmIGNvbmZsaWN0 ZWRfZmlsZXMoc2VsZik6CiAgICAgICAgICMgV2UgZG8gbm90IG5lZWQgdG8gcGFzcyBkZWNvZGVf b3V0cHV0IGZvciB0aGlzIGRpZmYgY29tbWFuZAogICAgICAgICAjIGFzIHdlJ3JlIHBhc3Npbmcg LS1uYW1lLXN0YXR1cyB3aGljaCBkb2VzIG5vdCBvdXRwdXQgYW55IGRhdGEuCi0gICAgICAgIHN0 YXR1c19jb21tYW5kID0gWydnaXQnLCAnZGlmZicsICctLW5hbWUtc3RhdHVzJywgJy1DJywgJy1N JywgJy0tZGlmZi1maWx0ZXI9VSddCisgICAgICAgIHN0YXR1c19jb21tYW5kID0gWydnaXQnLCAn ZGlmZicsICctLW5hbWUtc3RhdHVzJywgJy0tbm8tcmVuYW1lcycsICctLWRpZmYtZmlsdGVyPVUn XQogICAgICAgICByZXR1cm4gc2VsZi5ydW5fc3RhdHVzX2FuZF9leHRyYWN0X2ZpbGVuYW1lcyhz dGF0dXNfY29tbWFuZCwgc2VsZi5fc3RhdHVzX3JlZ2V4cCgiVSIpKQogCiAgICAgZGVmIGFkZGVk X2ZpbGVzKHNlbGYpOgpAQCAtMjQ0LDcgKzI0NCw3IEBAIGNsYXNzIEdpdChTQ00sIFNWTlJlcG9z aXRvcnkpOgogICAgICAgICAiIiJSZXR1cm5zIGEgYnl0ZSBhcnJheSAoc3RyKCkpIHJlcHJlc2Vu dGluZyB0aGUgcGF0Y2ggZmlsZS4KICAgICAgICAgUGF0Y2ggZmlsZXMgYXJlIGVmZmVjdGl2ZWx5 IGJpbmFyeSBzaW5jZSB0aGV5IG1heSBjb250YWluCiAgICAgICAgIGZpbGVzIG9mIG11bHRpcGxl IGRpZmZlcmVudCBlbmNvZGluZ3MuIiIiCi0gICAgICAgIGNvbW1hbmQgPSBbJ2dpdCcsICdkaWZm JywgJy0tYmluYXJ5JywgIi0tbm8tZXh0LWRpZmYiLCAiLS1mdWxsLWluZGV4IiwgIi1NIiwgc2Vs Zi5tZXJnZV9iYXNlKGdpdF9jb21taXQpLCAiLS0iXQorICAgICAgICBjb21tYW5kID0gWydnaXQn LCAnZGlmZicsICctLWJpbmFyeScsICItLW5vLWV4dC1kaWZmIiwgIi0tZnVsbC1pbmRleCIsICIt LW5vLXJlbmFtZXMiLCBzZWxmLm1lcmdlX2Jhc2UoZ2l0X2NvbW1pdCksICItLSJdCiAgICAgICAg IGlmIGNoYW5nZWRfZmlsZXM6CiAgICAgICAgICAgICBjb21tYW5kICs9IGNoYW5nZWRfZmlsZXMK ICAgICAgICAgcmV0dXJuIHNlbGYucHJlcGVuZF9zdm5fcmV2aXNpb24oc2VsZi5ydW4oY29tbWFu ZCwgZGVjb2RlX291dHB1dD1GYWxzZSwgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCkpCkBAIC0yODIs NyArMjgyLDcgQEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgIHJldHVy biBzZWxmLmNyZWF0ZV9wYXRjaChnaXRfY29tbWl0KQogCiAgICAgZGVmIGRpZmZfZm9yX2ZpbGUo c2VsZiwgcGF0aCwgbG9nPU5vbmUpOgotICAgICAgICByZXR1cm4gc2VsZi5ydW4oWydnaXQnLCAn ZGlmZicsICdIRUFEJywgJy0tJywgcGF0aF0sIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QpCisgICAg ICAgIHJldHVybiBzZWxmLnJ1bihbJ2dpdCcsICdkaWZmJywgJ0hFQUQnLCAnLS1uby1yZW5hbWVz JywgJy0tJywgcGF0aF0sIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QpCiAKICAgICBkZWYgc2hvd19o ZWFkKHNlbGYsIHBhdGgpOgogICAgICAgICByZXR1cm4gc2VsZi5ydW4oWydnaXQnLCAnc2hvdycs ICdIRUFEOicgKyBzZWxmLnRvX29iamVjdF9uYW1lKHBhdGgpXSwgZGVjb2RlX291dHB1dD1GYWxz ZSkKQEAgLTQ2Miw0ICs0NjIsNCBAQCBjbGFzcyBHaXQoU0NNLCBTVk5SZXBvc2l0b3J5KToKICAg ICAgICAgcmV0dXJuIENvbW1pdE1lc3NhZ2UoY29tbWl0X2xpbmVzW2ZpcnN0X2xpbmVfYWZ0ZXJf aGVhZGVyczpdKQogCiAgICAgZGVmIGZpbGVzX2NoYW5nZWRfc3VtbWFyeV9mb3JfY29tbWl0KHNl bGYsIGNvbW1pdF9pZCk6Ci0gICAgICAgIHJldHVybiBzZWxmLnJ1bihbJ2dpdCcsICdkaWZmLXRy ZWUnLCAnLS1zaG9ydHN0YXQnLCAnLS1uby1jb21taXQtaWQnLCBjb21taXRfaWRdKQorICAgICAg ICByZXR1cm4gc2VsZi5ydW4oWydnaXQnLCAnZGlmZi10cmVlJywgJy0tc2hvcnRzdGF0JywgJy0t bm8tcmVuYW1lcycsICctLW5vLWNvbW1pdC1pZCcsIGNvbW1pdF9pZF0pCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVz dC5weQppbmRleCA0YTA1ZGM4NWRjNzkxMzY2ZGYyN2MyZjNlMDVkNTZmYzdiMjY3YzAwLi44MjM3 MzM1MDk0YWZlYjhjZDA2OGVkZTE5NDZlODFmZmIwMzkyMDE1IDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3Qu cHkKQEAgLTk2Miw2ICs5NjIsMTggQEAgY2xhc3MgR2l0VGVzdChTQ01UZXN0KToKICAgICAgICAg IyBzZWxmLl9zaGFyZWRfdGVzdF9oZWFkX3N2bl9yZXZpc2lvbigpLgogICAgICAgICBzZWxmLmFz c2VydEVxdWFsKHNjbS5oZWFkX3N2bl9yZXZpc2lvbigpLCAnJykKIAorICAgIGRlZiB0ZXN0X3Jl bmFtZV9maWxlcyhzZWxmKToKKyAgICAgICAgb3MuY2hkaXIoc2VsZi50cmFja2luZ19naXRfY2hl Y2tvdXRfcGF0aCkKKyAgICAgICAgc2NtID0gc2VsZi50cmFja2luZ19zY20KKworICAgICAgICBy dW5fY29tbWFuZChbJ2dpdCcsICdtdicsICdmb29fZmlsZScsICdiYXJfZmlsZSddKQorICAgICAg ICBzY20uY29tbWl0X2xvY2FsbHlfd2l0aF9tZXNzYWdlKCdtZXNzYWdlJykKKworICAgICAgICBw YXRjaCA9IHNjbS5jcmVhdGVfcGF0Y2goKQorICAgICAgICBzZWxmLmFzc2VydEZhbHNlKHJlLnNl YXJjaChyJ3JlbmFtZSBmcm9tICcsIHBhdGNoKSkKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShy ZS5zZWFyY2gocidyZW5hbWUgdG8gJywgcGF0Y2gpKQorCisKIGNsYXNzIEdpdFNWTlRlc3QoU0NN VGVzdCk6CiAKICAgICBkZWYgX3NldHVwX2dpdF9jaGVja291dChzZWxmKToK 103219 2011-08-08 01:09:04 -0700 2011-08-08 11:03:14 -0700 Patch bug-48075-20110808100902.patch text/plain 6321 jochen U3VidmVyc2lvbiBSZXZpc2lvbjogOTI1NTQKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlODRiZDM5ZTRjYTM5OTU0ZWVjZTA3MWM2MzQyNGQ3MGU0 MDUyMjc3Li4wMDA2NjNkZmU3MjY4MmYyMDYwMGYzNjBjM2ZjMzdlY2NhZmJkODlkIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTEtMDgtMDYgIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgd2Via2l0LXBhdGNoIGRvZXNuJ3QgZ2V0IGFsb25nIHdpdGggcmVuYW1lZCBmaWxl cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDgwNzUK KworICAgICAgICBQb3NzaWJseSBhIGJpdCBoZWF2eSBoYW5kZWQgLSBJIHJlbW92ZWQgYWxsIGlu c3RhbmNlcyBvZiAtQyBhbmQKKyAgICAgICAgY2hhbmdlZCBldmVyeSBpbnN0YW5jZSBvZiAtTSB3 aXRoICctLW5vLXJlbmFtZXMnIGluIGdpdC5weS4gVGhpcworICAgICAgICBmb3JjZXMgZ2l0IHRv IG5vdCB0cnkgdG8gdGVsbCB1cyBhYm91dCByZW5hbWVzIGF0IGFsbCwgd2hpY2ggaXMKKyAgICAg ICAgdWx0aW1hdGVseSB0aGUgYmVoYXZpb3VyIHdlIHdhbnQuIFRoZSBvbGQgZmlsZSBpcyBzaG93 biBkZWxldGVkLAorICAgICAgICB0aGVuIHRoZSBuZXcgZmlsZSBpcyBzaG93biBhZGRlZCwgZm9s bG93ZWQgYnkgYW55IGNoYW5nZXMgdGhhdAorICAgICAgICBvY2N1cnJlZC4gQWxzbyBnZXRzIHJp ZCBvZiB0aGUgcHJvYmxlbSB3aGVyZSBkZWxldGluZyBvbmUgZmlsZQorICAgICAgICBhbmQgYWRk aW5nIGFub3RoZXIgZmlsZSB3aGljaCBoYXMgc2ltaWxhciBjb250ZW50IHdvdWxkCisgICAgICAg IHVuZXhwZWN0ZWRseSBzaG93IHVwIGFzIGEgcmVuYW1lLCBhbmQgZmFsbCBvdXQgb2YgYSBkaWZm LgorCisgICAgICAgIEJhc2VkIG9uIGEgcGF0Y2ggYnkgV3lhdHQgQ2Fyc3MuCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5OgorCiAyMDExLTA4LTA1ICBEaW1pdHJpIEdsYXpr b3YgIDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRml4IHVuaXQgdGVzdCBicmVh a2FnZSBieSBwbHVtYmluZyBjb252ZXJ0XzQwNF90b19Ob25lIGluIE1vY2tXZWIuCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQppbmRleCBl N2E4YTY0MWM4NzQ1MTIwMDRiYzk3ZDNiMGUwOTlkNDc5YjdjYmFhLi4xNmM2Yjk2ZmZhY2ZjZDhj NmViY2JhZWVhOWQ0MWFiNWIxNmRjNzhlIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkKQEAgLTE0NCw3ICsxNDQsNyBAQCBjbGFzcyBH aXQoU0NNLCBTVk5SZXBvc2l0b3J5KToKICAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0u ZXhpc3RzKHNlbGYuYWJzb2x1dGVfcGF0aChzZWxmLl9maWxlc3lzdGVtLmpvaW4oJy5naXQnLCAn cmViYXNlLWFwcGx5JykpKQogCiAgICAgZGVmIHdvcmtpbmdfZGlyZWN0b3J5X2lzX2NsZWFuKHNl bGYpOgotICAgICAgICByZXR1cm4gc2VsZi5ydW4oWydnaXQnLCAnZGlmZicsICdIRUFEJywgJy0t bmFtZS1vbmx5J10sIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QpID09ICIiCisgICAgICAgIHJldHVy biBzZWxmLnJ1bihbJ2dpdCcsICdkaWZmJywgJ0hFQUQnLCAnLS1uby1yZW5hbWVzJywgJy0tbmFt ZS1vbmx5J10sIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QpID09ICIiCiAKICAgICBkZWYgY2xlYW5f d29ya2luZ19kaXJlY3Rvcnkoc2VsZik6CiAgICAgICAgICMgRklYTUU6IFRoZXNlIHNob3VsZCBw cm9iYWJseSB1c2UgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdC4KQEAgLTE1Nyw3ICsxNTcsNyBAQCBj bGFzcyBHaXQoU0NNLCBTVk5SZXBvc2l0b3J5KToKICAgICBkZWYgc3RhdHVzX2NvbW1hbmQoc2Vs Zik6CiAgICAgICAgICMgZ2l0IHN0YXR1cyByZXR1cm5zIG5vbi16ZXJvIHdoZW4gdGhlcmUgYXJl IGNoYW5nZXMsIHNvIHdlIHVzZSBnaXQgZGlmZiBuYW1lIC0tbmFtZS1zdGF0dXMgSEVBRCBpbnN0 ZWFkLgogICAgICAgICAjIE5vIGZpbGUgY29udGVudHMgcHJpbnRlZCwgdGh1cyB1dGYtOCBhdXRv ZGVjb2RpbmcgaW4gc2VsZi5ydW4gaXMgZmluZS4KLSAgICAgICAgcmV0dXJuIFsiZ2l0IiwgImRp ZmYiLCAiLS1uYW1lLXN0YXR1cyIsICJIRUFEIl0KKyAgICAgICAgcmV0dXJuIFsiZ2l0IiwgImRp ZmYiLCAiLS1uYW1lLXN0YXR1cyIsICItLW5vLXJlbmFtZXMiLCAiSEVBRCJdCiAKICAgICBkZWYg X3N0YXR1c19yZWdleHAoc2VsZiwgZXhwZWN0ZWRfdHlwZXMpOgogICAgICAgICByZXR1cm4gJ14o P1A8c3RhdHVzPlslc10pXHQoP1A8ZmlsZW5hbWU+LispJCcgJSBleHBlY3RlZF90eXBlcwpAQCAt MTg2LDcgKzE4Niw3IEBAIGNsYXNzIEdpdChTQ00sIFNWTlJlcG9zaXRvcnkpOgogCiAgICAgZGVm IGNoYW5nZWRfZmlsZXMoc2VsZiwgZ2l0X2NvbW1pdD1Ob25lKToKICAgICAgICAgIyBGSVhNRTog LS1kaWZmLWZpbHRlciBjb3VsZCBiZSB1c2VkIHRvIGF2b2lkIHRoZSAiZXh0cmFjdF9maWxlbmFt ZXMiIHN0ZXAuCi0gICAgICAgIHN0YXR1c19jb21tYW5kID0gWydnaXQnLCAnZGlmZicsICctcics ICctLW5hbWUtc3RhdHVzJywgJy1DJywgJy1NJywgIi0tbm8tZXh0LWRpZmYiLCAiLS1mdWxsLWlu ZGV4Iiwgc2VsZi5tZXJnZV9iYXNlKGdpdF9jb21taXQpXQorICAgICAgICBzdGF0dXNfY29tbWFu ZCA9IFsnZ2l0JywgJ2RpZmYnLCAnLXInLCAnLS1uYW1lLXN0YXR1cycsICItLW5vLXJlbmFtZXMi LCAiLS1uby1leHQtZGlmZiIsICItLWZ1bGwtaW5kZXgiLCBzZWxmLm1lcmdlX2Jhc2UoZ2l0X2Nv bW1pdCldCiAgICAgICAgICMgRklYTUU6IEknbSBub3Qgc3VyZSB3ZSdyZSByZXR1cm5pbmcgdGhl IHNhbWUgc2V0IG9mIGZpbGVzIHRoYXQgU1ZOLmNoYW5nZWRfZmlsZXMgaXMuCiAgICAgICAgICMg QWRkZWQgKEEpLCBDb3BpZWQgKEMpLCBEZWxldGVkIChEKSwgTW9kaWZpZWQgKE0pLCBSZW5hbWVk IChSKQogICAgICAgICByZXR1cm4gc2VsZi5ydW5fc3RhdHVzX2FuZF9leHRyYWN0X2ZpbGVuYW1l cyhzdGF0dXNfY29tbWFuZCwgc2VsZi5fc3RhdHVzX3JlZ2V4cCgiQURNIikpCkBAIC0yMDksNyAr MjA5LDcgQEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgZGVmIGNvbmZsaWN0 ZWRfZmlsZXMoc2VsZik6CiAgICAgICAgICMgV2UgZG8gbm90IG5lZWQgdG8gcGFzcyBkZWNvZGVf b3V0cHV0IGZvciB0aGlzIGRpZmYgY29tbWFuZAogICAgICAgICAjIGFzIHdlJ3JlIHBhc3Npbmcg LS1uYW1lLXN0YXR1cyB3aGljaCBkb2VzIG5vdCBvdXRwdXQgYW55IGRhdGEuCi0gICAgICAgIHN0 YXR1c19jb21tYW5kID0gWydnaXQnLCAnZGlmZicsICctLW5hbWUtc3RhdHVzJywgJy1DJywgJy1N JywgJy0tZGlmZi1maWx0ZXI9VSddCisgICAgICAgIHN0YXR1c19jb21tYW5kID0gWydnaXQnLCAn ZGlmZicsICctLW5hbWUtc3RhdHVzJywgJy0tbm8tcmVuYW1lcycsICctLWRpZmYtZmlsdGVyPVUn XQogICAgICAgICByZXR1cm4gc2VsZi5ydW5fc3RhdHVzX2FuZF9leHRyYWN0X2ZpbGVuYW1lcyhz dGF0dXNfY29tbWFuZCwgc2VsZi5fc3RhdHVzX3JlZ2V4cCgiVSIpKQogCiAgICAgZGVmIGFkZGVk X2ZpbGVzKHNlbGYpOgpAQCAtMjQ0LDcgKzI0NCw3IEBAIGNsYXNzIEdpdChTQ00sIFNWTlJlcG9z aXRvcnkpOgogICAgICAgICAiIiJSZXR1cm5zIGEgYnl0ZSBhcnJheSAoc3RyKCkpIHJlcHJlc2Vu dGluZyB0aGUgcGF0Y2ggZmlsZS4KICAgICAgICAgUGF0Y2ggZmlsZXMgYXJlIGVmZmVjdGl2ZWx5 IGJpbmFyeSBzaW5jZSB0aGV5IG1heSBjb250YWluCiAgICAgICAgIGZpbGVzIG9mIG11bHRpcGxl IGRpZmZlcmVudCBlbmNvZGluZ3MuIiIiCi0gICAgICAgIGNvbW1hbmQgPSBbJ2dpdCcsICdkaWZm JywgJy0tYmluYXJ5JywgIi0tbm8tZXh0LWRpZmYiLCAiLS1mdWxsLWluZGV4IiwgIi1NIiwgc2Vs Zi5tZXJnZV9iYXNlKGdpdF9jb21taXQpLCAiLS0iXQorICAgICAgICBjb21tYW5kID0gWydnaXQn LCAnZGlmZicsICctLWJpbmFyeScsICItLW5vLWV4dC1kaWZmIiwgIi0tZnVsbC1pbmRleCIsICIt LW5vLXJlbmFtZXMiLCBzZWxmLm1lcmdlX2Jhc2UoZ2l0X2NvbW1pdCksICItLSJdCiAgICAgICAg IGlmIGNoYW5nZWRfZmlsZXM6CiAgICAgICAgICAgICBjb21tYW5kICs9IGNoYW5nZWRfZmlsZXMK ICAgICAgICAgcmV0dXJuIHNlbGYucHJlcGVuZF9zdm5fcmV2aXNpb24oc2VsZi5ydW4oY29tbWFu ZCwgZGVjb2RlX291dHB1dD1GYWxzZSwgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCkpCkBAIC0yODIs NyArMjgyLDcgQEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgIHJldHVy biBzZWxmLmNyZWF0ZV9wYXRjaChnaXRfY29tbWl0KQogCiAgICAgZGVmIGRpZmZfZm9yX2ZpbGUo c2VsZiwgcGF0aCwgbG9nPU5vbmUpOgotICAgICAgICByZXR1cm4gc2VsZi5ydW4oWydnaXQnLCAn ZGlmZicsICdIRUFEJywgJy0tJywgcGF0aF0sIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QpCisgICAg ICAgIHJldHVybiBzZWxmLnJ1bihbJ2dpdCcsICdkaWZmJywgJ0hFQUQnLCAnLS1uby1yZW5hbWVz JywgJy0tJywgcGF0aF0sIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QpCiAKICAgICBkZWYgc2hvd19o ZWFkKHNlbGYsIHBhdGgpOgogICAgICAgICByZXR1cm4gc2VsZi5ydW4oWydnaXQnLCAnc2hvdycs ICdIRUFEOicgKyBzZWxmLnRvX29iamVjdF9uYW1lKHBhdGgpXSwgZGVjb2RlX291dHB1dD1GYWxz ZSkKQEAgLTQ2Miw0ICs0NjIsNCBAQCBjbGFzcyBHaXQoU0NNLCBTVk5SZXBvc2l0b3J5KToKICAg ICAgICAgcmV0dXJuIENvbW1pdE1lc3NhZ2UoY29tbWl0X2xpbmVzW2ZpcnN0X2xpbmVfYWZ0ZXJf aGVhZGVyczpdKQogCiAgICAgZGVmIGZpbGVzX2NoYW5nZWRfc3VtbWFyeV9mb3JfY29tbWl0KHNl bGYsIGNvbW1pdF9pZCk6Ci0gICAgICAgIHJldHVybiBzZWxmLnJ1bihbJ2dpdCcsICdkaWZmLXRy ZWUnLCAnLS1zaG9ydHN0YXQnLCAnLS1uby1jb21taXQtaWQnLCBjb21taXRfaWRdKQorICAgICAg ICByZXR1cm4gc2VsZi5ydW4oWydnaXQnLCAnZGlmZi10cmVlJywgJy0tc2hvcnRzdGF0JywgJy0t bm8tcmVuYW1lcycsICctLW5vLWNvbW1pdC1pZCcsIGNvbW1pdF9pZF0pCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV91bml0dGVz dC5weQppbmRleCA0YTA1ZGM4NWRjNzkxMzY2ZGYyN2MyZjNlMDVkNTZmYzdiMjY3YzAwLi42M2Q2 MGI2MmIyZDY5YzI4NTAxNzc4MGUxNDM3YzBjZjVhNjU1MGRkIDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9zY21fdW5pdHRlc3Qu cHkKQEAgLTk2Miw2ICs5NjIsMTcgQEAgY2xhc3MgR2l0VGVzdChTQ01UZXN0KToKICAgICAgICAg IyBzZWxmLl9zaGFyZWRfdGVzdF9oZWFkX3N2bl9yZXZpc2lvbigpLgogICAgICAgICBzZWxmLmFz c2VydEVxdWFsKHNjbS5oZWFkX3N2bl9yZXZpc2lvbigpLCAnJykKIAorICAgIGRlZiB0ZXN0X3Jl bmFtZV9maWxlcyhzZWxmKToKKyAgICAgICAgc2NtID0gc2VsZi50cmFja2luZ19zY20KKworICAg ICAgICBydW5fY29tbWFuZChbJ2dpdCcsICdtdicsICdmb29fZmlsZScsICdiYXJfZmlsZSddKQor ICAgICAgICBzY20uY29tbWl0X2xvY2FsbHlfd2l0aF9tZXNzYWdlKCdtZXNzYWdlJykKKworICAg ICAgICBwYXRjaCA9IHNjbS5jcmVhdGVfcGF0Y2goKQorICAgICAgICBzZWxmLmFzc2VydEZhbHNl KHJlLnNlYXJjaChyJ3JlbmFtZSBmcm9tICcsIHBhdGNoKSkKKyAgICAgICAgc2VsZi5hc3NlcnRG YWxzZShyZS5zZWFyY2gocidyZW5hbWUgdG8gJywgcGF0Y2gpKQorCisKIGNsYXNzIEdpdFNWTlRl c3QoU0NNVGVzdCk6CiAKICAgICBkZWYgX3NldHVwX2dpdF9jaGVja291dChzZWxmKToK