128388 2014-02-07 12:07:55 -0800 Make EWS retry one more time after cleaning the build directory 2014-10-10 14:46:33 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified NEW P2 Normal --- 1 aperez+ews webkit-unassigned aperez ap commit-queue glenn jamesr mrowe ossy rniwa senorblanco oldest_to_newest 977981 0 aperez+ews 2014-02-07 12:07:55 -0800 Make EWS retry one more time after cleaning the build directory 977982 1 223482 aperez+ews 2014-02-07 12:09:44 -0800 Created attachment 223482 Patch 977985 2 aperez 2014-02-07 12:16:10 -0800 This patch will help in cases where derived sources (or other files created in the build directory) are causing builds to fail and cleaning the build directory is needed. Usually in those cases we have been manually handling the situation, and making the EWS bots do that automatically would make them more resilient. This would help situations like the one mentioned in bug #128370. 977986 3 223483 aperez 2014-02-07 12:23:08 -0800 Created attachment 223483 Patch 978844 4 ossy 2014-02-10 05:42:28 -0800 I understand your intention to fix this annoying problem, but I'm not sure if it is the best fix for it. In my opinion it is too intrusive to remove the whole WebKitBuild ( including WebKitBuild/Dependencies too) always when the tree is red or an incremental build issue occur. I think a simple "tree redness" occur more often than the mentioned gtkdoc issue. And it seems it is a GTK only problem, why should we remove the WebKitBuild on every "tree redness" on every EWS? I would prefer fixing gtkdoc somehow. Until the proper fix I can accept a GTK only workaround like you proposed or a less intrusive workaround, for example removing only the WebKitBuild/.../DerivedSources directory, 978845 5 223483 ossy 2014-02-10 05:43:09 -0800 Comment on attachment 223483 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=223483&action=review > Tools/Scripts/webkitpy/tool/bot/earlywarningsystemtask.py:64 > + subprocess.call(["rm", "-rf", self._build_directory], > + stdout=None, stderr=None) Just out of curiosity: Does it work on Windows too? 978865 6 223706 aperez 2014-02-10 07:13:53 -0800 Created attachment 223706 Patch 978866 7 aperez 2014-02-10 07:15:35 -0800 (In reply to comment #5) > (From update of attachment 223483 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=223483&action=review > > > Tools/Scripts/webkitpy/tool/bot/earlywarningsystemtask.py:64 > > + subprocess.call(["rm", "-rf", self._build_directory], > > + stdout=None, stderr=None) > > Just out of curiosity: Does it work on Windows too? I have uploaded a new version of the patch which uses shutil.rmtree() from the Python standard library — that certainly works in Windows, too. 978889 8 aperez 2014-02-10 08:11:54 -0800 (In reply to comment #4) > I understand your intention to fix this annoying problem, > but I'm not sure if it is the best fix for it. > > In my opinion it is too intrusive to remove the whole WebKitBuild ( > including WebKitBuild/Dependencies too) always when the tree is red > or an incremental build issue occur. I think a simple "tree redness" > occur more often than the mentioned gtkdoc issue. And it seems it is > a GTK only problem, why should we remove the WebKitBuild on every > "tree redness" on every EWS? Note that the “webkit-build-directory” script is used to obtain the build directory, so “WebKitBuild/Debug” or “WebKitBuild/Release” can be removed, but “WebKitBuild/Dependencies” is never removed. Also, provided that I would expect EWS bots to have “ccache” installed, so in reality applying the patch is not that intrusive. > I would prefer fixing gtkdoc somehow. Until the proper fix I can accept > a GTK only workaround like you proposed or a less intrusive workaround, > for example removing only the WebKitBuild/.../DerivedSources directory, Fixing the invocation of gtk-doc is something that should also be done. Nevertheless, there can be other cases in which the EWS bots could choke and need a clean build—wiping just the derived sources may not be enough. 984921 9 ap 2014-02-26 14:49:03 -0800 I agree with Ossy, this looks like it will make EWS substantially slower for little benefit. 223482 2014-02-07 12:09:44 -0800 2014-02-07 12:25:09 -0800 Patch bug-128388-20140207221025.patch text/plain 3584 aperez+ews U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzNjIzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjQ3NzFiN2E2ODgyZjY1NmE2NDZkZmM0Nzg0OWMzY2Jm ZDJjYjM0ZC4uYjk2NjQ4MDVhZDJkYTM0MjdhMzAyNzNmYmI5NzJkOGNmOTdmNWIxZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE0LTAyLTA3ICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5j b20+CisKKyAgICAgICAgTWFrZSBFV1MgcmV0cnkgb25lIG1vcmUgdGltZSBhZnRlciBjbGVhbmlu ZyB0aGUgYnVpbGQgZGlyZWN0b3J5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjgzODgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXaGVuIGJvdGggYnVpbGRpbmcgd2l0aCB0aGUgcGF0Y2ggYmVpbmcgdHJp ZWQgYW5kIHdpdGhvdXQgaXQgZmFpbCwKKyAgICAgICAgbWFrZSBvbmUgYWRkaXRpb25hbCBzdGFy dGluZyBmcm9tIGEgY2xlYW4gYnVpbGQuIFRoZSBjdXJyZW50IGJ1aWxkCisgICAgICAgIGRpcmVj dG9yeSBpcyBjb21wbGV0ZWx5IHJlbW92ZWQsIGFuZCB0aGUgdGFzayBpcyByZXN0YXJ0ZWQuIFRv IGF2b2lkCisgICAgICAgIHRyeWluZyBpbmRlZmluaXRlbHksIHJldHJ5aW5nIGZyb20gYSBjbGVh biBzdGF0ZSBpcyBkb25lIG9ubHkgb25jZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv dG9vbC9ib3QvZWFybHl3YXJuaW5nc3lzdGVtdGFzay5weToKKyAgICAgICAgKEVhcmx5V2Fybmlu Z1N5c3RlbVRhc2suX19pbml0X18pOgorICAgICAgICBJbml0aWFsaXplIHBhdGggb2YgYnVpbGQg ZGlyZWN0b3J5IHRvIE5vbmUsIGFuZCBhZGQgYSBmbGFnIHRvCisgICAgICAgIGtub3cgd2hlbiBh IHJldHJ5LWFmdGVyLWNsZWFuaW5nIGlzIGJlaW5nIGRvbmUuCisgICAgICAgIChFYXJseVdhcm5p bmdTeXN0ZW1UYXNrLnJlbW92ZV9idWlsZF9kaXJlY3RvcnkpOgorICAgICAgICBDb21wbGV0ZWx5 IHJlbW92ZXMgdGhlIGJ1aWxkIGRpcmVjdG9yeS4gVXNlcyB3ZWJraXQtYnVpbGQtZGlyZWN0b3J5 CisgICAgICAgIHRvIGxvY2F0ZSBpdHMgcGF0aCBhbmQgcnVucyAicm0gLXJmIiBvbiBpdC4KKyAg ICAgICAgKEVhcmx5V2FybmluZ1N5c3RlbVRhc2sucnVuKToKKyAgICAgICAgUmV0cnkgYWZ0ZXIg Y2xlYW5pbmcgdGhlIGJ1aWxkIGRpcmVjdG9yeSAoaWYgbm90IGFscmVhZHkgcmV0cnlpbmcpLgor CiAyMDE0LTAyLTA3ICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgog CiAgICAgICAgIFtHVEtdIERpc2FibGUgZ3RrLWRvYyBpbiBFV1MKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvZWFybHl3YXJuaW5nc3lzdGVtdGFzay5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvZWFybHl3YXJuaW5nc3lzdGVtdGFzay5weQpp bmRleCBiNjZjZmJjOGUwMTlhNTRiNjllODBlMGI4ZGMzMmM1ZjNkZWE4MjJkLi44Y2JhZTYyZDdi YWNiNWU5MTNmNzllOTI5YmMwYmYzNTcyNzgzZWVhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvYm90L2Vhcmx5d2FybmluZ3N5c3RlbXRhc2sucHkKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9lYXJseXdhcm5pbmdzeXN0ZW10YXNrLnB5CkBAIC0z Nyw2ICszNyw4IEBAIGNsYXNzIEVhcmx5V2FybmluZ1N5c3RlbVRhc2soUGF0Y2hBbmFseXNpc1Rh c2spOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBkZWxlZ2F0ZSwgcGF0Y2gsIHNob3VsZF9ydW5f dGVzdHM9VHJ1ZSk6CiAgICAgICAgIFBhdGNoQW5hbHlzaXNUYXNrLl9faW5pdF9fKHNlbGYsIGRl bGVnYXRlLCBwYXRjaCkKICAgICAgICAgc2VsZi5fc2hvdWxkX3J1bl90ZXN0cyA9IHNob3VsZF9y dW5fdGVzdHMKKyAgICAgICAgc2VsZi5fYnVpbGRfZGlyZWN0b3J5ID0gTm9uZQorICAgICAgICBz ZWxmLl9yZXRyeWluZyA9IEZhbHNlCiAKICAgICBkZWYgdmFsaWRhdGUoc2VsZik6CiAgICAgICAg IHNlbGYuX3BhdGNoID0gc2VsZi5fZGVsZWdhdGUucmVmZXRjaF9wYXRjaChzZWxmLl9wYXRjaCkK QEAgLTQ4LDYgKzUwLDE5IEBAIGNsYXNzIEVhcmx5V2FybmluZ1N5c3RlbVRhc2soUGF0Y2hBbmFs eXNpc1Rhc2spOgogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCiAgICAgICAgIHJldHVybiBUcnVl CiAKKyAgICBkZWYgcmVtb3ZlX2J1aWxkX2RpcmVjdG9yeShzZWxmKToKKyAgICAgICAgaW1wb3J0 IHN1YnByb2Nlc3MKKyAgICAgICAgaWYgc2VsZi5fYnVpbGRfZGlyZWN0b3J5IGlzIE5vbmU6Cisg ICAgICAgICAgICBmcm9tIHdlYmtpdHB5LmNvbW1vbi53ZWJraXRfZmluZGVyIGltcG9ydCBXZWJL aXRGaW5kZXIKKyAgICAgICAgICAgIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbSBpbXBvcnQg ZmlsZXN5c3RlbQorICAgICAgICAgICAgZmluZGVyID0gV2ViS2l0RmluZGVyKGZpbGVzeXN0ZW0u RmlsZVN5c3RlbSgpKQorICAgICAgICAgICAgY29tbWFuZCA9IFsicGVybCIsCisgICAgICAgICAg ICAgICAgICAgIGZpbmRlci5wYXRoX3RvX3NjcmlwdCgid2Via2l0LWJ1aWxkLWRpcmVjdG9yeSIp LAorICAgICAgICAgICAgICAgICAgICAiLS1jb25maWd1cmF0aW9uIl0KKyAgICAgICAgICAgIHNl bGYuX2J1aWxkX2RpcmVjdG9yeSA9IHN1YnByb2Nlc3MuY2hlY2tfb3V0cHV0KGNvbW1hbmQpCisg ICAgICAgIHN1YnByb2Nlc3MuY2FsbChbInJtIiwgIi1yZiIsIHNlbGYuX2J1aWxkX2RpcmVjdG9y eV0sCisgICAgICAgICAgICAgICAgc3Rkb3V0PU5vbmUsIHN0ZGVycj1Ob25lKQorCiAgICAgZGVm IHJ1bihzZWxmKToKICAgICAgICAgaWYgbm90IHNlbGYudmFsaWRhdGUoKToKICAgICAgICAgICAg IHJldHVybiBGYWxzZQpAQCAtNTksNyArNzQsMTMgQEAgY2xhc3MgRWFybHlXYXJuaW5nU3lzdGVt VGFzayhQYXRjaEFuYWx5c2lzVGFzayk6CiAgICAgICAgICAgICByYWlzZSBVbmFibGVUb0FwcGx5 UGF0Y2goc2VsZi5fcGF0Y2gpCiAgICAgICAgIGlmIG5vdCBzZWxmLl9idWlsZCgpOgogICAgICAg ICAgICAgaWYgbm90IHNlbGYuX2J1aWxkX3dpdGhvdXRfcGF0Y2goKToKLSAgICAgICAgICAgICAg ICByZXR1cm4gRmFsc2UKKyAgICAgICAgICAgICAgICBpZiBzZWxmLl9yZXRyeWluZzoKKyAgICAg ICAgICAgICAgICAgICAgc2VsZi5fcmV0cnlpbmcgPSBGYWxzZQorICAgICAgICAgICAgICAgICAg ICByZXR1cm4gRmFsc2UKKyAgICAgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgICAg ICBzZWxmLnJlbW92ZV9idWlsZF9kaXJlY3RvcnkoKQorICAgICAgICAgICAgICAgICAgICBzZWxm Ll9yZXRyeWluZyA9IFRydWUKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHNlbGYucnVuKCkK ICAgICAgICAgICAgIHJldHVybiBzZWxmLnJlcG9ydF9mYWlsdXJlKCkKICAgICAgICAgaWYgbm90 IHNlbGYuX3Nob3VsZF9ydW5fdGVzdHM6CiAgICAgICAgICAgICByZXR1cm4gVHJ1ZQo= 223483 2014-02-07 12:23:08 -0800 2014-02-10 07:13:15 -0800 Patch bug-128388-20140207222350.patch text/plain 3634 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzNjQwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWQ5YjY5ZTA5NTRlZDFkOTkzYmVhYWRhYzdhOWFiZjZl NzEwZmYyNy4uYzM4ODc2MTIwMTJmNThkNzQ0YjE2Njc1YWUwNGE0MDIwMThiOWE0MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE0LTAyLTA3ICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5j b20+CisKKyAgICAgICAgTWFrZSBFV1MgcmV0cnkgb25lIG1vcmUgdGltZSBhZnRlciBjbGVhbmlu ZyB0aGUgYnVpbGQgZGlyZWN0b3J5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjgzODgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXaGVuIGJvdGggYnVpbGRpbmcgd2l0aCB0aGUgcGF0Y2ggYmVpbmcgdHJp ZWQgYW5kIHdpdGhvdXQgaXQgZmFpbCwKKyAgICAgICAgbWFrZSBvbmUgYWRkaXRpb25hbCBzdGFy dGluZyBmcm9tIGEgY2xlYW4gYnVpbGQuIFRoZSBjdXJyZW50IGJ1aWxkCisgICAgICAgIGRpcmVj dG9yeSBpcyBjb21wbGV0ZWx5IHJlbW92ZWQsIGFuZCB0aGUgdGFzayBpcyByZXN0YXJ0ZWQuIFRv IGF2b2lkCisgICAgICAgIHRyeWluZyBpbmRlZmluaXRlbHksIHJldHJ5aW5nIGZyb20gYSBjbGVh biBzdGF0ZSBpcyBkb25lIG9ubHkgb25jZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv dG9vbC9ib3QvZWFybHl3YXJuaW5nc3lzdGVtdGFzay5weToKKyAgICAgICAgKEVhcmx5V2Fybmlu Z1N5c3RlbVRhc2suX19pbml0X18pOgorICAgICAgICBJbml0aWFsaXplIHBhdGggb2YgYnVpbGQg ZGlyZWN0b3J5IHRvIE5vbmUsIGFuZCBhZGQgYSBmbGFnIHRvCisgICAgICAgIGtub3cgd2hlbiBh IHJldHJ5LWFmdGVyLWNsZWFuaW5nIGlzIGJlaW5nIGRvbmUuCisgICAgICAgIChFYXJseVdhcm5p bmdTeXN0ZW1UYXNrLnJlbW92ZV9idWlsZF9kaXJlY3RvcnkpOgorICAgICAgICBDb21wbGV0ZWx5 IHJlbW92ZXMgdGhlIGJ1aWxkIGRpcmVjdG9yeS4gVXNlcyB3ZWJraXQtYnVpbGQtZGlyZWN0b3J5 CisgICAgICAgIHRvIGxvY2F0ZSBpdHMgcGF0aCBhbmQgcnVucyAicm0gLXJmIiBvbiBpdC4KKyAg ICAgICAgKEVhcmx5V2FybmluZ1N5c3RlbVRhc2sucnVuKToKKyAgICAgICAgUmV0cnkgYWZ0ZXIg Y2xlYW5pbmcgdGhlIGJ1aWxkIGRpcmVjdG9yeSAoaWYgbm90IGFscmVhZHkgcmV0cnlpbmcpLgor CiAyMDE0LTAyLTA3ICBTYW11ZWwgV2hpdGUgIDxzYW11ZWxfd2hpdGVAYXBwbGUuY29tPgogCiAg ICAgICAgIEFYOiBGaW5kIGFuZCBzZWxlY3QgdGV4dCB3aXRoIHJlc3BlY3QgdG8gaW5zZXJ0aW9u IHBvaW50IHVzaW5nIGFjY2Vzc2liaWxpdHkgQVBJLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL2JvdC9lYXJseXdhcm5pbmdzeXN0ZW10YXNrLnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS90b29sL2JvdC9lYXJseXdhcm5pbmdzeXN0ZW10YXNrLnB5CmluZGV4IGI2 NmNmYmM4ZTAxOWE1NGI2OWU4MGUwYjhkYzMyYzVmM2RlYTgyMmQuLjhjYmFlNjJkN2JhY2I1ZTkx M2Y3OWU5MjliYzBiZjM1NzI3ODNlZWEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9ib3QvZWFybHl3YXJuaW5nc3lzdGVtdGFzay5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvYm90L2Vhcmx5d2FybmluZ3N5c3RlbXRhc2sucHkKQEAgLTM3LDYgKzM3 LDggQEAgY2xhc3MgRWFybHlXYXJuaW5nU3lzdGVtVGFzayhQYXRjaEFuYWx5c2lzVGFzayk6CiAg ICAgZGVmIF9faW5pdF9fKHNlbGYsIGRlbGVnYXRlLCBwYXRjaCwgc2hvdWxkX3J1bl90ZXN0cz1U cnVlKToKICAgICAgICAgUGF0Y2hBbmFseXNpc1Rhc2suX19pbml0X18oc2VsZiwgZGVsZWdhdGUs IHBhdGNoKQogICAgICAgICBzZWxmLl9zaG91bGRfcnVuX3Rlc3RzID0gc2hvdWxkX3J1bl90ZXN0 cworICAgICAgICBzZWxmLl9idWlsZF9kaXJlY3RvcnkgPSBOb25lCisgICAgICAgIHNlbGYuX3Jl dHJ5aW5nID0gRmFsc2UKIAogICAgIGRlZiB2YWxpZGF0ZShzZWxmKToKICAgICAgICAgc2VsZi5f cGF0Y2ggPSBzZWxmLl9kZWxlZ2F0ZS5yZWZldGNoX3BhdGNoKHNlbGYuX3BhdGNoKQpAQCAtNDgs NiArNTAsMTkgQEAgY2xhc3MgRWFybHlXYXJuaW5nU3lzdGVtVGFzayhQYXRjaEFuYWx5c2lzVGFz ayk6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKICAgICAgICAgcmV0dXJuIFRydWUKIAorICAg IGRlZiByZW1vdmVfYnVpbGRfZGlyZWN0b3J5KHNlbGYpOgorICAgICAgICBpbXBvcnQgc3VicHJv Y2VzcworICAgICAgICBpZiBzZWxmLl9idWlsZF9kaXJlY3RvcnkgaXMgTm9uZToKKyAgICAgICAg ICAgIGZyb20gd2Via2l0cHkuY29tbW9uLndlYmtpdF9maW5kZXIgaW1wb3J0IFdlYktpdEZpbmRl cgorICAgICAgICAgICAgZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtIGltcG9ydCBmaWxlc3lz dGVtCisgICAgICAgICAgICBmaW5kZXIgPSBXZWJLaXRGaW5kZXIoZmlsZXN5c3RlbS5GaWxlU3lz dGVtKCkpCisgICAgICAgICAgICBjb21tYW5kID0gWyJwZXJsIiwKKyAgICAgICAgICAgICAgICAg ICAgZmluZGVyLnBhdGhfdG9fc2NyaXB0KCJ3ZWJraXQtYnVpbGQtZGlyZWN0b3J5IiksCisgICAg ICAgICAgICAgICAgICAgICItLWNvbmZpZ3VyYXRpb24iXQorICAgICAgICAgICAgc2VsZi5fYnVp bGRfZGlyZWN0b3J5ID0gc3VicHJvY2Vzcy5jaGVja19vdXRwdXQoY29tbWFuZCkKKyAgICAgICAg c3VicHJvY2Vzcy5jYWxsKFsicm0iLCAiLXJmIiwgc2VsZi5fYnVpbGRfZGlyZWN0b3J5XSwKKyAg ICAgICAgICAgICAgICBzdGRvdXQ9Tm9uZSwgc3RkZXJyPU5vbmUpCisKICAgICBkZWYgcnVuKHNl bGYpOgogICAgICAgICBpZiBub3Qgc2VsZi52YWxpZGF0ZSgpOgogICAgICAgICAgICAgcmV0dXJu IEZhbHNlCkBAIC01OSw3ICs3NCwxMyBAQCBjbGFzcyBFYXJseVdhcm5pbmdTeXN0ZW1UYXNrKFBh dGNoQW5hbHlzaXNUYXNrKToKICAgICAgICAgICAgIHJhaXNlIFVuYWJsZVRvQXBwbHlQYXRjaChz ZWxmLl9wYXRjaCkKICAgICAgICAgaWYgbm90IHNlbGYuX2J1aWxkKCk6CiAgICAgICAgICAgICBp ZiBub3Qgc2VsZi5fYnVpbGRfd2l0aG91dF9wYXRjaCgpOgotICAgICAgICAgICAgICAgIHJldHVy biBGYWxzZQorICAgICAgICAgICAgICAgIGlmIHNlbGYuX3JldHJ5aW5nOgorICAgICAgICAgICAg ICAgICAgICBzZWxmLl9yZXRyeWluZyA9IEZhbHNlCisgICAgICAgICAgICAgICAgICAgIHJldHVy biBGYWxzZQorICAgICAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgICAgIHNlbGYu cmVtb3ZlX2J1aWxkX2RpcmVjdG9yeSgpCisgICAgICAgICAgICAgICAgICAgIHNlbGYuX3JldHJ5 aW5nID0gVHJ1ZQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gc2VsZi5ydW4oKQogICAgICAg ICAgICAgcmV0dXJuIHNlbGYucmVwb3J0X2ZhaWx1cmUoKQogICAgICAgICBpZiBub3Qgc2VsZi5f c2hvdWxkX3J1bl90ZXN0czoKICAgICAgICAgICAgIHJldHVybiBUcnVlCg== 223706 2014-02-10 07:13:53 -0800 2014-10-10 14:46:33 -0700 Patch bug-128388-20140210171433.patch text/plain 3536 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzNzgxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjc1ZGZjNDkwNmMyZDhmNDA1ZjFhZjRhMDM3YTY4NjZk ZWIwZDljZi4uNThiZGI2MmRmYzZiNzRjMzkwZjAwMDQzYzViY2M5ZDdiMWRkZmRlZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE0LTAyLTEwICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5j b20+CisKKyAgICAgICAgTWFrZSBFV1MgcmV0cnkgb25lIG1vcmUgdGltZSBhZnRlciBjbGVhbmlu ZyB0aGUgYnVpbGQgZGlyZWN0b3J5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjgzODgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXaGVuIGJvdGggYnVpbGRpbmcgd2l0aCB0aGUgcGF0Y2ggYmVpbmcgdHJp ZWQgYW5kIHdpdGhvdXQgaXQgZmFpbCwKKyAgICAgICAgbWFrZSBvbmUgYWRkaXRpb25hbCBzdGFy dGluZyBmcm9tIGEgY2xlYW4gYnVpbGQuIFRoZSBjdXJyZW50IGJ1aWxkCisgICAgICAgIGRpcmVj dG9yeSBpcyBjb21wbGV0ZWx5IHJlbW92ZWQsIGFuZCB0aGUgdGFzayBpcyByZXN0YXJ0ZWQuIFRv IGF2b2lkCisgICAgICAgIHRyeWluZyBpbmRlZmluaXRlbHksIHJldHJ5aW5nIGZyb20gYSBjbGVh biBzdGF0ZSBpcyBkb25lIG9ubHkgb25jZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv dG9vbC9ib3QvZWFybHl3YXJuaW5nc3lzdGVtdGFzay5weToKKyAgICAgICAgKEVhcmx5V2Fybmlu Z1N5c3RlbVRhc2suX19pbml0X18pOgorICAgICAgICBJbml0aWFsaXplIHBhdGggb2YgYnVpbGQg ZGlyZWN0b3J5IHRvIE5vbmUsIGFuZCBhZGQgYSBmbGFnIHRvCisgICAgICAgIGtub3cgd2hlbiBh IHJldHJ5LWFmdGVyLWNsZWFuaW5nIGlzIGJlaW5nIGRvbmUuCisgICAgICAgIChFYXJseVdhcm5p bmdTeXN0ZW1UYXNrLnJlbW92ZV9idWlsZF9kaXJlY3RvcnkpOgorICAgICAgICBDb21wbGV0ZWx5 IHJlbW92ZXMgdGhlIGJ1aWxkIGRpcmVjdG9yeSwgdXNpbmcgd2Via2l0LWJ1aWxkLWRpcmVjdG9y eQorICAgICAgICB0byBsb2NhdGUgaXRzIHBhdGguCisgICAgICAgIChFYXJseVdhcm5pbmdTeXN0 ZW1UYXNrLnJ1bik6CisgICAgICAgIFJldHJ5IGFmdGVyIGNsZWFuaW5nIHRoZSBidWlsZCBkaXJl Y3RvcnkgKGlmIG5vdCBhbHJlYWR5IHJldHJ5aW5nKS4KKwogMjAxNC0wMi0xMCAgQ2FybG9zIEdh cmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQWRkIEFQ SSB0byBjcmVhdGUgYSB3ZWJ2aWV3IHJlbGF0ZWQgdG8gYW5vdGhlciBvbmUKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvZWFybHl3YXJuaW5nc3lzdGVtdGFzay5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9ib3QvZWFybHl3YXJuaW5nc3lzdGVtdGFz ay5weQppbmRleCBiNjZjZmJjOGUwMTlhNTRiNjllODBlMGI4ZGMzMmM1ZjNkZWE4MjJkLi43NzVk NGQ5YmYzMzJiMjEyMzlmYzcyYTU4NWQxMjdmZjgyNGUwODQ2IDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3Rvb2wvYm90L2Vhcmx5d2FybmluZ3N5c3RlbXRhc2sucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2JvdC9lYXJseXdhcm5pbmdzeXN0ZW10YXNrLnB5 CkBAIC0zNyw2ICszNyw4IEBAIGNsYXNzIEVhcmx5V2FybmluZ1N5c3RlbVRhc2soUGF0Y2hBbmFs eXNpc1Rhc2spOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBkZWxlZ2F0ZSwgcGF0Y2gsIHNob3Vs ZF9ydW5fdGVzdHM9VHJ1ZSk6CiAgICAgICAgIFBhdGNoQW5hbHlzaXNUYXNrLl9faW5pdF9fKHNl bGYsIGRlbGVnYXRlLCBwYXRjaCkKICAgICAgICAgc2VsZi5fc2hvdWxkX3J1bl90ZXN0cyA9IHNo b3VsZF9ydW5fdGVzdHMKKyAgICAgICAgc2VsZi5fYnVpbGRfZGlyZWN0b3J5ID0gTm9uZQorICAg ICAgICBzZWxmLl9yZXRyeWluZyA9IEZhbHNlCiAKICAgICBkZWYgdmFsaWRhdGUoc2VsZik6CiAg ICAgICAgIHNlbGYuX3BhdGNoID0gc2VsZi5fZGVsZWdhdGUucmVmZXRjaF9wYXRjaChzZWxmLl9w YXRjaCkKQEAgLTQ4LDYgKzUwLDE4IEBAIGNsYXNzIEVhcmx5V2FybmluZ1N5c3RlbVRhc2soUGF0 Y2hBbmFseXNpc1Rhc2spOgogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCiAgICAgICAgIHJldHVy biBUcnVlCiAKKyAgICBkZWYgcmVtb3ZlX2J1aWxkX2RpcmVjdG9yeShzZWxmKToKKyAgICAgICAg ZnJvbSBzaHV0aWwgaW1wb3J0IHJtdHJlZQorICAgICAgICBpZiBzZWxmLl9idWlsZF9kaXJlY3Rv cnkgaXMgTm9uZToKKyAgICAgICAgICAgIGZyb20gd2Via2l0cHkuY29tbW9uLndlYmtpdF9maW5k ZXIgaW1wb3J0IFdlYktpdEZpbmRlcgorICAgICAgICAgICAgZnJvbSB3ZWJraXRweS5jb21tb24u c3lzdGVtIGltcG9ydCBmaWxlc3lzdGVtCisgICAgICAgICAgICBmcm9tIHN1YnByb2Nlc3MgaW1w b3J0IGNoZWNrX291dHB1dAorICAgICAgICAgICAgZmluZGVyID0gV2ViS2l0RmluZGVyKGZpbGVz eXN0ZW0uRmlsZVN5c3RlbSgpKQorICAgICAgICAgICAgc2VsZi5fYnVpbGRfZGlyZWN0b3J5ID0g Y2hlY2tfb3V0cHV0KFsicGVybCIsCisgICAgICAgICAgICAgICAgZmluZGVyLnBhdGhfdG9fc2Ny aXB0KCJ3ZWJraXQtYnVpbGQtZGlyZWN0b3J5IiksCisgICAgICAgICAgICAgICAgIi0tY29uZmln dXJhdGlvbiJdKQorICAgICAgICBybXRyZWUoc2VsZi5fYnVpbGRfZGlyZWN0b3J5LCBUcnVlKQor CiAgICAgZGVmIHJ1bihzZWxmKToKICAgICAgICAgaWYgbm90IHNlbGYudmFsaWRhdGUoKToKICAg ICAgICAgICAgIHJldHVybiBGYWxzZQpAQCAtNTksNyArNzMsMTMgQEAgY2xhc3MgRWFybHlXYXJu aW5nU3lzdGVtVGFzayhQYXRjaEFuYWx5c2lzVGFzayk6CiAgICAgICAgICAgICByYWlzZSBVbmFi bGVUb0FwcGx5UGF0Y2goc2VsZi5fcGF0Y2gpCiAgICAgICAgIGlmIG5vdCBzZWxmLl9idWlsZCgp OgogICAgICAgICAgICAgaWYgbm90IHNlbGYuX2J1aWxkX3dpdGhvdXRfcGF0Y2goKToKLSAgICAg ICAgICAgICAgICByZXR1cm4gRmFsc2UKKyAgICAgICAgICAgICAgICBpZiBzZWxmLl9yZXRyeWlu ZzoKKyAgICAgICAgICAgICAgICAgICAgc2VsZi5fcmV0cnlpbmcgPSBGYWxzZQorICAgICAgICAg ICAgICAgICAgICByZXR1cm4gRmFsc2UKKyAgICAgICAgICAgICAgICBlbHNlOgorICAgICAgICAg ICAgICAgICAgICBzZWxmLnJlbW92ZV9idWlsZF9kaXJlY3RvcnkoKQorICAgICAgICAgICAgICAg ICAgICBzZWxmLl9yZXRyeWluZyA9IFRydWUKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHNl bGYucnVuKCkKICAgICAgICAgICAgIHJldHVybiBzZWxmLnJlcG9ydF9mYWlsdXJlKCkKICAgICAg ICAgaWYgbm90IHNlbGYuX3Nob3VsZF9ydW5fdGVzdHM6CiAgICAgICAgICAgICByZXR1cm4gVHJ1 ZQo=