From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Thompson, David" Subject: Re: [PATCH] scripts: environment: Allow mixing regular and ad-hoc packages. Date: Thu, 29 Oct 2015 08:58:43 -0400 Message-ID: References: <87bnbmxrmg.fsf@izanagi.i-did-not-set--mail-host-address--so-tickle-me> <87r3kh4rwf.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=94eb2c093a32e7a43c05233dde30 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zrmn2-0002Gk-P9 for guix-devel@gnu.org; Thu, 29 Oct 2015 08:58:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zrmmx-0001Oh-UF for guix-devel@gnu.org; Thu, 29 Oct 2015 08:58:48 -0400 Received: from mail-yk0-x232.google.com ([2607:f8b0:4002:c07::232]:34585) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zrmmx-0001OY-OC for guix-devel@gnu.org; Thu, 29 Oct 2015 08:58:43 -0400 Received: by ykdr3 with SMTP id r3so40996648ykd.1 for ; Thu, 29 Oct 2015 05:58:43 -0700 (PDT) In-Reply-To: <87r3kh4rwf.fsf@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: =?UTF-8?Q?Ludovic_Court=C3=A8s?= Cc: guix-devel --94eb2c093a32e7a43c05233dde30 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Mon, Oct 26, 2015 at 10:37 AM, Ludovic Court=C3=A8s wrote= : > Could you add a test in guix-environment.sh based on the output of > --search-paths, similar to what is already done with =E2=80=98gnu-make-bo= ot0=E2=80=99? Good idea. I wasn't sure how I could test this before. Done! > Other than that it LGTM! How about this new patch? Thanks! - Dave --94eb2c093a32e7a43c05233dde30 Content-Type: text/x-diff; charset=US-ASCII; name="0001-scripts-environment-Allow-mixing-regular-and-ad-hoc-.patch" Content-Disposition: attachment; filename="0001-scripts-environment-Allow-mixing-regular-and-ad-hoc-.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_igc8lfmg0 RnJvbSBjZTdlYmNjN2Q0MGJkNmVjNGJlYWFkNjIwNTk3ZGZjMTIxY2E1YmJlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYXZpZCBUaG9tcHNvbiA8ZHRob21wc29uMkB3b3JjZXN0ZXIu ZWR1PgpEYXRlOiBTdW4sIDI1IE9jdCAyMDE1IDIyOjMzOjMzIC0wNDAwClN1YmplY3Q6IFtQQVRD SF0gc2NyaXB0czogZW52aXJvbm1lbnQ6IEFsbG93IG1peGluZyByZWd1bGFyIGFuZCBhZC1ob2MK IHBhY2thZ2VzLgoKVGhpcyBwYXRjaCBjaGFuZ2VzIHRoZSAtLWFkLWhvYyBmbGFnIHRvIGJlIHBv c2l0aW9uYWwuICBUaGF0IGlzLCB0aGUKcGFja2FnZXMgdGhhdCBhcHBlYXIgYmVmb3JlIC0tYWQt aG9jIGFyZSBpbnRlcnByZXRlZCBhcyBwYWNrYWdlcyB3aG9zZQppbnB1dHMgc2hvdWxkIGJlIGlu IHRoZSBlbnZpcm9ubWVudDsgdGhlIHBhY2thZ2VzIHRoYXQgYXBwZWFyIGFmdGVyIGFyZQppbnRl cnByZXRlZCBhcyBwYWNrYWdlcyB0byBiZSBkaXJlY3RseSBhZGRlZCB0byB0aGUgZW52aXJvbm1l bnQuCgoqIGd1aXgvc2NyaXB0cy9lbnZpcm9ubWVudC5zY20gKHRhZy1wYWNrYWdlLWFyZywgY29t cGFjdCk6IE5ldwogIHByb2NlZHVyZXMuCiAgKCVvcHRpb25zKTogVHdlYWsgdGhlIGhhbmRsZXJz IGZvciAtLWxvYWQgYW5kIC0tZXhwcmVzc2lvbiBvcHRpb25zLgogIChvcHRpb25zL3Jlc29sdmUt cGFja2FnZXMpOiBQcmVzZXJ2ZSBwYWNrYWdlIG1vZGUgdGFnLgogIChwYXJzZS1hcmdzKTogVHdl YWsgYXJndW1lbnQgaGFuZGxlciB0byB1c2UgcGFja2FnZSB0YWdnaW5nIHByb2NlZHVyZS4KICAo Z3VpeC1lbnZpcm9ubWVudCk6IEFwcGx5IGFkLWhvYyBiZWhhdmlvciBvbiBhIHBlciBwYWNrYWdl IGJhc2lzLgoqIHRlc3RzL2d1aXgtZW52aXJvbm1lbnQuc2g6IEFkZCB0ZXN0LgoqIGRvYy9ndWl4 LnRleGkgKCJpbnZva2luZyBndWl4IGVudmlyb25tZW50Iik6IERvY3VtZW50IG5ldyBiZWhhdmlv ciBvZgogIC0tYWQtaG9jLgotLS0KIGRvYy9ndWl4LnRleGkgICAgICAgICAgICAgICAgfCAyMCAr KysrKysrKysrKwogZ3VpeC9zY3JpcHRzL2Vudmlyb25tZW50LnNjbSB8IDg1ICsrKysrKysrKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiB0ZXN0cy9ndWl4LWVudmlyb25tZW50 LnNoICAgIHwgMTQgKysrKysrKysKIDMgZmlsZXMgY2hhbmdlZCwgODUgaW5zZXJ0aW9ucygrKSwg MzQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZG9jL2d1aXgudGV4aSBiL2RvYy9ndWl4LnRl eGkKaW5kZXggOTg3OGI5My4uY2I2NmYxZiAxMDA2NDQKLS0tIGEvZG9jL2d1aXgudGV4aQorKysg Yi9kb2MvZ3VpeC50ZXhpCkBAIC00Njk4LDYgKzQ2OTgsMjAgQEAgTnVtUHk6CiBndWl4IGVudmly b25tZW50IC0tYWQtaG9jIHB5dGhvbjItbnVtcHkgcHl0aG9uLTIuNyAtLSBweXRob24KIEBlbmQg ZXhhbXBsZQogCitGdXJ0aGVybW9yZSwgb25lIG1pZ2h0IHdhbnQgdGhlIGRlcGVuZGVuY2llcyBv ZiBhIHBhY2thZ2UgYW5kIGFsc28gc29tZQorYWRkaXRpb25hbCBwYWNrYWdlcyB0aGF0IGFyZSBu b3QgYnVpbGQtdGltZSBvciBydW50aW1lIGRlcGVuZGVuY2llcywgYnV0CithcmUgdXNlZnVsIHdo ZW4gZGV2ZWxvcGluZyBub25ldGhlbGVzcy4gIEJlY2F1c2Ugb2YgdGhpcywgdGhlCitAY29kZXst LWFkLWhvY30gZmxhZyBpcyBwb3NpdGlvbmFsLiAgUGFja2FnZXMgYXBwZWFyaW5nIGJlZm9yZQor QGNvZGV7LS1hZC1ob2N9IGFyZSBpbnRlcnByZXRlZCBhcyBwYWNrYWdlcyB3aG9zZSBkZXBlbmRl bmNpZXMgd2lsbCBiZQorYWRkZWQgdG8gdGhlIGVudmlyb25tZW50LiAgUGFja2FnZXMgYXBwZWFy aW5nIGFmdGVyIGFyZSBpbnRlcnByZXRlZCBhcworcGFja2FnZXMgdGhhdCB3aWxsIGJlIGFkZGVk IHRvIHRoZSBlbnZpcm9ubWVudCBkaXJlY3RseS4gIEZvciBleGFtcGxlLAordGhlIGZvbGxvd2lu ZyBjb21tYW5kIGNyZWF0ZXMgYSBHdWl4IGRldmVsb3BtZW50IGVudmlyb25tZW50IHRoYXQKK2Fk ZGl0aW9uYWxseSBpbmNsdWRlcyBHaXQgYW5kIHN0cmFjZToKKworQGV4YW1wbGUKK2d1aXggZW52 aXJvbm1lbnQgZ3VpeCAtLWFkLWhvYyBnaXQgc3RyYWNlCitAZW5kIGV4YW1wbGUKKwogU29tZXRp bWVzIGl0IGlzIGRlc2lyYWJsZSB0byBpc29sYXRlIHRoZSBlbnZpcm9ubWVudCBhcyBtdWNoIGFz CiBwb3NzaWJsZSwgZm9yIG1heGltYWwgcHVyaXR5IGFuZCByZXByb2R1Y2liaWxpdHkuICBJbiBw YXJ0aWN1bGFyLCB3aGVuCiB1c2luZyBHdWl4IG9uIGEgaG9zdCBkaXN0cm8gdGhhdCBpcyBub3Qg R3VpeFNELCBpdCBpcyBkZXNpcmFibGUgdG8KQEAgLTQ3NTgsNiArNDc3MiwxMiBAQCBOb3RlIHRo YXQgdGhpcyBleGFtcGxlIGltcGxpY2l0bHkgYXNrcyBmb3IgdGhlIGRlZmF1bHQgb3V0cHV0IG9m CiBzcGVjaWZpYyBvdXRwdXQtLS1lLmcuLCBAY29kZXtnbGliOmJpbn0gYXNrcyBmb3IgdGhlIEBj b2Rle2Jpbn0gb3V0cHV0CiBvZiBAY29kZXtnbGlifSAoQHB4cmVme1BhY2thZ2VzIHdpdGggTXVs dGlwbGUgT3V0cHV0c30pLgogCitUaGlzIG9wdGlvbiBtYXkgYmUgY29tcG9zZWQgd2l0aCB0aGUg ZGVmYXVsdCBiZWhhdmlvciBvZiBAY29tbWFuZHtndWl4CitlbnZpcm9ubWVudH0uICBQYWNrYWdl cyBhcHBlYXJpbmcgYmVmb3JlIEBjb2Rley0tYWQtaG9jfSBhcmUgaW50ZXJwcmV0ZWQKK2FzIHBh Y2thZ2VzIHdob3NlIGRlcGVuZGVuY2llcyB3aWxsIGJlIGFkZGVkIHRvIHRoZSBlbnZpcm9ubWVu dCwgdGhlCitkZWZhdWx0IGJlaGF2aW9yLiAgUGFja2FnZXMgYXBwZWFyaW5nIGFmdGVyIGFyZSBp bnRlcnByZXRlZCBhcyBwYWNrYWdlcwordGhhdCB3aWxsIGJlIGFkZGVkIHRvIHRoZSBlbnZpcm9u bWVudCBkaXJlY3RseS4KKwogQGl0ZW0gLS1wdXJlCiBVbnNldCBleGlzdGluZyBlbnZpcm9ubWVu dCB2YXJpYWJsZXMgd2hlbiBidWlsZGluZyB0aGUgbmV3IGVudmlyb25tZW50LgogVGhpcyBoYXMg dGhlIGVmZmVjdCBvZiBjcmVhdGluZyBhbiBlbnZpcm9ubWVudCBpbiB3aGljaCBzZWFyY2ggcGF0 aHMKZGlmZiAtLWdpdCBhL2d1aXgvc2NyaXB0cy9lbnZpcm9ubWVudC5zY20gYi9ndWl4L3Njcmlw dHMvZW52aXJvbm1lbnQuc2NtCmluZGV4IDFkMjFhNzYuLjE4ODgzODUgMTAwNjQ0Ci0tLSBhL2d1 aXgvc2NyaXB0cy9lbnZpcm9ubWVudC5zY20KKysrIGIvZ3VpeC9zY3JpcHRzL2Vudmlyb25tZW50 LnNjbQpAQCAtMTY2LDYgKzE2NiwxNiBAQCBDT01NQU5EIG9yIGFuIGludGVyYWN0aXZlIHNoZWxs IGluIHRoYXQgZW52aXJvbm1lbnQuXG4iKSkKICAgICAobWF4LXNpbGVudC10aW1lIC4gMzYwMCkK ICAgICAodmVyYm9zaXR5IC4gMCkpKQogCisoZGVmaW5lICh0YWctcGFja2FnZS1hcmcgb3B0cyBh cmcpCisgICJSZXR1cm4gYSB0d28tZWxlbWVudCBsaXN0IHdpdGggdGhlIGZvcm0gKFRBRyBBUkcp IHRoYXQgdGFncyBBUkcgd2l0aCBlaXRoZXIKKydhZC1ob2MnIGluIE9QVFMgaGFzIHRoZSAnYWQt aG9jPycga2V5IHNldCB0byAjdCwgb3IgJ2lucHV0cycgb3RoZXJ3aXNlLiIKKyAgOzsgTm9ybWFs bHksIHRoZSB0cmFuc2l0aXZlIGlucHV0cyB0byBhIHBhY2thZ2UgYXJlIGFkZGVkIHRvIGFuIGVu dmlyb25tZW50LAorICA7OyBidXQgdGhlIGFkLWhvYz8gZmxhZyBjaGFuZ2VzIHRoZSBtZWFuaW5n IG9mIGEgcGFja2FnZSBhcmd1bWVudCBzdWNoIHRoYXQKKyAgOzsgdGhlIHBhY2thZ2UgaXRzZWxm IGlzIGFkZGVkIHRvIHRoZSBlbnZpcm9ubWVudCBpbnN0ZWFkLgorICAoaWYgKGFzc29jLXJlZiBv cHRzICdhZC1ob2M/KQorICAgICAgYChhZC1ob2MtcGFja2FnZSAsYXJnKQorICAgICAgYChwYWNr YWdlICxhcmcpKSkKKwogKGRlZmluZSAlb3B0aW9ucwogICA7OyBTcGVjaWZpY2F0aW9uIG9mIHRo ZSBjb21tYW5kLWxpbmUgb3B0aW9ucy4KICAgKGNvbnMqIChvcHRpb24gJygjXGggImhlbHAiKSAj ZiAjZgpAQCAtMTg2LDEwICsxOTYsMTQgQEAgQ09NTUFORCBvciBhbiBpbnRlcmFjdGl2ZSBzaGVs bCBpbiB0aGF0IGVudmlyb25tZW50LlxuIikpCiAgICAgICAgICAgICAgICAgICAgKGFsaXN0LWNv bnMgJ3NlYXJjaC1wYXRocyAjdCByZXN1bHQpKSkKICAgICAgICAgIChvcHRpb24gJygjXGwgImxv YWQiKSAjdCAjZgogICAgICAgICAgICAgICAgICAobGFtYmRhIChvcHQgbmFtZSBhcmcgcmVzdWx0 KQotICAgICAgICAgICAgICAgICAgIChhbGlzdC1jb25zICdsb2FkIGFyZyByZXN1bHQpKSkKKyAg ICAgICAgICAgICAgICAgICAoYWxpc3QtY29ucyAnbG9hZAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICh0YWctcGFja2FnZS1hcmcgcmVzdWx0IGFyZykKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICByZXN1bHQpKSkKICAgICAgICAgIChvcHRpb24gJygjXGUgImV4cHJlc3Np b24iKSAjdCAjZgogICAgICAgICAgICAgICAgICAobGFtYmRhIChvcHQgbmFtZSBhcmcgcmVzdWx0 KQotICAgICAgICAgICAgICAgICAgIChhbGlzdC1jb25zICdleHByZXNzaW9uIGFyZyByZXN1bHQp KSkKKyAgICAgICAgICAgICAgICAgICAoYWxpc3QtY29ucyAnZXhwcmVzc2lvbgorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICh0YWctcGFja2FnZS1hcmcgcmVzdWx0IGFyZykKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICByZXN1bHQpKSkKICAgICAgICAgIChvcHRpb24gJygi YWQtaG9jIikgI2YgI2YKICAgICAgICAgICAgICAgICAgKGxhbWJkYSAob3B0IG5hbWUgYXJnIHJl c3VsdCkKICAgICAgICAgICAgICAgICAgICAoYWxpc3QtY29ucyAnYWQtaG9jPyAjdCByZXN1bHQp KSkKQEAgLTIzMiwyOSArMjQ2LDM0IEBAIENPTU1BTkQgb3IgYW4gaW50ZXJhY3RpdmUgc2hlbGwg aW4gdGhhdCBlbnZpcm9ubWVudC5cbiIpKQogICAgICAgICAgICAgKF8gbWVtbykpKQogICAgICAg ICAnKCkgYWxpc3QpKQogCisoZGVmaW5lIChjb21wYWN0IGxzdCkKKyAgIlJlbW92ZSBhbGwgI2Yg ZWxlbWVudHMgZnJvbSBMU1QuIgorICAoZmlsdGVyIGlkZW50aXR5IGxzdCkpCisKIChkZWZpbmUg KG9wdGlvbnMvcmVzb2x2ZS1wYWNrYWdlcyBvcHRzKQogICAiUmV0dXJuIE9QVFMgd2l0aCBwYWNr YWdlIHNwZWNpZmljYXRpb24gc3RyaW5ncyByZXBsYWNlZCBieSBhY3R1YWwKIHBhY2thZ2VzLiIK LSAgKGFwcGVuZC1tYXAgKG1hdGNoLWxhbWJkYQotICAgICAgICAgICAgICAgICgoJ3BhY2thZ2Ug LiAoPyBzdHJpbmc/IHNwZWMpKQotICAgICAgICAgICAgICAgICAobGV0LXZhbHVlcyAoKChwYWNr YWdlIG91dHB1dCkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc3BlY2lmaWNhdGlv bi0+cGFja2FnZStvdXRwdXQgc3BlYykpKQotICAgICAgICAgICAgICAgICAgIGAoKHBhY2thZ2Ug LHBhY2thZ2UgLG91dHB1dCkpKSkKLSAgICAgICAgICAgICAgICAoKCdleHByZXNzaW9uIC4gc3Ry KQotICAgICAgICAgICAgICAgICA7OyBBZGQgYWxsIHRoZSBvdXRwdXRzIG9mIHRoZSBwYWNrYWdl IFNUUiBldmFsdWF0ZXMgdG8uCi0gICAgICAgICAgICAgICAgIChtYXRjaCAocmVhZC9ldmFsIHN0 cikKLSAgICAgICAgICAgICAgICAgICAoKD8gcGFja2FnZT8gcGFja2FnZSkKKyAgKGNvbXBhY3QK KyAgIChhcHBlbmQtbWFwIChtYXRjaC1sYW1iZGEKKyAgICAgICAgICAgICAgICAgKCgncGFja2Fn ZSBtb2RlICg/IHN0cmluZz8gc3BlYykpCisgICAgICAgICAgICAgICAgICAobGV0LXZhbHVlcyAo KChwYWNrYWdlIG91dHB1dCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHNwZWNp ZmljYXRpb24tPnBhY2thZ2Urb3V0cHV0IHNwZWMpKSkKKyAgICAgICAgICAgICAgICAgICAgKGxp c3QgKGxpc3QgbW9kZSBwYWNrYWdlIG91dHB1dCkpKSkKKyAgICAgICAgICAgICAgICAgKCgnZXhw cmVzc2lvbiBtb2RlIHN0cikKKyAgICAgICAgICAgICAgICAgIDs7IEFkZCBhbGwgdGhlIG91dHB1 dHMgb2YgdGhlIHBhY2thZ2UgU1RSIGV2YWx1YXRlcyB0by4KKyAgICAgICAgICAgICAgICAgICht YXRjaCAocmVhZC9ldmFsIHN0cikKKyAgICAgICAgICAgICAgICAgICAgKCg/IHBhY2thZ2U/IHBh Y2thZ2UpCisgICAgICAgICAgICAgICAgICAgICAobWFwIChsYW1iZGEgKG91dHB1dCkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAobGlzdCBtb2RlIHBhY2thZ2Ugb3V0cHV0KSkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgKHBhY2thZ2Utb3V0cHV0cyBwYWNrYWdlKSkpKSkKKyAgICAg ICAgICAgICAgICAgKCgnbG9hZCBtb2RlIGZpbGUpCisgICAgICAgICAgICAgICAgICA7OyBBZGQg YWxsIHRoZSBvdXRwdXRzIG9mIHRoZSBwYWNrYWdlIGRlZmluZWQgaW4gRklMRS4KKyAgICAgICAg ICAgICAgICAgIChsZXQgKChwYWNrYWdlIChsb2FkKiBmaWxlIChtYWtlLXVzZXItbW9kdWxlICco KSkpKSkKICAgICAgICAgICAgICAgICAgICAgKG1hcCAobGFtYmRhIChvdXRwdXQpCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICBgKHBhY2thZ2UgLHBhY2thZ2UgLG91dHB1dCkpCi0gICAgICAg ICAgICAgICAgICAgICAgICAgKHBhY2thZ2Utb3V0cHV0cyBwYWNrYWdlKSkpKSkKLSAgICAgICAg ICAgICAgICAoKCdsb2FkIC4gZmlsZSkKLSAgICAgICAgICAgICAgICAgOzsgQWRkIGFsbCB0aGUg b3V0cHV0cyBvZiB0aGUgcGFja2FnZSBkZWZpbmVkIGluIEZJTEUuCi0gICAgICAgICAgICAgICAg IChsZXQgKChwYWNrYWdlIChsb2FkKiBmaWxlIChtYWtlLXVzZXItbW9kdWxlICcoKSkpKSkKLSAg ICAgICAgICAgICAgICAgICAobWFwIChsYW1iZGEgKG91dHB1dCkKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgYChwYWNrYWdlICxwYWNrYWdlICxvdXRwdXQpKQotICAgICAgICAgICAgICAgICAg ICAgICAgKHBhY2thZ2Utb3V0cHV0cyBwYWNrYWdlKSkpKQotICAgICAgICAgICAgICAgIChvcHQg KGxpc3Qgb3B0KSkpCi0gICAgICAgICAgICAgIG9wdHMpKQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgKGxpc3QgbW9kZSBwYWNrYWdlIG91dHB1dCkpCisgICAgICAgICAgICAgICAgICAgICAg ICAgKHBhY2thZ2Utb3V0cHV0cyBwYWNrYWdlKSkpKQorICAgICAgICAgICAgICAgICAoXyAnKCNm KSkpCisgICAgICAgICAgICAgICBvcHRzKSkpCiAKIChkZWZpbmUgKGJ1aWxkLWlucHV0cyBpbnB1 dHMgb3B0cykKICAgIkJ1aWxkIHRoZSBkZXJpdmF0aW9ucyBpbiBJTlBVVFMsIGEgbGlzdCBvZiAo REVSSVZBVElPTikgb3IgKERFUklWQVRJT04KQEAgLTQwMiw3ICs0MjEsNyBAQCBPdGhlcndpc2Us IHJldHVybiB0aGUgZGVyaXZhdGlvbiBmb3IgdGhlIEJhc2ggcGFja2FnZS4iCiAoZGVmaW5lIChw YXJzZS1hcmdzIGFyZ3MpCiAgICJQYXJzZSB0aGUgbGlzdCBvZiBjb21tYW5kIGxpbmUgYXJndW1l bnRzIEFSR1MuIgogICAoZGVmaW5lIChoYW5kbGUtYXJndW1lbnQgYXJnIHJlc3VsdCkKLSAgICAo YWxpc3QtY29ucyAncGFja2FnZSBhcmcgcmVzdWx0KSkKKyAgICAoYWxpc3QtY29ucyAncGFja2Fn ZSAodGFnLXBhY2thZ2UtYXJnIHJlc3VsdCBhcmcpIHJlc3VsdCkpCiAKICAgOzsgVGhlICctLScg dG9rZW4gaXMgdXNlZCB0byBzZXBhcmF0ZSB0aGUgY29tbWFuZCB0byBydW4gZnJvbSB0aGUgcmVz dCBvZgogICA7OyB0aGUgb3BlcmFuZHMuCkBAIC00MjAsMjIgKzQzOSwyMCBAQCBPdGhlcndpc2Us IHJldHVybiB0aGUgZGVyaXZhdGlvbiBmb3IgdGhlIEJhc2ggcGFja2FnZS4iCiAgICAgICAgICAg IChwdXJlPyAgICAgIChhc3NvYy1yZWYgb3B0cyAncHVyZSkpCiAgICAgICAgICAgIChjb250YWlu ZXI/IChhc3NvYy1yZWYgb3B0cyAnY29udGFpbmVyPykpCiAgICAgICAgICAgIChuZXR3b3JrPyAg IChhc3NvYy1yZWYgb3B0cyAnbmV0d29yaz8pKQotICAgICAgICAgICAoYWQtaG9jPyAgICAoYXNz b2MtcmVmIG9wdHMgJ2FkLWhvYz8pKQogICAgICAgICAgICAoYm9vdHN0cmFwPyAoYXNzb2MtcmVm IG9wdHMgJ2Jvb3RzdHJhcD8pKQogICAgICAgICAgICAoc3lzdGVtICAgICAoYXNzb2MtcmVmIG9w dHMgJ3N5c3RlbSkpCiAgICAgICAgICAgIChjb21tYW5kICAgIChhc3NvYy1yZWYgb3B0cyAnZXhl YykpCi0gICAgICAgICAgIChwYWNrYWdlcyAgIChwaWNrLWFsbCAob3B0aW9ucy9yZXNvbHZlLXBh Y2thZ2VzIG9wdHMpICdwYWNrYWdlKSkKKyAgICAgICAgICAgKHBhY2thZ2VzICAgKG9wdGlvbnMv cmVzb2x2ZS1wYWNrYWdlcyBvcHRzKSkKICAgICAgICAgICAgKG1hcHBpbmdzICAgKHBpY2stYWxs IG9wdHMgJ2ZpbGUtc3lzdGVtLW1hcHBpbmcpKQotICAgICAgICAgICAoaW5wdXRzICAgICAoaWYg YWQtaG9jPwotICAgICAgICAgICAgICAgICAgICAgICAgICAgKGFwcGVuZC1tYXAgKG1hdGNoLWxh bWJkYQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICgocGFja2FnZSBv dXRwdXQpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChwYWNrYWdl K3Byb3BhZ2F0ZWQtaW5wdXRzIHBhY2thZ2UKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3V0cHV0KSkpCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwYWNrYWdlcykKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgIChhcHBlbmQtbWFwIChjb21wb3NlIGJhZy10cmFuc2l0aXZlLWlucHV0cwot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFja2FnZS0+ YmFnCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmaXJz dCkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhY2thZ2VzKSkpCisg ICAgICAgICAgIChpbnB1dHMgICAgIChkZWxldGUtZHVwbGljYXRlcworICAgICAgICAgICAgICAg ICAgICAgICAgKGFwcGVuZC1tYXAgKG1hdGNoLWxhbWJkYQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAoKCdhZC1ob2MtcGFja2FnZSBwYWNrYWdlIG91dHB1dCkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChwYWNrYWdlK3Byb3BhZ2F0ZWQtaW5w dXRzIHBhY2thZ2UKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIG91dHB1dCkpCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICgoJ3BhY2thZ2UgcGFja2FnZSBvdXRwdXQpCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAoYmFnLXRyYW5zaXRpdmUtaW5wdXRzCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHBhY2thZ2UtPmJhZyBwYWNrYWdlKSkpKQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFja2FnZXMpKSkKICAgICAgICAg ICAgKHBhdGhzICAgICAgKGRlbGV0ZS1kdXBsaWNhdGVzCiAgICAgICAgICAgICAgICAgICAgICAg ICAoY29ucyAkUEFUSAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGFwcGVuZC1tYXAg KG1hdGNoLWxhbWJkYQpkaWZmIC0tZ2l0IGEvdGVzdHMvZ3VpeC1lbnZpcm9ubWVudC5zaCBiL3Rl c3RzL2d1aXgtZW52aXJvbm1lbnQuc2gKaW5kZXggZjkxYzc4YS4uNDliM2IxYyAxMDA2NDQKLS0t IGEvdGVzdHMvZ3VpeC1lbnZpcm9ubWVudC5zaAorKysgYi90ZXN0cy9ndWl4LWVudmlyb25tZW50 LnNoCkBAIC05Nyw0ICs5NywxOCBAQCB0aGVuCiAKICAgICAjIE1ha2Ugc3VyZSB0aGUgImRlYnVn IiBvdXRwdXQgaXMgbm90IGxpc3RlZC4KICAgICBpZiBncmVwIC1FICIkbWFrZV9ib290MF9kZWJ1 ZyIgIiR0bXBkaXIvYSI7IHRoZW4gZmFsc2U7IGVsc2UgdHJ1ZTsgZmkKKworICAgICMgQ29tcHV0 ZSB0aGUgYnVpbGQgZW52aXJvbm1lbnQgZm9yIHRoZSBpbml0aWFsIEdOVSBNYWtlLCBidXQgYWRk IGluIHRoZQorICAgICMgYm9vdHN0cmFwIEd1aWxlIGFzIGFuIGFkLWhvYyBhZGRpdGlvbi4KKyAg ICBndWl4IGVudmlyb25tZW50IC1lICcoQEAgKGdudSBwYWNrYWdlcyBjb21tZW5jZW1lbnQpIGdu dS1tYWtlLWJvb3QwKScgXAorICAgICAgICAgLS1hZC1ob2MgZ3VpbGUtYm9vdHN0cmFwIC0tbm8t c3Vic3RpdHV0ZXMgLS1zZWFyY2gtcGF0aHMgXAorICAgICAgICAgLS1wdXJlID4gIiR0bXBkaXIv YSIKKworICAgICMgTWFrZSBzdXJlIHRoZSBib290c3RyYXAgYmluYXJpZXMgYXJlIGFsbCBsaXN0 ZWQgd2hlcmUgdGhleSBiZWxvbmcuCisgICAgY2F0ICR0bXBkaXIvYQorICAgIGdyZXAgLUUgJ15l eHBvcnQgUEFUSD0uKi1ib290c3RyYXAtYmluYXJpZXMtMC9iaW4nICAgICAgIiR0bXBkaXIvYSIK KyAgICBncmVwIC1FICdeZXhwb3J0IFBBVEg9LiotZ3VpbGUtYm9vdHN0cmFwLTIuMC9iaW4nICAg ICAgICIkdG1wZGlyL2EiCisgICAgZ3JlcCAtRSAnXmV4cG9ydCBDUEFUSD0uKi1nY2MtYm9vdHN0 cmFwLTAvaW5jbHVkZScgICAgICAiJHRtcGRpci9hIgorICAgIGdyZXAgLUUgJ15leHBvcnQgQ1BB VEg9LiotZ2xpYmMtYm9vdHN0cmFwLTAvaW5jbHVkZScgICAgIiR0bXBkaXIvYSIKKyAgICBncmVw IC1FICdeZXhwb3J0IExJQlJBUllfUEFUSD0uKi1nbGliYy1ib290c3RyYXAtMC9saWInICIkdG1w ZGlyL2EiCiBmaQotLSAKMi41LjAKCg== --94eb2c093a32e7a43c05233dde30--