117275 2013-06-05 13:35:27 -0700 [GTK][EFL] Use function jhbuildWrapperPrefixIfNeeded to run launcher 2014-01-07 04:48:34 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Enhancement --- 0 dpino webkit-unassigned berto cgarcia mrobinson xan.lopez oldest_to_newest 897531 0 dpino 2013-06-05 13:35:27 -0700 The code that runs the jhbuild-wrapper in './Tools/Scripts/run-launcher' composes the path and parameters by itself. There's a function, jhbuildWrapperPrefixIfNeeded(), in the Webkitdirs module that does that. 897532 1 203879 dpino 2013-06-05 13:42:53 -0700 Created attachment 203879 Patch 897586 2 203879 mrobinson 2013-06-05 15:40:32 -0700 Comment on attachment 203879 Patch Nice. 897655 3 cgarcia 2013-06-05 23:51:19 -0700 *** Bug 116095 has been marked as a duplicate of this bug. *** 897663 4 203879 cgarcia 2013-06-06 00:08:03 -0700 Comment on attachment 203879 Patch This patch doesn't work when not using jhbuild, see: $ Tools/Scripts/run-launcher --gtk Starting webkit launcher. Use of uninitialized value $launcherPath in exec at Tools/Scripts/run-launcher line 87. Can't exec "": No existe el archivo o el directorio at Tools/Scripts/run-launcher line 87. Died at Tools/Scripts/run-launcher line 87. 897668 5 dpino 2013-06-06 00:35:59 -0700 OK, I think the reason is because the function jhbuildWrapperPrefixIfNeeded() tests first if the jhbuildPath exists. If not, returns an empty path. What I don't understand is that running the script using jhbuildWrapperPrefixIfNeeded() and not using it builds the same path: $ ./Tools/Scripts/run-launcher --gtk without using jhbuildWrapperPrefixIfNeeded: /home/dpino/workspace/WebKit/Tools/jhbuild/jhbuild-wrapper using jhbuildWrapperPrefixIfNeeded: /home/dpino/workspace/WebKit/Tools/jhbuild/jhbuild-wrapper I could remove the checking of "jhbuildPath exists" in jhbuildWrapperPrefixIfNeeded() but that seems wrong. 899460 6 cgarcia 2013-06-12 00:27:14 -0700 (In reply to comment #5) > OK, I think the reason is because the function jhbuildWrapperPrefixIfNeeded() tests first if the jhbuildPath exists. If not, returns an empty path. In case of empty path we need to use the launcher path directly. 899469 7 dpino 2013-06-12 01:28:04 -0700 (In reply to comment #6) > (In reply to comment #5) > > OK, I think the reason is because the function jhbuildWrapperPrefixIfNeeded() tests first if the jhbuildPath exists. If not, returns an empty path. > > In case of empty path we need to use the launcher path directly. OK, so regardless the path is empty or not, it seems the launcher path is always the same. If that's the case what I could do is to add a buildLauncherPath() method to webkitdirs.pm and make the function jhbuildWrapperPrefixIfNeeded() to use buildLauncherPath() if the path is not empty. The patch proposed will use buildLauncherPath() instead of jhbuildWrapperPrefixIfNeeded(). What do you think? 899478 8 cgarcia 2013-06-12 02:26:09 -0700 (In reply to comment #7) > (In reply to comment #6) > > (In reply to comment #5) > > > OK, I think the reason is because the function jhbuildWrapperPrefixIfNeeded() tests first if the jhbuildPath exists. If not, returns an empty path. > > > > In case of empty path we need to use the launcher path directly. > > OK, so regardless the path is empty or not, it seems the launcher path is always the same. If that's the case what I could do is to add a buildLauncherPath() method to webkitdirs.pm and make the function jhbuildWrapperPrefixIfNeeded() to use buildLauncherPath() if the path is not empty. The patch proposed will use buildLauncherPath() instead of jhbuildWrapperPrefixIfNeeded(). > > What do you think? I don't think so, jhbuildWrapperPrefixIfNeeded() return the jhbuild prefix if needed. So we need to build the launcher path, Programs/GtkLauncher, for example, and if there's a jhbuild prefix, prepend it so what you run in the end is jhbuild run Programs/GtkLauncher and if there's not jhbuild prefix you run Programs/GtkLauncher directly. 964955 9 220510 berto 2014-01-07 04:20:45 -0800 Created attachment 220510 Patch (In reply to comment #5) > OK, I think the reason is because the function > jhbuildWrapperPrefixIfNeeded() tests first if the jhbuildPath > exists. If not, returns an empty path. That function returns an empty list, so when do you ($launcherPath, my @args) = jhbuildWrapperPrefixIfNeeded(); you're turning $launcherPath into an undefined variable, which you then are trying to exec. I reworked the script a bit, now there's a scalar variable for the launcher command, an array for the jhbuild wrapper and its options and @ARGV, with the command-line parameters set by the user, which I decided to leave untouched. Hope it's a bit clearer now. 964956 10 220511 berto 2014-01-07 04:30:03 -0800 Created attachment 220511 Patch There was actually a duplicate variable in that script, I updated the patch to remove it as well. 964957 11 220512 berto 2014-01-07 04:31:13 -0800 Created attachment 220512 Patch Today is not my day. This is the correct one. 964960 12 220512 cgarcia 2014-01-07 04:37:16 -0800 Comment on attachment 220512 Patch Thank you very much! 964962 13 berto 2014-01-07 04:48:34 -0800 Committed r161419: <http://trac.webkit.org/changeset/161419> 203879 2013-06-05 13:42:53 -0700 2014-01-07 04:20:45 -0800 Patch bug-117275-20130605224121.patch text/plain 1680 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwOTUzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDFlOTMzOWJiN2U2NDczYzY5MjFiNzNhZTRlYWNiNDMw ZTA1NjBhNi4uNDhhODIzZTk4ZjhiMzE1YjIwNmRkNzEzZmFmNjhlYzk4ZjAwMzk4NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDEzLTA2LTA1ICBEaWVnbyBQaW5vIEdhcmPDrWEgIDxkcGlub0BpZ2FsaWEuY29tPgor CisgICAgICAgIFtHVEtdIFVzZSBmdW5jdGlvbiBqaGJ1aWxkV3JhcHBlclByZWZpeElmTmVlZGVk IHRvIHJ1biBsYXVuY2hlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTE3Mjc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBTY3JpcHRzL3J1bi1sYXVuY2hlcjogdXNlIGZ1bmN0aW9uIGpoYnVpbGRXcmFw cGVyUHJlZml4SWZOZWVkZWQoKSB0bworICAgICAgICBydW4gbGF1bmNoZXIKKwogMjAxMy0wNS0z MCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZW1vdmUgcmVx dWlyZXNfaHR0cF9zZXJ2ZXIgYXMgQ2hyb21pdW0gQW5kcm9pZCB3YXMgdGhlIG9ubHkgcG9ydCB0 aGF0IG5lZWRlZCB0aGlzCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3J1bi1sYXVuY2hlciBi L1Rvb2xzL1NjcmlwdHMvcnVuLWxhdW5jaGVyCmluZGV4IDY2ODg2ZmUwYjE5NzRiMjMxOTM4NDFk YzdjOTdlMzgxOThiODk5YzcuLjE2YzYzMTU4M2E3ZGI4NTc5YTY0MGU2OTNlMDJmYjczOGNmMWFh YzggMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvcnVuLWxhdW5jaGVyCisrKyBiL1Rvb2xzL1Nj cmlwdHMvcnVuLWxhdW5jaGVyCkBAIC02OSw4ICs2OSw2IEBAIGlmIChpc1F0KCkpIHsKICAgICAg ICAgfSBlbHNlIHsKICAgICAgICAgICAgIHVuc2hpZnQoQEFSR1YsIGNhdGRpcigkbGF1bmNoZXJQ YXRoLCAiUHJvZ3JhbXMiLCAiR3RrTGF1bmNoZXIiKSk7CiAgICAgICAgIH0KLSAgICAgICAgJGxh dW5jaGVyUGF0aCA9IGNhdGRpcihzb3VyY2VEaXIoKSwgIlRvb2xzIiwgImpoYnVpbGQiLCAiamhi dWlsZC13cmFwcGVyIik7Ci0gICAgICAgIHVuc2hpZnQoQEFSR1YsICgiLS1ndGsiLCAicnVuIikp OwogICAgIH0KIAogICAgIGlmIChpc0VmbCgpKSB7CkBAIC03OSwxMiArNzcsMTEgQEAgaWYgKGlz UXQoKSkgewogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgdW5zaGlmdChAQVJHViwgY2F0 ZGlyKCRsYXVuY2hlclBhdGgsICJiaW4iLCAiRVdlYkxhdW5jaGVyIikpOwogICAgICAgICB9Ci0g ICAgICAgICRsYXVuY2hlclBhdGggPSBjYXRkaXIoc291cmNlRGlyKCksICJUb29scyIsICJqaGJ1 aWxkIiwgImpoYnVpbGQtd3JhcHBlciIpOwotICAgICAgICB1bnNoaWZ0KEBBUkdWLCAoIi0tZWZs IiwgInJ1biIpKTsKICAgICB9CisgICAgKCRsYXVuY2hlclBhdGgsIG15IEBhcmdzKSA9IGpoYnVp bGRXcmFwcGVyUHJlZml4SWZOZWVkZWQoKTsKKyAgICB1bnNoaWZ0KEBBUkdWLCBAYXJncyk7CiAK ICAgICBwcmludCAiU3RhcnRpbmcgd2Via2l0IGxhdW5jaGVyLlxuIjsKIH0KIAogZXhlYyAkbGF1 bmNoZXJQYXRoLCBAQVJHViBvciBkaWU7Ci0K 220510 2014-01-07 04:20:45 -0800 2014-01-07 04:30:03 -0800 Patch 117275.diff text/plain 2371 berto ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhYmZj MDdjLi5lYzI1MDA1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTQtMDEtMDcgIEFsYmVydG8gR2FyY2lhICA8YmVy dG9AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVtFRkxdIFVzZSBmdW5jdGlvbiBqaGJ1aWxk V3JhcHBlclByZWZpeElmTmVlZGVkIHRvIHJ1biBsYXVuY2hlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3Mjc1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYgd2UgYXJlIG5vdCB1c2luZyB0aGUgaW50 ZXJuYWwgamhidWlsZCB3ZSBtdXN0IG5vdCB1c2UgdGhlCisgICAgICAgIGpoYnVpbGQtd3JhcHBl ciBzY3JpcHQsIGVsc2UgaXQgd2lsbCB0cnkgdG8gZG93bmxvYWQgYW5kIGluc3RhbGwKKyAgICAg ICAgaXQuCisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi1sYXVuY2hlcjoKKwogMjAxNC0wMS0wNiAg TWFyayBSb3dlICA8bXJvd2VAYXBwbGUuY29tPgogCiAgICAgICAgIDxodHRwczovL3dlYmtpdC5v cmcvYi8xMjY1NjA+IEZpeCBpbmNvcnJlY3RuZXNzIGluIHVzZSBvZiBzb21lIEFwcEtpdCBlbnVt cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9ydW4tbGF1bmNoZXIgYi9Ub29scy9TY3JpcHRz L3J1bi1sYXVuY2hlcgppbmRleCBiODk2MTFmLi5hNDljNzlmIDEwMDc1NQotLS0gYS9Ub29scy9T Y3JpcHRzL3J1bi1sYXVuY2hlcgorKysgYi9Ub29scy9TY3JpcHRzL3J1bi1sYXVuY2hlcgpAQCAt MzksNiArMzksOCBAQCB1c2Ugd2Via2l0ZGlyczsKIHNldENvbmZpZ3VyYXRpb24oKTsKIG15ICRw cm9kdWN0RGlyID0gcHJvZHVjdERpcigpOwogbXkgJGxhdW5jaGVyUGF0aCA9IHByb2R1Y3REaXIo KTsKK215ICRsYXVuY2hlckNtZDsKK215IEBqaGJ1aWxkV3JhcHBlcjsKIAogIyBDaGVjayB0byBz ZWUgdGhhdCBhbGwgdGhlIGZyYW1ld29ya3MgYXJlIGJ1aWx0LgogY2hlY2tGcmFtZXdvcmtzKCk7 CkBAIC00NiwyNSArNDgsMjUgQEAgY2hlY2tGcmFtZXdvcmtzKCk7CiAjIFNldCBwYXRocyBhY2Nv cmRpbmcgdG8gdGhlIGJ1aWxkIHN5c3RlbSB1c2VkCiBpZiAoaXNHdGsoKSkgewogICAgIGlmIChp c1dLMigpKSB7Ci0gICAgICAgIHVuc2hpZnQoQEFSR1YsIGNhdGRpcigkbGF1bmNoZXJQYXRoLCAi UHJvZ3JhbXMiLCAiTWluaUJyb3dzZXIiKSk7CisgICAgICAgICRsYXVuY2hlckNtZCA9IGNhdGRp cigkbGF1bmNoZXJQYXRoLCAiUHJvZ3JhbXMiLCAiTWluaUJyb3dzZXIiKTsKICAgICB9IGVsc2Ug ewotICAgICAgICB1bnNoaWZ0KEBBUkdWLCBjYXRkaXIoJGxhdW5jaGVyUGF0aCwgIlByb2dyYW1z IiwgIkd0a0xhdW5jaGVyIikpOworICAgICAgICAkbGF1bmNoZXJDbWQgPSBjYXRkaXIoJGxhdW5j aGVyUGF0aCwgIlByb2dyYW1zIiwgIkd0a0xhdW5jaGVyIik7CiAgICAgfQotICAgICRsYXVuY2hl clBhdGggPSBjYXRkaXIoc291cmNlRGlyKCksICJUb29scyIsICJqaGJ1aWxkIiwgImpoYnVpbGQt d3JhcHBlciIpOwotICAgIHVuc2hpZnQoQEFSR1YsICgiLS1ndGsiLCAicnVuIikpOwogfQogCiBp ZiAoaXNFZmwoKSkgewogICAgIGlmIChpc1dLMigpKSB7Ci0gICAgICAgIHVuc2hpZnQoQEFSR1Ys IGNhdGRpcigkbGF1bmNoZXJQYXRoLCAiYmluIiwgIk1pbmlCcm93c2VyIikpOworICAgICAgICAk bGF1bmNoZXJDbWQgPSBjYXRkaXIoJGxhdW5jaGVyUGF0aCwgImJpbiIsICJNaW5pQnJvd3NlciIp OwogICAgIH0gZWxzZSB7Ci0gICAgICAgIHVuc2hpZnQoQEFSR1YsIGNhdGRpcigkbGF1bmNoZXJQ YXRoLCAiYmluIiwgIkVXZWJMYXVuY2hlciIpKTsKKyAgICAgICAgJGxhdW5jaGVyQ21kID0gY2F0 ZGlyKCRsYXVuY2hlclBhdGgsICJiaW4iLCAiRVdlYkxhdW5jaGVyIik7CiAgICAgfQotICAgICRs YXVuY2hlclBhdGggPSBjYXRkaXIoc291cmNlRGlyKCksICJUb29scyIsICJqaGJ1aWxkIiwgImpo YnVpbGQtd3JhcHBlciIpOwotICAgIHVuc2hpZnQoQEFSR1YsICgiLS1lZmwiLCAicnVuIikpOwog fQogCiskbGF1bmNoZXJDbWQgJiYgLXggJGxhdW5jaGVyQ21kIG9yIGRpZSAiQ2FuJ3QgZmluZCB0 aGUgbGF1bmNoZXIgY29tbWFuZCI7CisKK0BqaGJ1aWxkV3JhcHBlciA9IGpoYnVpbGRXcmFwcGVy UHJlZml4SWZOZWVkZWQoKTsKKwogcHJpbnQgIlN0YXJ0aW5nIHdlYmtpdCBsYXVuY2hlci5cbiI7 CiAKLWV4ZWMgJGxhdW5jaGVyUGF0aCwgQEFSR1Ygb3IgZGllOworZXhlYyBAamhidWlsZFdyYXBw ZXIsICRsYXVuY2hlckNtZCwgQEFSR1Ygb3IgZGllOwogCg== 220511 2014-01-07 04:30:03 -0800 2014-01-07 04:31:13 -0800 Patch 117275.diff text/plain 2467 berto ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhYmZj MDdjLi5lYzI1MDA1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTQtMDEtMDcgIEFsYmVydG8gR2FyY2lhICA8YmVy dG9AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVtFRkxdIFVzZSBmdW5jdGlvbiBqaGJ1aWxk V3JhcHBlclByZWZpeElmTmVlZGVkIHRvIHJ1biBsYXVuY2hlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3Mjc1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYgd2UgYXJlIG5vdCB1c2luZyB0aGUgaW50 ZXJuYWwgamhidWlsZCB3ZSBtdXN0IG5vdCB1c2UgdGhlCisgICAgICAgIGpoYnVpbGQtd3JhcHBl ciBzY3JpcHQsIGVsc2UgaXQgd2lsbCB0cnkgdG8gZG93bmxvYWQgYW5kIGluc3RhbGwKKyAgICAg ICAgaXQuCisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi1sYXVuY2hlcjoKKwogMjAxNC0wMS0wNiAg TWFyayBSb3dlICA8bXJvd2VAYXBwbGUuY29tPgogCiAgICAgICAgIDxodHRwczovL3dlYmtpdC5v cmcvYi8xMjY1NjA+IEZpeCBpbmNvcnJlY3RuZXNzIGluIHVzZSBvZiBzb21lIEFwcEtpdCBlbnVt cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9ydW4tbGF1bmNoZXIgYi9Ub29scy9TY3JpcHRz L3J1bi1sYXVuY2hlcgppbmRleCBiODk2MTFmLi5lNDlmZjUxIDEwMDc1NQotLS0gYS9Ub29scy9T Y3JpcHRzL3J1bi1sYXVuY2hlcgorKysgYi9Ub29scy9TY3JpcHRzL3J1bi1sYXVuY2hlcgpAQCAt MzgsNyArMzgsOCBAQCB1c2Ugd2Via2l0ZGlyczsKIAogc2V0Q29uZmlndXJhdGlvbigpOwogbXkg JHByb2R1Y3REaXIgPSBwcm9kdWN0RGlyKCk7Ci1teSAkbGF1bmNoZXJQYXRoID0gcHJvZHVjdERp cigpOworbXkgJGxhdW5jaGVyUGF0aDsKK215IEBqaGJ1aWxkV3JhcHBlcjsKIAogIyBDaGVjayB0 byBzZWUgdGhhdCBhbGwgdGhlIGZyYW1ld29ya3MgYXJlIGJ1aWx0LgogY2hlY2tGcmFtZXdvcmtz KCk7CkBAIC00NiwyNSArNDcsMjggQEAgY2hlY2tGcmFtZXdvcmtzKCk7CiAjIFNldCBwYXRocyBh Y2NvcmRpbmcgdG8gdGhlIGJ1aWxkIHN5c3RlbSB1c2VkCiBpZiAoaXNHdGsoKSkgewogICAgIGlm IChpc1dLMigpKSB7Ci0gICAgICAgIHVuc2hpZnQoQEFSR1YsIGNhdGRpcigkbGF1bmNoZXJQYXRo LCAiUHJvZ3JhbXMiLCAiTWluaUJyb3dzZXIiKSk7CisgICAgICAgICRsYXVuY2hlclBhdGggPSBj YXRkaXIoJHByb2R1Y3REaXIsICJQcm9ncmFtcyIsICJNaW5pQnJvd3NlciIpOwogICAgIH0gZWxz ZSB7Ci0gICAgICAgIHVuc2hpZnQoQEFSR1YsIGNhdGRpcigkbGF1bmNoZXJQYXRoLCAiUHJvZ3Jh bXMiLCAiR3RrTGF1bmNoZXIiKSk7CisgICAgICAgICRsYXVuY2hlclBhdGggPSBjYXRkaXIoJHBy b2R1Y3REaXIsICJQcm9ncmFtcyIsICJHdGtMYXVuY2hlciIpOwogICAgIH0KLSAgICAkbGF1bmNo ZXJQYXRoID0gY2F0ZGlyKHNvdXJjZURpcigpLCAiVG9vbHMiLCAiamhidWlsZCIsICJqaGJ1aWxk LXdyYXBwZXIiKTsKLSAgICB1bnNoaWZ0KEBBUkdWLCAoIi0tZ3RrIiwgInJ1biIpKTsKIH0KIAog aWYgKGlzRWZsKCkpIHsKICAgICBpZiAoaXNXSzIoKSkgewotICAgICAgICB1bnNoaWZ0KEBBUkdW LCBjYXRkaXIoJGxhdW5jaGVyUGF0aCwgImJpbiIsICJNaW5pQnJvd3NlciIpKTsKKyAgICAgICAg JGxhdW5jaGVyUGF0aCA9IGNhdGRpcigkcHJvZHVjdERpciwgImJpbiIsICJNaW5pQnJvd3NlciIp OwogICAgIH0gZWxzZSB7Ci0gICAgICAgIHVuc2hpZnQoQEFSR1YsIGNhdGRpcigkbGF1bmNoZXJQ YXRoLCAiYmluIiwgIkVXZWJMYXVuY2hlciIpKTsKKyAgICAgICAgJGxhdW5jaGVyUGF0aCA9IGNh dGRpcigkcHJvZHVjdERpciwgImJpbiIsICJFV2ViTGF1bmNoZXIiKTsKICAgICB9Ci0gICAgJGxh dW5jaGVyUGF0aCA9IGNhdGRpcihzb3VyY2VEaXIoKSwgIlRvb2xzIiwgImpoYnVpbGQiLCAiamhi dWlsZC13cmFwcGVyIik7Ci0gICAgdW5zaGlmdChAQVJHViwgKCItLWVmbCIsICJydW4iKSk7CiB9 CiAKKyRsYXVuY2hlclBhdGggJiYgLXggJGxhdW5jaGVyUGF0aCBvciBkaWUgIkNhbid0IGZpbmQg dGhlIGxhdW5jaGVyIGNvbW1hbmQiOworCitAamhidWlsZFdyYXBwZXIgPSBqaGJ1aWxkV3JhcHBl clByZWZpeElmTmVlZGVkKCk7CisKIHByaW50ICJTdGFydGluZyB3ZWJraXQgbGF1bmNoZXIuXG4i OwogCi1leGVjICRsYXVuY2hlclBhdGgsIEBBUkdWIG9yIGRpZTsKK3N1YiBmb28geyBmb3JlYWNo IChAXykgeyBwcmludCAiLT4kXzwtXG4iOyB9IH0KK2ZvbyBAamhidWlsZFdyYXBwZXIsICRsYXVu Y2hlclBhdGgsIEBBUkdWOworCitleGVjIEBqaGJ1aWxkV3JhcHBlciwgJGxhdW5jaGVyUGF0aCwg QEFSR1Ygb3IgZGllOwogCg== 220512 2014-01-07 04:31:13 -0800 2014-01-07 04:37:15 -0800 Patch 117275.diff text/plain 2373 berto ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhYmZj MDdjLi5lYzI1MDA1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTQtMDEtMDcgIEFsYmVydG8gR2FyY2lhICA8YmVy dG9AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVtFRkxdIFVzZSBmdW5jdGlvbiBqaGJ1aWxk V3JhcHBlclByZWZpeElmTmVlZGVkIHRvIHJ1biBsYXVuY2hlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3Mjc1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYgd2UgYXJlIG5vdCB1c2luZyB0aGUgaW50 ZXJuYWwgamhidWlsZCB3ZSBtdXN0IG5vdCB1c2UgdGhlCisgICAgICAgIGpoYnVpbGQtd3JhcHBl ciBzY3JpcHQsIGVsc2UgaXQgd2lsbCB0cnkgdG8gZG93bmxvYWQgYW5kIGluc3RhbGwKKyAgICAg ICAgaXQuCisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi1sYXVuY2hlcjoKKwogMjAxNC0wMS0wNiAg TWFyayBSb3dlICA8bXJvd2VAYXBwbGUuY29tPgogCiAgICAgICAgIDxodHRwczovL3dlYmtpdC5v cmcvYi8xMjY1NjA+IEZpeCBpbmNvcnJlY3RuZXNzIGluIHVzZSBvZiBzb21lIEFwcEtpdCBlbnVt cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9ydW4tbGF1bmNoZXIgYi9Ub29scy9TY3JpcHRz L3J1bi1sYXVuY2hlcgppbmRleCBiODk2MTFmLi5jYTA1MjYxIDEwMDc1NQotLS0gYS9Ub29scy9T Y3JpcHRzL3J1bi1sYXVuY2hlcgorKysgYi9Ub29scy9TY3JpcHRzL3J1bi1sYXVuY2hlcgpAQCAt MzgsNyArMzgsOCBAQCB1c2Ugd2Via2l0ZGlyczsKIAogc2V0Q29uZmlndXJhdGlvbigpOwogbXkg JHByb2R1Y3REaXIgPSBwcm9kdWN0RGlyKCk7Ci1teSAkbGF1bmNoZXJQYXRoID0gcHJvZHVjdERp cigpOworbXkgJGxhdW5jaGVyUGF0aDsKK215IEBqaGJ1aWxkV3JhcHBlcjsKIAogIyBDaGVjayB0 byBzZWUgdGhhdCBhbGwgdGhlIGZyYW1ld29ya3MgYXJlIGJ1aWx0LgogY2hlY2tGcmFtZXdvcmtz KCk7CkBAIC00NiwyNSArNDcsMjUgQEAgY2hlY2tGcmFtZXdvcmtzKCk7CiAjIFNldCBwYXRocyBh Y2NvcmRpbmcgdG8gdGhlIGJ1aWxkIHN5c3RlbSB1c2VkCiBpZiAoaXNHdGsoKSkgewogICAgIGlm IChpc1dLMigpKSB7Ci0gICAgICAgIHVuc2hpZnQoQEFSR1YsIGNhdGRpcigkbGF1bmNoZXJQYXRo LCAiUHJvZ3JhbXMiLCAiTWluaUJyb3dzZXIiKSk7CisgICAgICAgICRsYXVuY2hlclBhdGggPSBj YXRkaXIoJHByb2R1Y3REaXIsICJQcm9ncmFtcyIsICJNaW5pQnJvd3NlciIpOwogICAgIH0gZWxz ZSB7Ci0gICAgICAgIHVuc2hpZnQoQEFSR1YsIGNhdGRpcigkbGF1bmNoZXJQYXRoLCAiUHJvZ3Jh bXMiLCAiR3RrTGF1bmNoZXIiKSk7CisgICAgICAgICRsYXVuY2hlclBhdGggPSBjYXRkaXIoJHBy b2R1Y3REaXIsICJQcm9ncmFtcyIsICJHdGtMYXVuY2hlciIpOwogICAgIH0KLSAgICAkbGF1bmNo ZXJQYXRoID0gY2F0ZGlyKHNvdXJjZURpcigpLCAiVG9vbHMiLCAiamhidWlsZCIsICJqaGJ1aWxk LXdyYXBwZXIiKTsKLSAgICB1bnNoaWZ0KEBBUkdWLCAoIi0tZ3RrIiwgInJ1biIpKTsKIH0KIAog aWYgKGlzRWZsKCkpIHsKICAgICBpZiAoaXNXSzIoKSkgewotICAgICAgICB1bnNoaWZ0KEBBUkdW LCBjYXRkaXIoJGxhdW5jaGVyUGF0aCwgImJpbiIsICJNaW5pQnJvd3NlciIpKTsKKyAgICAgICAg JGxhdW5jaGVyUGF0aCA9IGNhdGRpcigkcHJvZHVjdERpciwgImJpbiIsICJNaW5pQnJvd3NlciIp OwogICAgIH0gZWxzZSB7Ci0gICAgICAgIHVuc2hpZnQoQEFSR1YsIGNhdGRpcigkbGF1bmNoZXJQ YXRoLCAiYmluIiwgIkVXZWJMYXVuY2hlciIpKTsKKyAgICAgICAgJGxhdW5jaGVyUGF0aCA9IGNh dGRpcigkcHJvZHVjdERpciwgImJpbiIsICJFV2ViTGF1bmNoZXIiKTsKICAgICB9Ci0gICAgJGxh dW5jaGVyUGF0aCA9IGNhdGRpcihzb3VyY2VEaXIoKSwgIlRvb2xzIiwgImpoYnVpbGQiLCAiamhi dWlsZC13cmFwcGVyIik7Ci0gICAgdW5zaGlmdChAQVJHViwgKCItLWVmbCIsICJydW4iKSk7CiB9 CiAKKyRsYXVuY2hlclBhdGggJiYgLXggJGxhdW5jaGVyUGF0aCBvciBkaWUgIkNhbid0IGZpbmQg dGhlIGxhdW5jaGVyIGNvbW1hbmQiOworCitAamhidWlsZFdyYXBwZXIgPSBqaGJ1aWxkV3JhcHBl clByZWZpeElmTmVlZGVkKCk7CisKIHByaW50ICJTdGFydGluZyB3ZWJraXQgbGF1bmNoZXIuXG4i OwogCi1leGVjICRsYXVuY2hlclBhdGgsIEBBUkdWIG9yIGRpZTsKK2V4ZWMgQGpoYnVpbGRXcmFw cGVyLCAkbGF1bmNoZXJQYXRoLCBAQVJHViBvciBkaWU7CiAK