From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 01 22:32:33 2022 Received: (at submit) by debbugs.gnu.org; 2 Feb 2022 03:32:33 +0000 Received: from localhost ([127.0.0.1]:51071 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nF6Nk-0008KQ-He for submit@debbugs.gnu.org; Tue, 01 Feb 2022 22:32:33 -0500 Received: from lists.gnu.org ([209.51.188.17]:46198) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nF6Ni-0008KI-9m for submit@debbugs.gnu.org; Tue, 01 Feb 2022 22:32:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44244) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nF6Nh-0001QV-90 for bug-gnu-emacs@gnu.org; Tue, 01 Feb 2022 22:32:29 -0500 Received: from [2607:f8b0:4864:20::434] (port=41512 helo=mail-pf1-x434.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nF6Ne-00020R-B1 for bug-gnu-emacs@gnu.org; Tue, 01 Feb 2022 22:32:28 -0500 Received: by mail-pf1-x434.google.com with SMTP id i30so17643323pfk.8 for ; Tue, 01 Feb 2022 19:32:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:subject:to:message-id:date:mime-version:content-language; bh=Ta6WEH7uXLjNN7yB69pQ2+gI6BhLEl2rBdOdDa574BY=; b=IxLtv/EKBBH14ZFYHksgz9NEzbfUTGaInjavPxFRMUd4VvoHGcdx1FVo/DaAimqVgl BqBVB4T90nJ3niWPpICIR+tliVLb6dzMYCq6npLiehR/8GuRpWM1JtOu7/FxrWJMoZS9 FKUeT5s/ffgpsqcViIbQCOTP5ZNKdPoDXZAdCY4NrQJ/MpaXGHWoajjUlmS1izT+yrm6 JusbZEL9BM+okOQIbbeulpZlMxXmE3iKP2PUuD8bEqScyJR2ZW7GMjPdNVh/HOAMr3DU eiAjWeVTFfVHQ1WwbvMHP3bqjv138Zxg6hPXQYVydBeZBmi4F5rX93jZFAtSrAoHdVzU wjNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:subject:to:message-id:date:mime-version :content-language; bh=Ta6WEH7uXLjNN7yB69pQ2+gI6BhLEl2rBdOdDa574BY=; b=PdF8d3tVTBWJEQJ9+aNgHsNDbX+N4IfVBuhhtHFkeEpEHw9ShP5OcU1OeLQgm/8UQB a1Qlm+T5le8ua3M79KPjpqc4ZUxPlo9LuI9K12kTl+ZVb2jnpWIaZ12TolLvEFUUS5yc 7jtaGLDTPPJ4m7OtJnyd0ZgYZad5jB0ew1BHw0hlyp5ArkzT8xFGC3EDMhb/yAGwKZq6 D+fPlSGX/Hk0tbxofU2rDI8vi+hnP3/yriIt8ZvmiadMudOg7hDXjt8+ER5jjoLFfFVo Zm/JwSljWzYjJZqQLEqGwwSk/Vhwj6D1WDKXfnYCqnfCzlVXNRM29IlMAle6lQ1iylrf p8Qg== X-Gm-Message-State: AOAM531YxYfma7poitETi8IE7E1hu9Qu4M05F5nzMaHDpxxVpksz9nWH eMb3yfLrOlu2y0YJBb2pJbIIDAi/GRT+Fw== X-Google-Smtp-Source: ABdhPJxEdtX5OXF1O1wnqtb4H3xtJUtAWGQF9Cg02QNEiiiLF99ULnrBYda2xbEzpB2DjxJeo2NXFw== X-Received: by 2002:a63:3189:: with SMTP id x131mr22727037pgx.302.1643772732162; Tue, 01 Feb 2022 19:32:12 -0800 (PST) Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id s19sm9803743pfu.34.2022.02.01.19.32.10 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 01 Feb 2022 19:32:11 -0800 (PST) X-Mozilla-News-Host: news://news.gmane.org:119 From: Jim Porter Subject: 29.0.50; [PATCH] Improve correctness of pipelines in Eshell To: bug-gnu-emacs@gnu.org Message-ID: <75056e6b-c739-a48c-2bf8-56ddc456da8e@gmail.com> Date: Tue, 1 Feb 2022 19:32:10 -0800 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------7D41F0D6D5DFA979DC54248A" Content-Language: en-US X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::434 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=jporterbugs@gmail.com; helo=mail-pf1-x434.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) This is a multi-part message in MIME format. --------------7D41F0D6D5DFA979DC54248A Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit From `emacs -Q', start Eshell, and first run the following: ~ $ *echo hi | echo bye This results in: bye ~ $ hi That is, `*echo' writes its output *after* the prompt is emitted. This is because `eshell-do-pipelines' reports that there's no process object to wait for, so Eshell thinks the prompt can be emitted immediately. I fixed that in the first patch by setting the `tailproc' in a different spot. With this change, the result is: bye hi ~ $ This may be a bit surprising, since you'd normally expect "echo bye" to read "hi" on its stdin and just ignore it. However, the builtin Eshell echo command doesn't consume stdin, so it just goes straight to stdout instead. It's in reverse order because Eshell runs the pipeline from right-to-left in order to hook up the pipes properly. For how the builtin Eshell echo works, I think this is the right behavior. (If people disagree, I can fix this, but not right now; I'm working on a patch series to properly support piping to Lisp functions in Eshell, and I can change it - or not - once that's done.) Second, run this: ~ $ tr a-z A-Z | rev hello RET C-c C-d ;; Send EOF The result is: olleh ;; should be "OLLEH" This happens because Eshell only keeps track of the tail process when running an external process, so when sending stdin, it gets sent to the tail process (`rev'), not the head (`tr'). I fixed this in the second patch by recording both the head and tail processes and updating the various places that use the current process to use the right one. --------------7D41F0D6D5DFA979DC54248A Content-Type: text/plain; charset=UTF-8; name="0001-Ensure-that-tailproc-is-set-for-the-last-process-in-.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Ensure-that-tailproc-is-set-for-the-last-process-in-.pa"; filename*1="tch" RnJvbSA2ZjE1ODMyZjUzNzAzNWQyNmQwNzI1OTViYzU5ZmY4Nzk1Yzk1NTBmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFRodSwgMjcgSmFuIDIwMjIgMjM6MTM6MzYgLTA4MDAKU3ViamVjdDogW1BB VENIIDAxLzExXSBFbnN1cmUgdGhhdCB0YWlscHJvYyBpcyBzZXQgZm9yIHRoZSBsYXN0IHBy b2Nlc3MgaW4gYW4KIEVzaGVsbCBwaXBlbGluZQoKSW4gcGFydGljdWxhciwgdGhpcyB1c2Vk IHRvIGZhaWwgZm9yIHBpcGVsaW5lcyB3aGVyZSB0aGUgbGFzdCBwcm9jZXNzCmluIHRoZSBw aXBlbGluZSBjYW1lIGZyb20gdGhlIGZpcnN0IGVsZW1lbnQgb2YgdGhlIHBpcGVsaW5lLiBU aGlzCmNvdWxkIGhhcHBlbiB3aGVuIGEgcHJvY2VzcyB3YXMgcGlwZWQgdG8gYW4gb3JkaW5h cnkgTGlzcCBmdW5jdGlvbiwKbGlrZSBpbiAnKmVjaG8gaGkgfCBlY2hvIGJ5ZScuCgoqIGxp c3AvZXNoZWxsL2VzaC1jbWQuZWwgKGVzaGVsbC1kby1waXBlbGluZXMpOiBTZXQgdGhlIHRh aWxwcm9jIGV2ZW4KZm9yIHRoZSBmaXJzdCBwcm9jZXNzIGluIHRoZSBwaXBlbGluZS4KCiog dGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwgKGVzaGVsbC10ZXN0L3BpcGUtdGFp bHByb2MpOiBOZXcKdGVzdC4KLS0tCiBsaXNwL2VzaGVsbC9lc2gtY21kLmVsICAgICAgICAg ICB8IDcgKysrKy0tLQogdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwgfCA3ICsr KysrKysKIDIgZmlsZXMgY2hhbmdlZCwgMTEgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lc2gtY21kLmVsIGIvbGlzcC9lc2hlbGwv ZXNoLWNtZC5lbAppbmRleCAwNGQ2NWRmNGYzLi4xNDEzOTg5NmRkIDEwMDY0NAotLS0gYS9s aXNwL2VzaGVsbC9lc2gtY21kLmVsCisrKyBiL2xpc3AvZXNoZWxsL2VzaC1jbWQuZWwKQEAg LTc2NCw4ICs3NjQsNyBAQCBlc2hlbGwtZG8tcGlwZWxpbmVzCiAgICAgICAgICAgICAgIChl c2hlbGwtc2V0LW91dHB1dC1oYW5kbGUgLGVzaGVsbC1vdXRwdXQtaGFuZGxlCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2FwcGVuZCBuZXh0cHJvYykKICAg ICAgICAgICAgICAgKGVzaGVsbC1zZXQtb3V0cHV0LWhhbmRsZSAsZXNoZWxsLWVycm9yLWhh bmRsZQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdhcHBlbmQg bmV4dHByb2MpCi0gICAgICAgICAgICAgIChzZXRxIHRhaWxwcm9jIChvciB0YWlscHJvYyBu ZXh0cHJvYykpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAn YXBwZW5kIG5leHRwcm9jKSkpCiAJLChsZXQgKChoZWFkIChjYXIgcGlwZWxpbmUpKSkKIAkg ICAoaWYgKG1lbXEgKGNhciBoZWFkKSAnKGxldCBwcm9nbikpCiAJICAgICAgIChzZXRxIGhl YWQgKGNhciAobGFzdCBoZWFkKSkpKQpAQCAtNzgxLDcgKzc4MCw5IEBAIGVzaGVsbC1kby1w aXBlbGluZXMKIAkgICAgICAgLChjb25kICgobm90IG5vdGZpcnN0KSAocXVvdGUgJ2ZpcnN0 KSkKIAkJICAgICAgKChjZHIgcGlwZWxpbmUpIHQpCiAJCSAgICAgICh0IChxdW90ZSAnbGFz dCkpKSkpCi0JICAsKGNhciBwaXBlbGluZSkpKSkpKQorICAgICAgICAgIChsZXQgKChwcm9j ICwoY2FyIHBpcGVsaW5lKSkpCisgICAgICAgICAgICAoc2V0cSB0YWlscHJvYyAob3IgdGFp bHByb2MgcHJvYykpCisgICAgICAgICAgICBwcm9jKSkpKSkpCiAKIChkZWZtYWNybyBlc2hl bGwtZG8tcGlwZWxpbmVzLXN5bmNocm9ub3VzbHkgKHBpcGVsaW5lKQogICAiRXhlY3V0ZSB0 aGUgY29tbWFuZHMgaW4gUElQRUxJTkUgaW4gc2VxdWVuY2Ugc3luY2hyb25vdXNseS4KZGlm ZiAtLWdpdCBhL3Rlc3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLmVsIGIvdGVzdC9saXNw L2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwKaW5kZXggNTQyODE1ZGY4MC4uNzY1OGQ1ZjU1MSAx MDA2NDQKLS0tIGEvdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwKKysrIGIvdGVz dC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwKQEAgLTEyOSw2ICsxMjksMTMgQEAgZXNo ZWxsLXRlc3QvaW50ZXJwLWNtZC1leHRlcm5hbC1jb25jYXQKICAgIChlc2hlbGwtY29tbWFu ZC1yZXN1bHQtcCAiZWNobyAke2VjaG8gaGl9LSR7KmVjaG8gdGhlcmV9IgogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICJoaS10aGVyZVxuIikpKQogCisoZXJ0LWRlZnRlc3QgZXNo ZWxsLXRlc3QvcGlwZS10YWlscHJvYyAoKQorICAiQ2hlY2sgdGhhdCBwaXBpbmcgYSBwcm9j ZXNzIHRvIGEgbm9uLXByb2Nlc3MgY29tbWFuZCB3YWl0cyBmb3IgdGhlIHByb2Nlc3MiCisg IChza2lwLXVubGVzcyAoZXhlY3V0YWJsZS1maW5kICJlY2hvIikpCisgICh3aXRoLXRlbXAt ZXNoZWxsCisgICAoZXNoZWxsLWNvbW1hbmQtcmVzdWx0LXAgIiplY2hvIGhpIHwgZWNobyBi eWUiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgImJ5ZVxuaGlcbiIpKSkKKwogKGVy dC1kZWZ0ZXN0IGVzaGVsbC10ZXN0L3dpbmRvdy1oZWlnaHQgKCkKICAgIiRMSU5FUyBzaG91 bGQgZXF1YWwgKHdpbmRvdy1oZWlnaHQpIgogICAoc2hvdWxkIChlc2hlbGwtdGVzdC1jb21t YW5kLXJlc3VsdCAiPSAkTElORVMgKHdpbmRvdy1oZWlnaHQpIikpKQotLSAKMi4yNS4xCgo= --------------7D41F0D6D5DFA979DC54248A Content-Type: text/plain; charset=UTF-8; name="0002-When-executing-an-Eshell-pipeline-send-input-to-the-.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0002-When-executing-an-Eshell-pipeline-send-input-to-the-.pa"; filename*1="tch" RnJvbSBiODFiOGYzZDA1ZmFhY2U4ZGU2NTM3ZDEzNTQwZjI3ODM4MTU1NzJmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFN1biwgMzAgSmFuIDIwMjIgMTg6NTM6NTMgLTA4MDAKU3ViamVjdDogW1BB VENIIDAyLzExXSBXaGVuIGV4ZWN1dGluZyBhbiBFc2hlbGwgcGlwZWxpbmUsIHNlbmQgaW5w dXQgdG8gdGhlCiBmaXJzdCBwcm9jZXNzCgpQcmV2aW91c2x5LCBpbnB1dCB3YXMgc2VudCB0 byB0aGUgbGFzdCBwcm9jZXNzIGluIHRoZSBwaXBlbGluZSwKcmVzdWx0aW5nIGluIHVuZXhw ZWN0ZWQgYmVoYXZpb3Igd2hlbiBydW5uaW5nIGNvbW1hbmRzIGxpa2UKJ3RyIGEteiBBLVog fCByZXYnLgoKKiBsaXNwL2VzaGVsbC9lc2gtdXRpbC5lbCAoZXNoZWxsLXByb2Nlc3MtcGFp ci1wKQooZXNoZWxsLW1ha2UtcHJvY2Vzcy1wYWlyKTogTmV3IGZ1bmN0aW9ucy4KCiogbGlz cC9lc2hlbGwvZXNoLWNtZC5lbCAoZXNoZWxsLWxhc3QtYXN5bmMtcHJvYyk6IFJlbmFtZSB0 by4uLgooZXNoZWxsLWxhc3QtYXN5bmMtcHJvY3MpOiAuLi4gdGhpcywgYW5kIHN0b3JlIGEg cGFpciBvZiBwcm9jZXNzZXMuCihlc2hlbGwtaW50ZXJhY3RpdmUtcHJvY2Vzcyk6IFJlcGxh Y2Ugd2l0aC4uLgooZXNoZWxsLWludGVyYWN0aXZlLXByb2Nlc3MtcCwgZXNoZWxsLWhlYWQt cHJvY2VzcykKKGVzaGVsbC10YWlsLXByb2Nlc3MpOiAuLi4gdGhlc2UuCihlc2hlbGwtY21k LWluaXRpYWxpemUpOiBTZXQgJ2VzaGVsbC1sYXN0LWFzeW5jLXByb2NzJy4KKGVzaGVsbC1k by1waXBlbGluZXMpOiBTZXQgJ2hlYWRwcm9jJy4KKGVzaGVsbC1leGVjdXRlLXBpcGVsaW5l KTogUmV0dXJuICdoZWFkcHJvYycgYW5kICd0YWlscHJvYycuCihlc2hlbGwtcmVzdW1lLWV2 YWwpOiBVc2UgJ2VzaGVsbC1sYXN0LWFzeW5jLXByb2NzJy4KKGVzaGVsbC1kby1ldmFsKTog TWFrZSBzdXJlIHdlIHdvcmsgd2l0aCBhIHBhaXIgb2YgcHJvY2Vzc2VzLgoKKiBsaXNwL2Vz aGVsbC9lc2gtcHJvYy5lbCAoZXNoZWxsLXNlbmQtZW9mLXRvLXByb2Nlc3MpOiBNb3ZlIGZy b20KaGVyZS4uLgoqIGxpc3AvZXNoZWxsL2VzaC1tb2RlLmVsIChlc2hlbGwtc2VuZC1lb2Yt dG8tcHJvY2Vzcyk6IC4uLiB0byBoZXJlLAphbmQgb25seSBzZW5kIEVPRiB0byB0aGUgaGVh ZCBwcm9jZXNzLgoKKiBsaXNwL2VzaGVsbC9lbS1jbXBsLmVsIChlc2hlbGwtY29tcGxldGUt cGFyc2UtYXJndW1lbnRzKQoqIGxpc3AvZXNoZWxsL2VzaC1tb2RlLmVsIChlc2hlbGwtaW50 ZXJjZXB0LWNvbW1hbmRzKQooZXNoZWxsLXdhdGNoLWZvci1wYXNzd29yZC1wcm9tcHQpOgpV c2UgJ2VzaGVsbC1pbnRlcmFjdGl2ZS1wcm9jZXNzLXAnLgoKKiBsaXNwL2VzaGVsbC9lbS1y ZWJpbmQuZWwgKGVzaGVsbC1kZWxjaGFyLW9yLW1heWJlLWVvZikKKiBsaXNwL2VzaGVsbC9l bS10ZXJtLmVsIChlc2hlbGwtdGVybS1zZW5kLXJhdy1zdHJpbmcpCiogbGlzcC9lc2hlbGwv ZXNoLW1vZGUuZWwgKGVzaGVsbC1zZWxmLWluc2VydC1jb21tYW5kKQooZXNoZWxsLXNlbmQt aW5wdXQsIGVzaGVsbC1zZW5kLWludmlzaWJsZSk6ClVzZSAnZXNoZWxsLWhlYWQtcHJvY2Vz cycuCgoqIGxpc3AvZXNoZWxsL2VzaC1jbWQuZWwgKGVzaGVsbC1hcy1zdWJjb21tYW5kKToK VXNlICdlc2hlbGwtdGFpbC1wcm9jZXNzJy4KCiogbGlzcC9lc2hlbGwvZXNoZWxsLmVsIChl c2hlbGwtY29tbWFuZCk6ClVzZSAnZXNoZWxsLWludGVyYWN0aXZlLXByb2Nlc3MtcCcgYW5k ICdlc2hlbGwtdGFpbC1wcm9jZXNzJy4KCiogdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVz dHMuZWwgKGVzaGVsbC10ZXN0L3BpcGUtaGVhZHByb2Mtc3RkaW4pOgpOZXcgdGVzdC4KLS0t CiBsaXNwL2VzaGVsbC9lbS1jbXBsLmVsICAgICAgICAgICB8ICAyICstCiBsaXNwL2VzaGVs bC9lbS1yZWJpbmQuZWwgICAgICAgICB8ICAyICstCiBsaXNwL2VzaGVsbC9lbS10ZXJtLmVs ICAgICAgICAgICB8ICAyICstCiBsaXNwL2VzaGVsbC9lc2gtY21kLmVsICAgICAgICAgICB8 IDY2ICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiBsaXNwL2VzaGVsbC9lc2gt aW8uZWwgICAgICAgICAgICB8ICAyICstCiBsaXNwL2VzaGVsbC9lc2gtbW9kZS5lbCAgICAg ICAgICB8IDI4ICsrKysrKysrKy0tLS0tCiBsaXNwL2VzaGVsbC9lc2gtcHJvYy5lbCAgICAg ICAgICB8IDExICstLS0tLQogbGlzcC9lc2hlbGwvZXNoLXV0aWwuZWwgICAgICAgICAgfCAx NCArKysrKysrCiBsaXNwL2VzaGVsbC9lc2hlbGwuZWwgICAgICAgICAgICB8ICA2ICstLQog dGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwgfCAxMSArKysrKysKIDEwIGZpbGVz IGNoYW5nZWQsIDk2IGluc2VydGlvbnMoKyksIDQ4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2xpc3AvZXNoZWxsL2VtLWNtcGwuZWwgYi9saXNwL2VzaGVsbC9lbS1jbXBsLmVsCmlu ZGV4IGM2YTUxYjE3OTMuLmI3OTQ3NWY2ZTAgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2Vt LWNtcGwuZWwKKysrIGIvbGlzcC9lc2hlbGwvZW0tY21wbC5lbApAQCAtMzE0LDcgKzMxNCw3 IEBAIGVzaGVsbC1jb21wbGV0aW9uLWhlbHAKIChkZWZ1biBlc2hlbGwtY29tcGxldGUtcGFy c2UtYXJndW1lbnRzICgpCiAgICJQYXJzZSB0aGUgY29tbWFuZCBsaW5lIGFyZ3VtZW50cyBm b3IgYHBjb21wbGV0ZS1hcmd1bWVudCcuIgogICAod2hlbiAoYW5kIGVzaGVsbC1uby1jb21w bGV0aW9uLWR1cmluZy1qb2JzCi0JICAgICAoZXNoZWxsLWludGVyYWN0aXZlLXByb2Nlc3Mp KQorCSAgICAgKGVzaGVsbC1pbnRlcmFjdGl2ZS1wcm9jZXNzLXApKQogICAgIChpbnNlcnQt YW5kLWluaGVyaXQgIlx0IikKICAgICAodGhyb3cgJ3Bjb21wbGV0ZWQgdCkpCiAgIChsZXQg KChlbmQgKHBvaW50LW1hcmtlcikpCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lbS1yZWJp bmQuZWwgYi9saXNwL2VzaGVsbC9lbS1yZWJpbmQuZWwKaW5kZXggZjI0NzU4ZDRlMy4uMmI1 NmM5ZTg0NCAxMDA2NDQKLS0tIGEvbGlzcC9lc2hlbGwvZW0tcmViaW5kLmVsCisrKyBiL2xp c3AvZXNoZWxsL2VtLXJlYmluZC5lbApAQCAtMjM4LDcgKzIzOCw3IEBAIGVzaGVsbC1kZWxj aGFyLW9yLW1heWJlLWVvZgogU2VuZHMgYW4gRU9GIG9ubHkgaWYgcG9pbnQgaXMgYXQgdGhl IGVuZCBvZiB0aGUgYnVmZmVyIGFuZCB0aGVyZSBpcyBubwogaW5wdXQuIgogICAoaW50ZXJh Y3RpdmUgInAiKQotICAobGV0ICgocHJvYyAoZXNoZWxsLWludGVyYWN0aXZlLXByb2Nlc3Mp KSkKKyAgKGxldCAoKHByb2MgKGVzaGVsbC1oZWFkLXByb2Nlc3MpKSkKICAgICAoaWYgKGVv YnApCiAJKGNvbmQKIAkgKCgvPSAocG9pbnQpIGVzaGVsbC1sYXN0LW91dHB1dC1lbmQpCmRp ZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lbS10ZXJtLmVsIGIvbGlzcC9lc2hlbGwvZW0tdGVy bS5lbAppbmRleCBlMzRjNWFlNDdjLi5kMTUwYzA3YjAzIDEwMDY0NAotLS0gYS9saXNwL2Vz aGVsbC9lbS10ZXJtLmVsCisrKyBiL2xpc3AvZXNoZWxsL2VtLXRlcm0uZWwKQEAgLTIyNCw3 ICsyMjQsNyBAQCBlc2hlbGwtdGVybS1zZW50aW5lbAogCiA7IChkZWZ1biBlc2hlbGwtdGVy bS1zZW5kLXJhdy1zdHJpbmcgKGNoYXJzKQogOyAgIChnb3RvLWNoYXIgZXNoZWxsLWxhc3Qt b3V0cHV0LWVuZCkKLTsgICAocHJvY2Vzcy1zZW5kLXN0cmluZyAoZXNoZWxsLWludGVyYWN0 aXZlLXByb2Nlc3MpIGNoYXJzKSkKKzsgICAocHJvY2Vzcy1zZW5kLXN0cmluZyAoZXNoZWxs LWhlYWQtcHJvY2VzcykgY2hhcnMpKQogCiA7IChkZWZ1biBlc2hlbGwtdGVybS1zZW5kLXJh dyAoKQogOyAgICJTZW5kIHRoZSBsYXN0IGNoYXJhY3RlciB0eXBlZCB0aHJvdWdoIHRoZSB0 ZXJtaW5hbC1lbXVsYXRvcgpkaWZmIC0tZ2l0IGEvbGlzcC9lc2hlbGwvZXNoLWNtZC5lbCBi L2xpc3AvZXNoZWxsL2VzaC1jbWQuZWwKaW5kZXggMTQxMzk4OTZkZC4uZTcwMmRlMDNhMCAx MDA2NDQKLS0tIGEvbGlzcC9lc2hlbGwvZXNoLWNtZC5lbAorKysgYi9saXNwL2VzaGVsbC9l c2gtY21kLmVsCkBAIC0yNzksMTQgKzI3OSwzMyBAQCBlc2hlbGwtaW4tcGlwZWxpbmUtcAog KGRlZnZhciBlc2hlbGwtaW4tc3ViY29tbWFuZC1wIG5pbCkKIChkZWZ2YXIgZXNoZWxsLWxh c3QtYXJndW1lbnRzIG5pbCkKIChkZWZ2YXIgZXNoZWxsLWxhc3QtY29tbWFuZC1uYW1lIG5p bCkKLShkZWZ2YXIgZXNoZWxsLWxhc3QtYXN5bmMtcHJvYyBuaWwKLSAgIldoZW4gdGhpcyBm b3JlZ3JvdW5kIHByb2Nlc3MgY29tcGxldGVzLCByZXN1bWUgY29tbWFuZCBldmFsdWF0aW9u LiIpCisoZGVmdmFyIGVzaGVsbC1sYXN0LWFzeW5jLXByb2NzIG5pbAorICAiVGhlIGN1cnJl bnRseS1ydW5uaW5nIGZvcmVncm91bmQgcHJvY2VzcyhlcykuCitXaGVuIGV4ZWN1dGluZyBh IHBpcGVsaW5lLCB0aGlzIGlzIGEgY29ucyBjZWxsIHdob3NlIENBUiBpcyB0aGUKK2ZpcnN0 IHByb2Nlc3MgKHVzdWFsbHkgcmVhZGluZyBmcm9tIHN0ZGluKSBhbmQgd2hvc2UgQ0RSIGlz IHRoZQorbGFzdCBwcm9jZXNzICh1c3VhbGx5IHdyaXRpbmcgdG8gc3Rkb3V0KS4gIE90aGVy d2lzZSwgdGhlIENBUiBhbmQKK0NEUiBhcmUgdGhlIHNhbWUgcHJvY2Vzcy4KKworV2hlbiB0 aGUgcHJvY2VzcyBpbiB0aGUgQ0RSIGNvbXBsZXRlcywgcmVzdW1lIGNvbW1hbmQgZXZhbHVh dGlvbi4iKQogCiA7OzsgRnVuY3Rpb25zOgogCi0oZGVmc3Vic3QgZXNoZWxsLWludGVyYWN0 aXZlLXByb2Nlc3MgKCkKLSAgIlJldHVybiBjdXJyZW50bHkgcnVubmluZyBjb21tYW5kIHBy b2Nlc3MsIGlmIG5vbi1MaXNwLiIKLSAgZXNoZWxsLWxhc3QtYXN5bmMtcHJvYykKKyhkZWZz dWJzdCBlc2hlbGwtaW50ZXJhY3RpdmUtcHJvY2Vzcy1wICgpCisgICJSZXR1cm4gbm9uLW5p bCBpZiB0aGVyZSBpcyBhIGN1cnJlbnRseSBydW5uaW5nIGNvbW1hbmQgcHJvY2Vzcy4iCisg IGVzaGVsbC1sYXN0LWFzeW5jLXByb2NzKQorCisoZGVmc3Vic3QgZXNoZWxsLWhlYWQtcHJv Y2VzcyAoKQorICAiUmV0dXJuIHRoZSBjdXJyZW50bHkgcnVubmluZyBwcm9jZXNzIGF0IHRo ZSBoZWFkIG9mIGFueSBwaXBlbGluZS4KK1RoaXMgb25seSByZXR1cm5zIGV4dGVybmFsIChu b24tTGlzcCkgcHJvY2Vzc2VzLiIKKyAgKGNhci1zYWZlIGVzaGVsbC1sYXN0LWFzeW5jLXBy b2NzKSkKKworKGRlZnN1YnN0IGVzaGVsbC10YWlsLXByb2Nlc3MgKCkKKyAgIlJldHVybiB0 aGUgY3VycmVudGx5IHJ1bm5pbmcgcHJvY2VzcyBhdCB0aGUgdGFpbCBvZiBhbnkgcGlwZWxp bmUuCitUaGlzIG9ubHkgcmV0dXJucyBleHRlcm5hbCAobm9uLUxpc3ApIHByb2Nlc3Nlcy4i CisgIChjZHItc2FmZSBlc2hlbGwtbGFzdC1hc3luYy1wcm9jcykpCisKKyhkZWZpbmUtb2Jz b2xldGUtZnVuY3Rpb24tYWxpYXMgJ2VzaGVsbC1pbnRlcmFjdGl2ZS1wcm9jZXNzCisgICdl c2hlbGwtdGFpbC1wcm9jZXNzICIyOS4xIikKIAogKGRlZnVuIGVzaGVsbC1jbWQtaW5pdGlh bGl6ZSAoKSAgICAgO0NhbGxlZCBmcm9tIGBlc2hlbGwtbW9kZScgdmlhIGludGVybi1zb2Z0 IQogICAiSW5pdGlhbGl6ZSB0aGUgRXNoZWxsIGNvbW1hbmQgcHJvY2Vzc2luZyBtb2R1bGUu IgpAQCAtMjk1LDcgKzMxNCw3IEBAIGVzaGVsbC1jbWQtaW5pdGlhbGl6ZQogICAoc2V0cS1s b2NhbCBlc2hlbGwtY29tbWFuZC1hcmd1bWVudHMgbmlsKQogICAoc2V0cS1sb2NhbCBlc2hl bGwtbGFzdC1hcmd1bWVudHMgbmlsKQogICAoc2V0cS1sb2NhbCBlc2hlbGwtbGFzdC1jb21t YW5kLW5hbWUgbmlsKQotICAoc2V0cS1sb2NhbCBlc2hlbGwtbGFzdC1hc3luYy1wcm9jIG5p bCkKKyAgKHNldHEtbG9jYWwgZXNoZWxsLWxhc3QtYXN5bmMtcHJvY3MgbmlsKQogCiAgIChh ZGQtaG9vayAnZXNoZWxsLWtpbGwtaG9vayAjJ2VzaGVsbC1yZXN1bWUtY29tbWFuZCBuaWwg dCkKIApAQCAtMzA2LDcgKzMyNSw3IEBAIGVzaGVsbC1jbWQtaW5pdGlhbGl6ZQogICAoYWRk LWhvb2sgJ2VzaGVsbC1wb3N0LWNvbW1hbmQtaG9vawogICAgICAgICAgICAgKGxhbWJkYSAo KQogICAgICAgICAgICAgICAoc2V0cSBlc2hlbGwtY3VycmVudC1jb21tYW5kIG5pbAotICAg ICAgICAgICAgICAgICAgICBlc2hlbGwtbGFzdC1hc3luYy1wcm9jIG5pbCkpCisgICAgICAg ICAgICAgICAgICAgIGVzaGVsbC1sYXN0LWFzeW5jLXByb2NzIG5pbCkpCiAgICAgICAgICAg ICBuaWwgdCkKIAogICAoYWRkLWhvb2sgJ2VzaGVsbC1wYXJzZS1hcmd1bWVudC1ob29rCkBA IC03ODEsNiArODAwLDggQEAgZXNoZWxsLWRvLXBpcGVsaW5lcwogCQkgICAgICAoKGNkciBw aXBlbGluZSkgdCkKIAkJICAgICAgKHQgKHF1b3RlICdsYXN0KSkpKSkKICAgICAgICAgICAo bGV0ICgocHJvYyAsKGNhciBwaXBlbGluZSkpKQorICAgICAgICAgICAgLCh1bmxlc3Mgbm90 Zmlyc3QKKyAgICAgICAgICAgICAgICcoc2V0cSBoZWFkcHJvYyBwcm9jKSkKICAgICAgICAg ICAgIChzZXRxIHRhaWxwcm9jIChvciB0YWlscHJvYyBwcm9jKSkKICAgICAgICAgICAgIHBy b2MpKSkpKSkKIApAQCAtODIzLDcgKzg0NCw3IEBAICdlc2hlbGwtcHJvY2Vzcy1pZGVudGl0 eQogCiAoZGVmbWFjcm8gZXNoZWxsLWV4ZWN1dGUtcGlwZWxpbmUgKHBpcGVsaW5lKQogICAi RXhlY3V0ZSB0aGUgY29tbWFuZHMgaW4gUElQRUxJTkUsIGNvbm5lY3RpbmcgZWFjaCB0byBv bmUgYW5vdGhlci4iCi0gIGAobGV0ICgoZXNoZWxsLWluLXBpcGVsaW5lLXAgdCkgdGFpbHBy b2MpCisgIGAobGV0ICgoZXNoZWxsLWluLXBpcGVsaW5lLXAgdCkgaGVhZHByb2MgdGFpbHBy b2MpCiAgICAgIChwcm9nbgogICAgICAgICwoaWYgKGZib3VuZHAgJ21ha2UtcHJvY2VzcykK IAkgICAgYChlc2hlbGwtZG8tcGlwZWxpbmVzICxwaXBlbGluZSkKQEAgLTgzMyw3ICs4NTQs NyBAQCBlc2hlbGwtZXhlY3V0ZS1waXBlbGluZQogCQkJCShjYXIgKGFyZWYgZXNoZWxsLWN1 cnJlbnQtaGFuZGxlcwogCQkJCQkgICAsZXNoZWxsLWVycm9yLWhhbmRsZSkpIG5pbCkpKQog CSAgICAgKGVzaGVsbC1kby1waXBlbGluZXMtc3luY2hyb25vdXNseSAscGlwZWxpbmUpKSkK LSAgICAgICAoZXNoZWxsLXByb2Nlc3MtaWRlbnRpdHkgdGFpbHByb2MpKSkpCisgICAgICAg KGVzaGVsbC1wcm9jZXNzLWlkZW50aXR5IChjb25zIGhlYWRwcm9jIHRhaWxwcm9jKSkpKSkK IAogKGRlZm1hY3JvIGVzaGVsbC1hcy1zdWJjb21tYW5kIChjb21tYW5kKQogICAiRXhlY3V0 ZSBDT01NQU5EIHVzaW5nIGEgdGVtcCBidWZmZXIuCkBAIC05OTMsMjQgKzEwMTQsMjQgQEAg ZXNoZWxsLXJlc3VtZS1jb21tYW5kCiAgICAgKHVubGVzcyAob3IgKG5vdCAoc3RyaW5ncCBz dGF0dXMpKQogCQkoc3RyaW5nPSAic3RvcHBlZCIgc3RhdHVzKQogCQkoc3RyaW5nLW1hdGNo IGVzaGVsbC1yZXNldC1zaWduYWxzIHN0YXR1cykpCi0gICAgICAoaWYgKGVxIHByb2MgKGVz aGVsbC1pbnRlcmFjdGl2ZS1wcm9jZXNzKSkKKyAgICAgIChpZiAoZXEgcHJvYyAoZXNoZWxs LXRhaWwtcHJvY2VzcykpCiAJICAoZXNoZWxsLXJlc3VtZS1ldmFsKSkpKSkKIAogKGRlZnVu IGVzaGVsbC1yZXN1bWUtZXZhbCAoKQogICAiRGVzdHJ1Y3RpdmVseSBldmFsdWF0ZSBhIGZv cm0gd2hpY2ggbWF5IG5lZWQgdG8gYmUgZGVmZXJyZWQuIgogICAoZXNoZWxsLWNvbmRpdGlv bi1jYXNlIGVycgogICAgICAgKHByb2duCi0JKHNldHEgZXNoZWxsLWxhc3QtYXN5bmMtcHJv YyBuaWwpCisJKHNldHEgZXNoZWxsLWxhc3QtYXN5bmMtcHJvY3MgbmlsKQogCSh3aGVuIGVz aGVsbC1jdXJyZW50LWNvbW1hbmQKIAkgIChsZXQqIChyZXR2YWwKLQkJIChwcm9jIChjYXRj aCAnZXNoZWxsLWRlZmVyCisJCSAocHJvY3MgKGNhdGNoICdlc2hlbGwtZGVmZXIKIAkJCSAo aWdub3JlCiAJCQkgIChzZXRxIHJldHZhbAogCQkJCShlc2hlbGwtZG8tZXZhbAogCQkJCSBl c2hlbGwtY3VycmVudC1jb21tYW5kKSkpKSkpCi0JICAgIChpZiAoZXNoZWxsLXByb2Nlc3Nw IHByb2MpCi0JCShpZ25vcmUgKHNldHEgZXNoZWxsLWxhc3QtYXN5bmMtcHJvYyBwcm9jKSkK LQkgICAgICAoY2FkciByZXR2YWwpKSkpKQorICAgICAgICAgICAoaWYgKGVzaGVsbC1wcm9j ZXNzLXBhaXItcCBwcm9jcykKKyAgICAgICAgICAgICAgIChpZ25vcmUgKHNldHEgZXNoZWxs LWxhc3QtYXN5bmMtcHJvY3MgcHJvY3MpKQorICAgICAgICAgICAgIChjYWRyIHJldHZhbCkp KSkpCiAgICAgKGVycm9yCiAgICAgIChlcnJvciAoZXJyb3ItbWVzc2FnZS1zdHJpbmcgZXJy KSkpKSkKIApAQCAtMTE3MywxNyArMTE5NCwxNiBAQCBlc2hlbGwtZG8tZXZhbAogCQkgICAg KHNldGNhciBmb3JtIChjYXIgbmV3LWZvcm0pKQogCQkgICAgKHNldGNkciBmb3JtIChjZHIg bmV3LWZvcm0pKSkKIAkJICAoZXNoZWxsLWRvLWV2YWwgZm9ybSBzeW5jaHJvbm91cy1wKSkK LQkgICAgICAoaWYgKGFuZCAobWVtcSAoY2FyIGZvcm0pIGVzaGVsbC1kZWZlcnJhYmxlLWNv bW1hbmRzKQotCQkgICAgICAgKG5vdCBlc2hlbGwtY3VycmVudC1zdWJqb2ItcCkKLQkJICAg ICAgIHJlc3VsdAotCQkgICAgICAgKGVzaGVsbC1wcm9jZXNzcCByZXN1bHQpKQotCQkgIChp ZiBzeW5jaHJvbm91cy1wCi0JCSAgICAgIChlc2hlbGwvd2FpdCByZXN1bHQpCisgICAgICAg ICAgICAgIChpZi1sZXQgKCgobWVtcSAoY2FyIGZvcm0pIGVzaGVsbC1kZWZlcnJhYmxlLWNv bW1hbmRzKSkKKyAgICAgICAgICAgICAgICAgICAgICAgKChub3QgZXNoZWxsLWN1cnJlbnQt c3Viam9iLXApKQorICAgICAgICAgICAgICAgICAgICAgICAocHJvY3MgKGVzaGVsbC1tYWtl LXByb2Nlc3MtcGFpciByZXN1bHQpKSkKKyAgICAgICAgICAgICAgICAgIChpZiBzeW5jaHJv bm91cy1wCisJCSAgICAgIChlc2hlbGwvd2FpdCAoY2RyIHByb2NzKSkKIAkJICAgIChlc2hl bGwtbWFuaXB1bGF0ZSAiaW5zZXJ0aW5nIGlnbm9yZSBmb3JtIgogCQkgICAgICAoc2V0Y2Fy IGZvcm0gJ2lnbm9yZSkKIAkJICAgICAgKHNldGNkciBmb3JtIG5pbCkpCi0JCSAgICAodGhy b3cgJ2VzaGVsbC1kZWZlciByZXN1bHQpKQotCQkobGlzdCAncXVvdGUgcmVzdWx0KSkpKSkp KSkpKSkpCisJCSAgICAodGhyb3cgJ2VzaGVsbC1kZWZlciBwcm9jcykpCisgICAgICAgICAg ICAgICAgKGxpc3QgJ3F1b3RlIHJlc3VsdCkpKSkpKSkpKSkpKQogCiA7OyBjb21tYW5kIGlu dm9jYXRpb24KIApkaWZmIC0tZ2l0IGEvbGlzcC9lc2hlbGwvZXNoLWlvLmVsIGIvbGlzcC9l c2hlbGwvZXNoLWlvLmVsCmluZGV4IDJlMGYzMTJmNGEuLjhlNjQ2M2VhYzIgMTAwNjQ0Ci0t LSBhL2xpc3AvZXNoZWxsL2VzaC1pby5lbAorKysgYi9saXNwL2VzaGVsbC9lc2gtaW8uZWwK QEAgLTQ4NSw3ICs0ODUsNyBAQCBlc2hlbGwtb3V0cHV0LW9iamVjdC10by10YXJnZXQKICAg ICgoZXNoZWxsLXByb2Nlc3NwIHRhcmdldCkKICAgICAod2hlbiAoZXEgKHByb2Nlc3Mtc3Rh dHVzIHRhcmdldCkgJ3J1bikKICAgICAgICh1bmxlc3MgKHN0cmluZ3Agb2JqZWN0KQotCShz ZXRxIG9iamVjdCAoZXNoZWxsLXN0cmluZ2lmeSBvYmplY3QpKSkKKyAgICAgICAoc2V0cSBv YmplY3QgKGVzaGVsbC1zdHJpbmdpZnkgb2JqZWN0KSkpCiAgICAgICAocHJvY2Vzcy1zZW5k LXN0cmluZyB0YXJnZXQgb2JqZWN0KSkpCiAKICAgICgoY29uc3AgdGFyZ2V0KQpkaWZmIC0t Z2l0IGEvbGlzcC9lc2hlbGwvZXNoLW1vZGUuZWwgYi9saXNwL2VzaGVsbC9lc2gtbW9kZS5l bAppbmRleCA4MzAyZWVmZTFlLi41OWM4ZjgwMzRmIDEwMDY0NAotLS0gYS9saXNwL2VzaGVs bC9lc2gtbW9kZS5lbAorKysgYi9saXNwL2VzaGVsbC9lc2gtbW9kZS5lbApAQCAtNDIzLDEz ICs0MjMsMTMgQEAgZXNoZWxsLXRvZ2dsZS1kaXJlY3Qtc2VuZAogKGRlZnVuIGVzaGVsbC1z ZWxmLWluc2VydC1jb21tYW5kICgpCiAgIChpbnRlcmFjdGl2ZSkKICAgKHByb2Nlc3Mtc2Vu ZC1zdHJpbmcKLSAgIChlc2hlbGwtaW50ZXJhY3RpdmUtcHJvY2VzcykKKyAgIChlc2hlbGwt aGVhZC1wcm9jZXNzKQogICAgKGNoYXItdG8tc3RyaW5nIChpZiAoc3ltYm9scCBsYXN0LWNv bW1hbmQtZXZlbnQpCiAJCSAgICAgICAoZ2V0IGxhc3QtY29tbWFuZC1ldmVudCAnYXNjaWkt Y2hhcmFjdGVyKQogCQkgICAgIGxhc3QtY29tbWFuZC1ldmVudCkpKSkKIAogKGRlZnVuIGVz aGVsbC1pbnRlcmNlcHQtY29tbWFuZHMgKCkKLSAgKHdoZW4gKGFuZCAoZXNoZWxsLWludGVy YWN0aXZlLXByb2Nlc3MpCisgICh3aGVuIChhbmQgKGVzaGVsbC1pbnRlcmFjdGl2ZS1wcm9j ZXNzLXApCiAJICAgICAobm90IChhbmQgKGludGVnZXJwIGxhc3QtaW5wdXQtZXZlbnQpCiAJ CSAgICAgICAobWVtcSBsYXN0LWlucHV0LWV2ZW50ICcoP1xDLXggP1xDLWMpKSkpKQogICAg IChsZXQgKChwb3NzaWJsZS1ldmVudHMgKHdoZXJlLWlzLWludGVybmFsIHRoaXMtY29tbWFu ZCkpCkBAIC01OTUsMTMgKzU5NSwxMyBAQCBlc2hlbGwtc2VuZC1pbnB1dAogbmV3bGluZS4i CiAgIChpbnRlcmFjdGl2ZSAiUCIpCiAgIDs7IE5vdGUgdGhhdCB0aGUgaW5wdXQgc3RyaW5n IGRvZXMgbm90IGluY2x1ZGUgaXRzIHRlcm1pbmFsIG5ld2xpbmUuCi0gIChsZXQgKChwcm9j LXJ1bm5pbmctcCAoYW5kIChlc2hlbGwtaW50ZXJhY3RpdmUtcHJvY2VzcykKKyAgKGxldCAo KHByb2MtcnVubmluZy1wIChhbmQgKGVzaGVsbC1oZWFkLXByb2Nlc3MpCiAJCQkgICAgIChu b3QgcXVldWUtcCkpKQogCShpbmhpYml0LXBvaW50LW1vdGlvbi1ob29rcyB0KQogCShpbmhp Yml0LW1vZGlmaWNhdGlvbi1ob29rcyB0KSkKICAgICAodW5sZXNzIChhbmQgcHJvYy1ydW5u aW5nLXAKIAkJIChub3QgKGVxIChwcm9jZXNzLXN0YXR1cwotCQkJICAgKGVzaGVsbC1pbnRl cmFjdGl2ZS1wcm9jZXNzKSkKKwkJCSAgIChlc2hlbGwtaGVhZC1wcm9jZXNzKSkKICAgICAg ICAgICAgICAgICAgICAgICAgICAgJ3J1bikpKQogICAgICAgKGlmIChvciBwcm9jLXJ1bm5p bmctcAogCSAgICAgICg+PSAocG9pbnQpIGVzaGVsbC1sYXN0LW91dHB1dC1lbmQpKQpAQCAt NjI3LDggKzYyNyw4IEBAIGVzaGVsbC1zZW5kLWlucHV0CiAJICAgIChpZiAob3IgZXNoZWxs LXNlbmQtZGlyZWN0LXRvLXN1YnByb2Nlc3NlcwogCQkgICAgKD0gZXNoZWxsLWxhc3QtaW5w dXQtc3RhcnQgZXNoZWxsLWxhc3QtaW5wdXQtZW5kKSkKIAkJKHVubGVzcyBuby1uZXdsaW5l Ci0JCSAgKHByb2Nlc3Mtc2VuZC1zdHJpbmcgKGVzaGVsbC1pbnRlcmFjdGl2ZS1wcm9jZXNz KSAiXG4iKSkKLQkgICAgICAocHJvY2Vzcy1zZW5kLXJlZ2lvbiAoZXNoZWxsLWludGVyYWN0 aXZlLXByb2Nlc3MpCisJCSAgKHByb2Nlc3Mtc2VuZC1zdHJpbmcgKGVzaGVsbC1oZWFkLXBy b2Nlc3MpICJcbiIpKQorCSAgICAgIChwcm9jZXNzLXNlbmQtcmVnaW9uIChlc2hlbGwtaGVh ZC1wcm9jZXNzKQogCQkJCSAgIGVzaGVsbC1sYXN0LWlucHV0LXN0YXJ0CiAJCQkJICAgZXNo ZWxsLWxhc3QtaW5wdXQtZW5kKSkpCiAJKGlmICg9IGVzaGVsbC1sYXN0LW91dHB1dC1lbmQg KHBvaW50KSkKQEAgLTY2NSw2ICs2NjUsMTYgQEAgZXNoZWxsLXNlbmQtaW5wdXQKIAkgICAg ICAgKHJ1bi1ob29rcyAnZXNoZWxsLXBvc3QtY29tbWFuZC1ob29rKQogCSAgICAgICAoaW5z ZXJ0LWFuZC1pbmhlcml0IGlucHV0KSkpKSkpKSkpCiAKKyhkZWZ1biBlc2hlbGwtc2VuZC1l b2YtdG8tcHJvY2VzcyAoKQorICAiU2VuZCBFT0YgdG8gdGhlIGN1cnJlbnRseS1ydW5uaW5n IFwiaGVhZFwiIHByb2Nlc3MuIgorICAoaW50ZXJhY3RpdmUpCisgIChyZXF1aXJlICdlc2gt bW9kZSkKKyAgKGRlY2xhcmUtZnVuY3Rpb24gZXNoZWxsLXNlbmQtaW5wdXQgImVzaC1tb2Rl IgorICAgICAgICAgICAgICAgICAgICAoJm9wdGlvbmFsIHVzZS1yZWdpb24gcXVldWUtcCBu by1uZXdsaW5lKSkKKyAgKGVzaGVsbC1zZW5kLWlucHV0IG5pbCBuaWwgdCkKKyAgKHdoZW4g KGVzaGVsbC1oZWFkLXByb2Nlc3MpCisgICAgKHByb2Nlc3Mtc2VuZC1lb2YgKGVzaGVsbC1o ZWFkLXByb2Nlc3MpKSkpCisKIChkZWZzdWJzdCBlc2hlbGwta2lsbC1uZXcgKCkKICAgIkFk ZCB0aGUgbGFzdCBpbnB1dCB0ZXh0IHRvIHRoZSBraWxsIHJpbmcuIgogICAoa2lsbC1yaW5n LXNhdmUgZXNoZWxsLWxhc3QtaW5wdXQtc3RhcnQgZXNoZWxsLWxhc3QtaW5wdXQtZW5kKSkK QEAgLTkyNCw5ICs5MzQsOSBAQCBlc2hlbGwtc2VuZC1pbnZpc2libGUKICAgKGludGVyYWN0 aXZlKSA7IERvbid0IHBhc3Mgc3RyIGFzIGFyZ3VtZW50LCB0byBhdm9pZCBzbm9vcGluZyB2 aWEgQy14IEVTQyBFU0MKICAgKGxldCAoKHN0ciAocmVhZC1wYXNzd2QKIAkgICAgICAoZm9y bWF0ICIlcyBQYXNzd29yZDogIgotCQkgICAgICAocHJvY2Vzcy1uYW1lIChlc2hlbGwtaW50 ZXJhY3RpdmUtcHJvY2VzcykpKSkpKQorCQkgICAgICAocHJvY2Vzcy1uYW1lIChlc2hlbGwt aGVhZC1wcm9jZXNzKSkpKSkpCiAgICAgKGlmIChzdHJpbmdwIHN0cikKLQkocHJvY2Vzcy1z ZW5kLXN0cmluZyAoZXNoZWxsLWludGVyYWN0aXZlLXByb2Nlc3MpCisJKHByb2Nlc3Mtc2Vu ZC1zdHJpbmcgKGVzaGVsbC1oZWFkLXByb2Nlc3MpCiAJCQkgICAgIChjb25jYXQgc3RyICJc biIpKQogICAgICAgKG1lc3NhZ2UgIldhcm5pbmc6IHRleHQgd2lsbCBiZSBlY2hvZWQiKSkp KQogCkBAIC05MzcsNyArOTQ3LDcgQEAgZXNoZWxsLXdhdGNoLWZvci1wYXNzd29yZC1wcm9t cHQKIGBlc2hlbGwtcGFzc3dvcmQtcHJvbXB0LXJlZ2V4cCcuCiAKIFRoaXMgZnVuY3Rpb24g Y291bGQgYmUgaW4gdGhlIGxpc3QgYGVzaGVsbC1vdXRwdXQtZmlsdGVyLWZ1bmN0aW9ucycu IgotICAod2hlbiAoZXNoZWxsLWludGVyYWN0aXZlLXByb2Nlc3MpCisgICh3aGVuIChlc2hl bGwtaW50ZXJhY3RpdmUtcHJvY2Vzcy1wKQogICAgIChzYXZlLWV4Y3Vyc2lvbgogICAgICAg KGxldCAoKGNhc2UtZm9sZC1zZWFyY2ggdCkpCiAJKGdvdG8tY2hhciBlc2hlbGwtbGFzdC1v dXRwdXQtYmxvY2stYmVnaW4pCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lc2gtcHJvYy5l bCBiL2xpc3AvZXNoZWxsL2VzaC1wcm9jLmVsCmluZGV4IDVlZDY5MmZiNWEuLmJiMjEzNmMw NmMgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2VzaC1wcm9jLmVsCisrKyBiL2xpc3AvZXNo ZWxsL2VzaC1wcm9jLmVsCkBAIC0xMDEsNiArMTAxLDggQEAgZXNoZWxsLWN1cnJlbnQtc3Vi am9iLXAKIChkZWZ2YXIgZXNoZWxsLXByb2Nlc3MtbGlzdCBuaWwKICAgIkEgbGlzdCBvZiB0 aGUgY3VycmVudCBzdGF0dXMgb2Ygc3VicHJvY2Vzc2VzLiIpCiAKKyhkZWNsYXJlLWZ1bmN0 aW9uIGVzaGVsbC1zZW5kLWVvZi10by1wcm9jZXNzICJlc2gtbW9kZSIpCisKIChkZWZ2YXIt a2V5bWFwIGVzaGVsbC1wcm9jLW1vZGUtbWFwCiAgICJDLWMgTS1pIiAgIydlc2hlbGwtaW5z ZXJ0LXByb2Nlc3MKICAgIkMtYyBDLWMiICAjJ2VzaGVsbC1pbnRlcnJ1cHQtcHJvY2VzcwpA QCAtNTQyLDE0ICs1NDQsNSBAQCBlc2hlbGwtcXVpdC1wcm9jZXNzCiA7ICAgIDs7IGBlc2hl bGwtcmVzdW1lLWV2YWwnLgogOyAgICAoZXNoZWxsLWtpbGwtcHJvY2Vzcy1mdW5jdGlvbiBu aWwgImNvbnRpbnVlIikpKQogCi0oZGVmdW4gZXNoZWxsLXNlbmQtZW9mLXRvLXByb2Nlc3Mg KCkKLSAgIlNlbmQgRU9GIHRvIHByb2Nlc3MuIgotICAoaW50ZXJhY3RpdmUpCi0gIChyZXF1 aXJlICdlc2gtbW9kZSkKLSAgKGRlY2xhcmUtZnVuY3Rpb24gZXNoZWxsLXNlbmQtaW5wdXQg ImVzaC1tb2RlIgotICAgICAgICAgICAgICAgICAgICAoJm9wdGlvbmFsIHVzZS1yZWdpb24g cXVldWUtcCBuby1uZXdsaW5lKSkKLSAgKGVzaGVsbC1zZW5kLWlucHV0IG5pbCBuaWwgdCkK LSAgKGVzaGVsbC1wcm9jZXNzLWludGVyYWN0ICdwcm9jZXNzLXNlbmQtZW9mKSkKLQogKHBy b3ZpZGUgJ2VzaC1wcm9jKQogOzs7IGVzaC1wcm9jLmVsIGVuZHMgaGVyZQpkaWZmIC0tZ2l0 IGEvbGlzcC9lc2hlbGwvZXNoLXV0aWwuZWwgYi9saXNwL2VzaGVsbC9lc2gtdXRpbC5lbApp bmRleCAwZTA0ZGJjN2M5Li43ODg0MDRmYzQzIDEwMDY0NAotLS0gYS9saXNwL2VzaGVsbC9l c2gtdXRpbC5lbAorKysgYi9saXNwL2VzaGVsbC9lc2gtdXRpbC5lbApAQCAtNjA5LDYgKzYw OSwyMCBAQCBlc2hlbGwtcHJvY2Vzc3AKICAgIklmIHRoZSBgcHJvY2Vzc3AnIGZ1bmN0aW9u IGRvZXMgbm90IGV4aXN0LCBQUk9DIGlzIG5vdCBhIHByb2Nlc3MuIgogICAoYW5kIChmYm91 bmRwICdwcm9jZXNzcCkgKHByb2Nlc3NwIHByb2MpKSkKIAorKGRlZnVuIGVzaGVsbC1wcm9j ZXNzLXBhaXItcCAocHJvY3MpCisgICJSZXR1cm4gbm9uLW5pbCBpZiBQUk9DUyBpcyBhIHBh aXIgb2YgcHJvY2VzcyBvYmplY3RzLiIKKyAgKGFuZCAoY29uc3AgcHJvY3MpCisgICAgICAg KGVzaGVsbC1wcm9jZXNzcCAoY2FyIHByb2NzKSkKKyAgICAgICAoZXNoZWxsLXByb2Nlc3Nw IChjZHIgcHJvY3MpKSkpCisKKyhkZWZ1biBlc2hlbGwtbWFrZS1wcm9jZXNzLXBhaXIgKHBy b2NzKQorICAiTWFrZSBhIHBhaXIgb2YgcHJvY2VzcyBvYmplY3RzIGZyb20gUFJPQ1MgaWYg cG9zc2libGUuCitUaGlzIHJlcHJlc2VudHMgdGhlIGhlYWQgYW5kIHRhaWwgb2YgYSBwaXBl bGluZSBvZiBwcm9jZXNzZXMsCit3aGVyZSB0aGUgaGVhZCBhbmQgdGFpbCBtYXkgYmUgdGhl IHNhbWUgcHJvY2Vzcy4iCisgIChwY2FzZSBwcm9jcworICAgICgocHJlZCBlc2hlbGwtcHJv Y2Vzc3ApIChjb25zIHByb2NzIHByb2NzKSkKKyAgICAoKHByZWQgZXNoZWxsLXByb2Nlc3Mt cGFpci1wKSBwcm9jcykpKQorCiA7OyAoZGVmdW4gZXNoZWxsLWNvcHktZmlsZQogOzsgICAo ZmlsZSBuZXduYW1lICZvcHRpb25hbCBvay1pZi1hbHJlYWR5LWV4aXN0cyBrZWVwLWRhdGUp CiA7OyAgICJDb3B5IEZJTEUgdG8gTkVXTkFNRS4gIFNlZSBkb2NzIGZvciBgY29weS1maWxl Jy4iCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lc2hlbGwuZWwgYi9saXNwL2VzaGVsbC9l c2hlbGwuZWwKaW5kZXggNWMzNTZlODkyOC4uMmM0NzJhMmFmYSAxMDA2NDQKLS0tIGEvbGlz cC9lc2hlbGwvZXNoZWxsLmVsCisrKyBiL2xpc3AvZXNoZWxsL2VzaGVsbC5lbApAQCAtMzMy LDkgKzMzMiw5IEBAIGVzaGVsbC1jb21tYW5kCiAJOzsgbWFrZSB0aGUgb3V0cHV0IGFzIGF0 dHJhY3RpdmUgYXMgcG9zc2libGUsIHdpdGggbm8KIAk7OyBleHRyYW5lb3VzIG5ld2xpbmVz CiAJKHdoZW4gaW50cgotCSAgKGlmIChlc2hlbGwtaW50ZXJhY3RpdmUtcHJvY2VzcykKLQkg ICAgICAoZXNoZWxsLXdhaXQtZm9yLXByb2Nlc3MgKGVzaGVsbC1pbnRlcmFjdGl2ZS1wcm9j ZXNzKSkpCi0JICAoY2wtYXNzZXJ0IChub3QgKGVzaGVsbC1pbnRlcmFjdGl2ZS1wcm9jZXNz KSkpCisJICAoaWYgKGVzaGVsbC1pbnRlcmFjdGl2ZS1wcm9jZXNzLXApCisJICAgICAgKGVz aGVsbC13YWl0LWZvci1wcm9jZXNzIChlc2hlbGwtdGFpbC1wcm9jZXNzKSkpCisJICAoY2wt YXNzZXJ0IChub3QgKGVzaGVsbC1pbnRlcmFjdGl2ZS1wcm9jZXNzLXApKSkKIAkgIChnb3Rv LWNoYXIgKHBvaW50LW1heCkpCiAJICAod2hpbGUgKGFuZCAoYm9scCkgKG5vdCAoYm9icCkp KQogCSAgICAoZGVsZXRlLWNoYXIgLTEpKSkKZGlmZiAtLWdpdCBhL3Rlc3QvbGlzcC9lc2hl bGwvZXNoZWxsLXRlc3RzLmVsIGIvdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwK aW5kZXggNzY1OGQ1ZjU1MS4uM2IxYmJlNzE4OCAxMDA2NDQKLS0tIGEvdGVzdC9saXNwL2Vz aGVsbC9lc2hlbGwtdGVzdHMuZWwKKysrIGIvdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVz dHMuZWwKQEAgLTEzNiw2ICsxMzYsMTcgQEAgZXNoZWxsLXRlc3QvcGlwZS10YWlscHJvYwog ICAgKGVzaGVsbC1jb21tYW5kLXJlc3VsdC1wICIqZWNobyBoaSB8IGVjaG8gYnllIgogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICJieWVcbmhpXG4iKSkpCiAKKyhlcnQtZGVmdGVz dCBlc2hlbGwtdGVzdC9waXBlLWhlYWRwcm9jLXN0ZGluICgpCisgICJDaGVjayB0aGF0IHN0 YW5kYXJkIGlucHV0IGlzIHNlbnQgdG8gdGhlIGhlYWQgcHJvY2VzcyBpbiBhIHBpcGVsaW5l IgorICAoc2tpcC11bmxlc3MgKGFuZCAoZXhlY3V0YWJsZS1maW5kICJ0ciIpCisgICAgICAg ICAgICAgICAgICAgIChleGVjdXRhYmxlLWZpbmQgInJldiIpKSkKKyAgKHdpdGgtdGVtcC1l c2hlbGwKKyAgIChlc2hlbGwtaW5zZXJ0LWNvbW1hbmQgInRyIGEteiBBLVogfCByZXYiKQor ICAgKGVzaGVsbC1pbnNlcnQtY29tbWFuZCAiaGVsbG8iKQorICAgKGVzaGVsbC1zZW5kLWVv Zi10by1wcm9jZXNzKQorICAgKGVzaGVsbC13YWl0LWZvci1zdWJwcm9jZXNzKQorICAgKGVz aGVsbC1tYXRjaC1yZXN1bHQgIk9MTEVIXG4iKSkpCisKIChlcnQtZGVmdGVzdCBlc2hlbGwt dGVzdC93aW5kb3ctaGVpZ2h0ICgpCiAgICIkTElORVMgc2hvdWxkIGVxdWFsICh3aW5kb3ct aGVpZ2h0KSIKICAgKHNob3VsZCAoZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1bHQgIj0gJExJ TkVTICh3aW5kb3ctaGVpZ2h0KSIpKSkKLS0gCjIuMjUuMQoK --------------7D41F0D6D5DFA979DC54248A-- From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 02 13:10:35 2022 Received: (at 53715) by debbugs.gnu.org; 2 Feb 2022 18:10:35 +0000 Received: from localhost ([127.0.0.1]:53453 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFK5T-0000NI-5z for submit@debbugs.gnu.org; Wed, 02 Feb 2022 13:10:35 -0500 Received: from quimby.gnus.org ([95.216.78.240]:42344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFK5R-0000N1-Jf for 53715@debbugs.gnu.org; Wed, 02 Feb 2022 13:10:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Yrc9IaEVBhqj+vAZEs+O7DYOUoEbaihLNQjzLp2jLGc=; b=dvGzmBplJ1qnqOcXEFXj2GPUbQ FvThbkWSNhdmxsRWychroJsKRTkSo0VPSSq2cFsdvd84LTN0Q1R4yYDjRfpe70jxVD9J29MYu+2dn X8wkfV+eGWtiOh7DwEaYUF7n1/eedNVTCD3RvQjEjm8gFiqNUVhGBJR95aEJqnbTCVpU=; Received: from [84.212.220.105] (helo=giant) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nFK5I-0006aQ-VL; Wed, 02 Feb 2022 19:10:27 +0100 From: Lars Ingebrigtsen To: Jim Porter Subject: Re: bug#53715: 29.0.50; [PATCH] Improve correctness of pipelines in Eshell References: <75056e6b-c739-a48c-2bf8-56ddc456da8e@gmail.com> X-Now-Playing: The Residents's _Intruders_: "Frank's Lament" Date: Wed, 02 Feb 2022 19:10:22 +0100 In-Reply-To: <75056e6b-c739-a48c-2bf8-56ddc456da8e@gmail.com> (Jim Porter's message of "Tue, 1 Feb 2022 19:32:10 -0800") Message-ID: <871r0lrvg1.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Jim Porter writes: > This happens because Eshell only keeps track of the tail process when > running an external process, so when sending stdin, it gets sent to > the tail process (`rev'), not the head (`tr'). I fixed t [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 53715 Cc: 53715@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Jim Porter writes: > This happens because Eshell only keeps track of the tail process when > running an external process, so when sending stdin, it gets sent to > the tail process (`rev'), not the head (`tr'). I fixed this in the > second patch by recording both the head and tail processes and > updating the various places that use the current process to use the > right one. These patches seem to lead to a number of tests failing: Test eshell-test/last-result-var2 condition: (void-variable eshell-last-async-proc) FAILED 22/34 eshell-test/last-result-var2 (0.001074 sec) at lisp/eshell/eshell-tests.el:164 passed 23/34 eshell-test/lisp-command (0.000350 sec) passed 24/34 eshell-test/lisp-command-args (0.000308 sec) -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 02 14:41:43 2022 Received: (at 53715) by debbugs.gnu.org; 2 Feb 2022 19:41:43 +0000 Received: from localhost ([127.0.0.1]:53700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFLVf-000895-Dj for submit@debbugs.gnu.org; Wed, 02 Feb 2022 14:41:43 -0500 Received: from mail-pj1-f50.google.com ([209.85.216.50]:52090) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFLVd-00088p-0s for 53715@debbugs.gnu.org; Wed, 02 Feb 2022 14:41:42 -0500 Received: by mail-pj1-f50.google.com with SMTP id q63so300720pja.1 for <53715@debbugs.gnu.org>; Wed, 02 Feb 2022 11:41:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:to:cc:references:from:message-id:date:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=f5KhAOUmAB4hF6tzerebLSex2nHg1eIqPvg+IkXE2Y4=; b=o2BrCJuKVtmS2xWwsNp5PgX7s+b15rrHOND9p9QmwiqD4tb69lh41V1z29BmiWMQul yHCU8O71oiX5rDG/3UKyff6yX58GtF5L56fi3if3AGwEGpIPFdTw0tj4/rYezp/3mgMg hPNdPYbV7hb1J7axvwsJ8Z5DbS8xfBHrkSPPwulCAx5V0ky0DTasJZwT9QZ/gm84DrJK HE2JWab4G2wCv0psICWw/FavokLeu4PEmc5clcqLqClMLraybk8n7vcq8QrnW0ZSQ0b6 D9vocClJBbF3XjjqJ7tZXAux5xVTLiMVwcciSgJyW35ua9BPSRdHJzQh2JM5bnjBsVFV U17Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=f5KhAOUmAB4hF6tzerebLSex2nHg1eIqPvg+IkXE2Y4=; b=ejB2QURIW5uT4tgtxWzreYA/Cjk0ZSDSseYTRmW/JtpoN6K5D5DaEfVXISb7JgOGQs UD/w37HxCnPZvdaJQwGc22VigeJwtXlXwU0Tqt/cPrsBq0dR24aPckmo+yH+x4sSPuOR t6NZi5FR9aYh57ssdpeWzKhO0v9WnDL49Zv3a1IwckWllUkbzAwcB9uE3KFex/0agfzk ivm+9XdRI8HgfI70PY+i+qk7vfdH9ZA3wNNQTCd09iOlqpe/L5z1knDIGC5/o4MOgVxs SqvIDvkz5K/A4oIMM9EmNMquI0Vht54U/KnKbhvZW8NHHjZKyXsP2BAZkftLZ0tDKoQj 9cfw== X-Gm-Message-State: AOAM530a0LW9weDB1uxCPruGNnjhAxbETP2ILpPbr0qNzg4RojOi6uvs kn/DJbiFn6SfEB6hj1xk2E3BdRxR56AIBQ== X-Google-Smtp-Source: ABdhPJygYnJHyOZtZUZKR0N5rt90PzAX9Vyf5N/Q1BuKu2P0ZKWP69d3g19Omm/DmahDmyEZdOsDEQ== X-Received: by 2002:a17:90b:3803:: with SMTP id mq3mr9653454pjb.95.1643830895146; Wed, 02 Feb 2022 11:41:35 -0800 (PST) Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id q15sm7165084pjj.19.2022.02.02.11.41.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 02 Feb 2022 11:41:34 -0800 (PST) Subject: Re: bug#53715: 29.0.50; [PATCH] Improve correctness of pipelines in Eshell To: Lars Ingebrigtsen References: <75056e6b-c739-a48c-2bf8-56ddc456da8e@gmail.com> <871r0lrvg1.fsf@gnus.org> From: Jim Porter Message-ID: <4733b4db-705c-2b52-e1e6-68b0902f87d3@gmail.com> Date: Wed, 2 Feb 2022 11:41:33 -0800 MIME-Version: 1.0 In-Reply-To: <871r0lrvg1.fsf@gnus.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53715 Cc: 53715@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 2/2/2022 10:10 AM, Lars Ingebrigtsen wrote: > These patches seem to lead to a number of tests failing: > > Test eshell-test/last-result-var2 condition: > (void-variable eshell-last-async-proc) > FAILED 22/34 eshell-test/last-result-var2 (0.001074 sec) at lisp/eshell/eshell-tests.el:164 > passed 23/34 eshell-test/lisp-command (0.000350 sec) > passed 24/34 eshell-test/lisp-command-args (0.000308 sec) Sorry, I forgot to mention that since the second patch updates a defsubst (`eshell-interactive-process'), you'll need to recompile all the files that might use it, so `make boostrap' or `touch lisp/eshell/*.el test/lisp/eshell/*.el && make'. That should make these tests pass. Once this merges, I'll send a message to emacs-devel to let everyone know to recompile these files so there are no surprises when they try to use Eshell later on. From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 02 14:50:09 2022 Received: (at 53715) by debbugs.gnu.org; 2 Feb 2022 19:50:09 +0000 Received: from localhost ([127.0.0.1]:53712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFLdo-0008PG-RV for submit@debbugs.gnu.org; Wed, 02 Feb 2022 14:50:09 -0500 Received: from quimby.gnus.org ([95.216.78.240]:43352) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFLdn-0008Ou-3V for 53715@debbugs.gnu.org; Wed, 02 Feb 2022 14:50:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=4/4TUbUcUz2MpZqeYy2eKwbutiTvwSvtJXvRIPGOs9w=; b=THGP1cRdY8Q/0N/N20K0NGES8a 5ipF4ZU2EZCdj1TnDWQOBflatoSaFZvRSSfjxExvlVtsTDhFddTntvY+e8M7/XDGNJxv1rtgUXXWa atu/Ew4hRL5ztmtKoQTUu0JCVvTpMlWjCWdBD4S5yBvVZG2E6DGkROEY4vb62owLdpO4=; Received: from [84.212.220.105] (helo=giant) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nFLde-0007bs-A5; Wed, 02 Feb 2022 20:50:01 +0100 From: Lars Ingebrigtsen To: Jim Porter Subject: Re: bug#53715: 29.0.50; [PATCH] Improve correctness of pipelines in Eshell References: <75056e6b-c739-a48c-2bf8-56ddc456da8e@gmail.com> <871r0lrvg1.fsf@gnus.org> <4733b4db-705c-2b52-e1e6-68b0902f87d3@gmail.com> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAD1BMVEX7bDxOZ1OdqVDV c0b/////GX2jAAAAAWJLR0QEj2jZUQAAAAd0SU1FB+YCAhMlJviegecAAAGVSURBVDjLdZOJsYUg DEUjNGBIA4INgPTf279Z0Lf9zDg6OWS7QSLixjRK3Tc2K3POTrAsdFGlxMnBiUddlKS1dozO2YG+ JDHRaGaFCY7KZRNN/AB8Vt4Ty7bDpeAyt4MDhwEq+ggAQ2u8Uy4ZJ4aCdIOKbpKgw1EVtFq8CABG QmnS5gDCcJBtBHu9gfofGFx/g9yHgjoWKKUWDALdDFjM8Q2yAiGdQ0EzsKl+mJw7PQMOXQFm3KCL gah+KkAyjQjgId3BJlDLU3lIFQfptDkdaAyzAzK5F5g0xwLTTTuxyKSzko+iV0WBXhel2uxJcSVW XvQ/repxa+jVPRsuR6EUwOrotm0sPDkAzl7NiqmimXfflwFLDZ+1GIvSz2YLxcWxLoS2AEUB0jsY UR0N7ewgyQcQA4f+Dib7Armw3xorriCKX7zE0Tq0RifiMDhk4nfqn0BcPgnPA9gV7yFvN3AMP3uV vhZiB6KRw5XmB/RXcC2QNMcD4me3iAXEr+I3KFja4BtcD7i90e4N6hsoLxHtNtPtt/0BL0RR8q+q zVgAAAAldEVYdGRhdGU6Y3JlYXRlADIwMjItMDItMDJUMTk6Mzc6MzgrMDA6MDANHFOCAAAAJXRF WHRkYXRlOm1vZGlmeQAyMDIyLTAyLTAyVDE5OjM3OjM4KzAwOjAwfEHrPgAAAABJRU5ErkJggg== X-Now-Playing: Sacred Paws's _Run Around The Sun_: "What's So Wrong" Date: Wed, 02 Feb 2022 20:49:57 +0100 In-Reply-To: <4733b4db-705c-2b52-e1e6-68b0902f87d3@gmail.com> (Jim Porter's message of "Wed, 2 Feb 2022 11:41:33 -0800") Message-ID: <87wnidnj4q.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Jim Porter writes: > Sorry, I forgot to mention that since the second patch updates a > defsubst (`eshell-interactive-process'), you'll need to recompile all > the files that might use it, so `make boostrap' or `touch > [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 53715 Cc: 53715@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Jim Porter writes: > Sorry, I forgot to mention that since the second patch updates a > defsubst (`eshell-interactive-process'), you'll need to recompile all > the files that might use it, so `make boostrap' or `touch > lisp/eshell/*.el test/lisp/eshell/*.el && make'. That should make > these tests pass. I did remove all the .elc files in lisp/eshell and rebuilt, but the tests still failed. (I didn't try to delete the test elc files, though.) -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 02 16:01:30 2022 Received: (at 53715) by debbugs.gnu.org; 2 Feb 2022 21:01:30 +0000 Received: from localhost ([127.0.0.1]:53774 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFMkr-0001sh-Oz for submit@debbugs.gnu.org; Wed, 02 Feb 2022 16:01:30 -0500 Received: from mail-pj1-f49.google.com ([209.85.216.49]:37647) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFMkm-0001sN-7h for 53715@debbugs.gnu.org; Wed, 02 Feb 2022 16:01:28 -0500 Received: by mail-pj1-f49.google.com with SMTP id s2-20020a17090ad48200b001b501977b23so8003330pju.2 for <53715@debbugs.gnu.org>; Wed, 02 Feb 2022 13:01:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:to:cc:references:from:message-id:date:mime-version :in-reply-to:content-language; bh=C1rv45hsjzBifAXbEsFAvJmdmceqqPTkWK5DFR54DI4=; b=B3MFu5qVFIBDD5yG0HqebWC0/8eYvxVL2Wa/jLmMC5rBPiNU3fy8RdjiQl8g4Oztc1 9LKZYrOP6igoDZc/D2YN1fJKDEfn+wqSOibWPuS2+KCkBjcpcVVSMtIzkSf/MBNDFpWB wAull9FNobDi5//J8MU9qYjtiDHcVr9SMa/BF8VUaQkxsAKCHhTLBqQl/7rFWB+QbDq2 SfUmfqSjNw79EX7XSxwvQOaqjX09FoPUXQK9OVM34Y/Oa9DszUaXAGV8ePRsvT21Lea8 QQuxY4TxjFqB3XHPjPEIEOwBUtFLWXds8RFTioYD+aWWB+MqN7Itf3tLZWq3R9kieJ9g 5L3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :mime-version:in-reply-to:content-language; bh=C1rv45hsjzBifAXbEsFAvJmdmceqqPTkWK5DFR54DI4=; b=FeVh5UhHYv1dZ1eyHLCGDK6Pm+MXgMgh4R1Jy3GGP8R7KyUTYcU5BwlArv0hXQ0iLG b63vNL5uca+cyLh3aEk+VPtac4pwRrb76j5y6jM5qNbMnLGAfdslWqjPoo06rEWdgano mt9oOWRT9XJrB/3vRhyZ4A3SVm/X/tvAqUSHuGR8OhE/sreumjmIy8N+4NQbLrQwKMqb r6RgNVgWozvzXKnBlB9b4jmBbnA0Upq9shpbfz+wWYutNUg9+C7N8UJNt2hT23L4FBZo F4YYY6qxZ3AFtsSycghD4iO13pGec0ZJMeELEnjbGcndUoy2CIMO7gMSJQ5BzFwAgwzg nh4A== X-Gm-Message-State: AOAM533aTK7TLIlbcdFqNcgnMUCtejAn4aAOQLgdPaT1kW07FruKKASJ VwhFeGTjS1n6Y5CeGsh1yCwO70yYwvyIGw== X-Google-Smtp-Source: ABdhPJwDfunVXF21Aw+O7I14lntQZql+6jPHsBi7JblkXH2DMfmWVBjYQsFrbeVgtsB8soq1CxNZZQ== X-Received: by 2002:a17:90a:fc90:: with SMTP id ci16mr9983244pjb.5.1643835678163; Wed, 02 Feb 2022 13:01:18 -0800 (PST) Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id ml14sm7033928pjb.10.2022.02.02.13.01.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 02 Feb 2022 13:01:17 -0800 (PST) Subject: Re: bug#53715: 29.0.50; [PATCH] Improve correctness of pipelines in Eshell To: Lars Ingebrigtsen References: <75056e6b-c739-a48c-2bf8-56ddc456da8e@gmail.com> <871r0lrvg1.fsf@gnus.org> <4733b4db-705c-2b52-e1e6-68b0902f87d3@gmail.com> <87wnidnj4q.fsf@gnus.org> From: Jim Porter Message-ID: <6b9ef041-4562-6590-0eb9-f42520085a40@gmail.com> Date: Wed, 2 Feb 2022 13:01:16 -0800 MIME-Version: 1.0 In-Reply-To: <87wnidnj4q.fsf@gnus.org> Content-Type: multipart/mixed; boundary="------------3B9ADAD3AB4D55543CE4FD11" Content-Language: en-US X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53715 Cc: 53715@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------3B9ADAD3AB4D55543CE4FD11 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 2/2/2022 11:49 AM, Lars Ingebrigtsen wrote: > Jim Porter writes: > >> Sorry, I forgot to mention that since the second patch updates a >> defsubst (`eshell-interactive-process'), you'll need to recompile all >> the files that might use it, so `make boostrap' or `touch >> lisp/eshell/*.el test/lisp/eshell/*.el && make'. That should make >> these tests pass. > > I did remove all the .elc files in lisp/eshell and rebuilt, but the > tests still failed. (I didn't try to delete the test elc files, > though.) Ah, I think I see the issue. I should have updated `eshell-wait-for-subprocess' in test/lisp/eshell/eshell-tests-helpers.el to use the new defsubst, which would have caused it to get recompiled. (Though manually recompiling it should also work.) I've attached a fixed patch (the first one is the same; I only updated the second). --------------3B9ADAD3AB4D55543CE4FD11 Content-Type: text/plain; charset=UTF-8; name="0001-Ensure-that-tailproc-is-set-for-the-last-process-in-.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Ensure-that-tailproc-is-set-for-the-last-process-in-.pa"; filename*1="tch" RnJvbSA2ZjE1ODMyZjUzNzAzNWQyNmQwNzI1OTViYzU5ZmY4Nzk1Yzk1NTBmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFRodSwgMjcgSmFuIDIwMjIgMjM6MTM6MzYgLTA4MDAKU3ViamVjdDogW1BB VENIIDEvMl0gRW5zdXJlIHRoYXQgdGFpbHByb2MgaXMgc2V0IGZvciB0aGUgbGFzdCBwcm9j ZXNzIGluIGFuCiBFc2hlbGwgcGlwZWxpbmUKCkluIHBhcnRpY3VsYXIsIHRoaXMgdXNlZCB0 byBmYWlsIGZvciBwaXBlbGluZXMgd2hlcmUgdGhlIGxhc3QgcHJvY2VzcwppbiB0aGUgcGlw ZWxpbmUgY2FtZSBmcm9tIHRoZSBmaXJzdCBlbGVtZW50IG9mIHRoZSBwaXBlbGluZS4gVGhp cwpjb3VsZCBoYXBwZW4gd2hlbiBhIHByb2Nlc3Mgd2FzIHBpcGVkIHRvIGFuIG9yZGluYXJ5 IExpc3AgZnVuY3Rpb24sCmxpa2UgaW4gJyplY2hvIGhpIHwgZWNobyBieWUnLgoKKiBsaXNw L2VzaGVsbC9lc2gtY21kLmVsIChlc2hlbGwtZG8tcGlwZWxpbmVzKTogU2V0IHRoZSB0YWls cHJvYyBldmVuCmZvciB0aGUgZmlyc3QgcHJvY2VzcyBpbiB0aGUgcGlwZWxpbmUuCgoqIHRl c3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLmVsIChlc2hlbGwtdGVzdC9waXBlLXRhaWxw cm9jKTogTmV3CnRlc3QuCi0tLQogbGlzcC9lc2hlbGwvZXNoLWNtZC5lbCAgICAgICAgICAg fCA3ICsrKystLS0KIHRlc3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLmVsIHwgNyArKysr KysrCiAyIGZpbGVzIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvbGlzcC9lc2hlbGwvZXNoLWNtZC5lbCBiL2xpc3AvZXNoZWxsL2Vz aC1jbWQuZWwKaW5kZXggMDRkNjVkZjRmMy4uMTQxMzk4OTZkZCAxMDA2NDQKLS0tIGEvbGlz cC9lc2hlbGwvZXNoLWNtZC5lbAorKysgYi9saXNwL2VzaGVsbC9lc2gtY21kLmVsCkBAIC03 NjQsOCArNzY0LDcgQEAgZXNoZWxsLWRvLXBpcGVsaW5lcwogICAgICAgICAgICAgICAoZXNo ZWxsLXNldC1vdXRwdXQtaGFuZGxlICxlc2hlbGwtb3V0cHV0LWhhbmRsZQogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdhcHBlbmQgbmV4dHByb2MpCiAgICAg ICAgICAgICAgIChlc2hlbGwtc2V0LW91dHB1dC1oYW5kbGUgLGVzaGVsbC1lcnJvci1oYW5k bGUKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnYXBwZW5kIG5l eHRwcm9jKQotICAgICAgICAgICAgICAoc2V0cSB0YWlscHJvYyAob3IgdGFpbHByb2MgbmV4 dHByb2MpKSkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2Fw cGVuZCBuZXh0cHJvYykpKQogCSwobGV0ICgoaGVhZCAoY2FyIHBpcGVsaW5lKSkpCiAJICAg KGlmIChtZW1xIChjYXIgaGVhZCkgJyhsZXQgcHJvZ24pKQogCSAgICAgICAoc2V0cSBoZWFk IChjYXIgKGxhc3QgaGVhZCkpKSkKQEAgLTc4MSw3ICs3ODAsOSBAQCBlc2hlbGwtZG8tcGlw ZWxpbmVzCiAJICAgICAgICwoY29uZCAoKG5vdCBub3RmaXJzdCkgKHF1b3RlICdmaXJzdCkp CiAJCSAgICAgICgoY2RyIHBpcGVsaW5lKSB0KQogCQkgICAgICAodCAocXVvdGUgJ2xhc3Qp KSkpKQotCSAgLChjYXIgcGlwZWxpbmUpKSkpKSkKKyAgICAgICAgICAobGV0ICgocHJvYyAs KGNhciBwaXBlbGluZSkpKQorICAgICAgICAgICAgKHNldHEgdGFpbHByb2MgKG9yIHRhaWxw cm9jIHByb2MpKQorICAgICAgICAgICAgcHJvYykpKSkpKQogCiAoZGVmbWFjcm8gZXNoZWxs LWRvLXBpcGVsaW5lcy1zeW5jaHJvbm91c2x5IChwaXBlbGluZSkKICAgIkV4ZWN1dGUgdGhl IGNvbW1hbmRzIGluIFBJUEVMSU5FIGluIHNlcXVlbmNlIHN5bmNocm9ub3VzbHkuCmRpZmYg LS1naXQgYS90ZXN0L2xpc3AvZXNoZWxsL2VzaGVsbC10ZXN0cy5lbCBiL3Rlc3QvbGlzcC9l c2hlbGwvZXNoZWxsLXRlc3RzLmVsCmluZGV4IDU0MjgxNWRmODAuLjc2NThkNWY1NTEgMTAw NjQ0Ci0tLSBhL3Rlc3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLmVsCisrKyBiL3Rlc3Qv bGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLmVsCkBAIC0xMjksNiArMTI5LDEzIEBAIGVzaGVs bC10ZXN0L2ludGVycC1jbWQtZXh0ZXJuYWwtY29uY2F0CiAgICAoZXNoZWxsLWNvbW1hbmQt cmVzdWx0LXAgImVjaG8gJHtlY2hvIGhpfS0keyplY2hvIHRoZXJlfSIKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAiaGktdGhlcmVcbiIpKSkKIAorKGVydC1kZWZ0ZXN0IGVzaGVs bC10ZXN0L3BpcGUtdGFpbHByb2MgKCkKKyAgIkNoZWNrIHRoYXQgcGlwaW5nIGEgcHJvY2Vz cyB0byBhIG5vbi1wcm9jZXNzIGNvbW1hbmQgd2FpdHMgZm9yIHRoZSBwcm9jZXNzIgorICAo c2tpcC11bmxlc3MgKGV4ZWN1dGFibGUtZmluZCAiZWNobyIpKQorICAod2l0aC10ZW1wLWVz aGVsbAorICAgKGVzaGVsbC1jb21tYW5kLXJlc3VsdC1wICIqZWNobyBoaSB8IGVjaG8gYnll IgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICJieWVcbmhpXG4iKSkpCisKIChlcnQt ZGVmdGVzdCBlc2hlbGwtdGVzdC93aW5kb3ctaGVpZ2h0ICgpCiAgICIkTElORVMgc2hvdWxk IGVxdWFsICh3aW5kb3ctaGVpZ2h0KSIKICAgKHNob3VsZCAoZXNoZWxsLXRlc3QtY29tbWFu ZC1yZXN1bHQgIj0gJExJTkVTICh3aW5kb3ctaGVpZ2h0KSIpKSkKLS0gCjIuMjUuMQoK --------------3B9ADAD3AB4D55543CE4FD11 Content-Type: text/plain; charset=UTF-8; name="0002-When-executing-an-Eshell-pipeline-send-input-to-the-.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0002-When-executing-an-Eshell-pipeline-send-input-to-the-.pa"; filename*1="tch" RnJvbSA0MzNlYTdiNmM1MGE4NTY3NDZlNmUxYTNiOWJkNzI4OWEzNDNhZWJjIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFN1biwgMzAgSmFuIDIwMjIgMTg6NTM6NTMgLTA4MDAKU3ViamVjdDogW1BB VENIIDIvMl0gV2hlbiBleGVjdXRpbmcgYW4gRXNoZWxsIHBpcGVsaW5lLCBzZW5kIGlucHV0 IHRvIHRoZQogZmlyc3QgcHJvY2VzcwoKUHJldmlvdXNseSwgaW5wdXQgd2FzIHNlbnQgdG8g dGhlIGxhc3QgcHJvY2VzcyBpbiB0aGUgcGlwZWxpbmUsCnJlc3VsdGluZyBpbiB1bmV4cGVj dGVkIGJlaGF2aW9yIHdoZW4gcnVubmluZyBjb21tYW5kcyBsaWtlCid0ciBhLXogQS1aIHwg cmV2Jy4KCiogbGlzcC9lc2hlbGwvZXNoLXV0aWwuZWwgKGVzaGVsbC1wcm9jZXNzLXBhaXIt cCkKKGVzaGVsbC1tYWtlLXByb2Nlc3MtcGFpcik6IE5ldyBmdW5jdGlvbnMuCgoqIGxpc3Av ZXNoZWxsL2VzaC1jbWQuZWwgKGVzaGVsbC1sYXN0LWFzeW5jLXByb2MpOiBSZW5hbWUgdG8u Li4KKGVzaGVsbC1sYXN0LWFzeW5jLXByb2NzKTogLi4uIHRoaXMsIGFuZCBzdG9yZSBhIHBh aXIgb2YgcHJvY2Vzc2VzLgooZXNoZWxsLWludGVyYWN0aXZlLXByb2Nlc3MpOiBSZXBsYWNl IHdpdGguLi4KKGVzaGVsbC1pbnRlcmFjdGl2ZS1wcm9jZXNzLXAsIGVzaGVsbC1oZWFkLXBy b2Nlc3MpCihlc2hlbGwtdGFpbC1wcm9jZXNzKTogLi4uIHRoZXNlLgooZXNoZWxsLWNtZC1p bml0aWFsaXplKTogU2V0ICdlc2hlbGwtbGFzdC1hc3luYy1wcm9jcycuCihlc2hlbGwtZG8t cGlwZWxpbmVzKTogU2V0ICdoZWFkcHJvYycuCihlc2hlbGwtZXhlY3V0ZS1waXBlbGluZSk6 IFJldHVybiAnaGVhZHByb2MnIGFuZCAndGFpbHByb2MnLgooZXNoZWxsLXJlc3VtZS1ldmFs KTogVXNlICdlc2hlbGwtbGFzdC1hc3luYy1wcm9jcycuCihlc2hlbGwtZG8tZXZhbCk6IE1h a2Ugc3VyZSB3ZSB3b3JrIHdpdGggYSBwYWlyIG9mIHByb2Nlc3Nlcy4KCiogbGlzcC9lc2hl bGwvZXNoLXByb2MuZWwgKGVzaGVsbC1zZW5kLWVvZi10by1wcm9jZXNzKTogTW92ZSBmcm9t CmhlcmUuLi4KKiBsaXNwL2VzaGVsbC9lc2gtbW9kZS5lbCAoZXNoZWxsLXNlbmQtZW9mLXRv LXByb2Nlc3MpOiAuLi4gdG8gaGVyZSwKYW5kIG9ubHkgc2VuZCBFT0YgdG8gdGhlIGhlYWQg cHJvY2Vzcy4KCiogbGlzcC9lc2hlbGwvZW0tY21wbC5lbCAoZXNoZWxsLWNvbXBsZXRlLXBh cnNlLWFyZ3VtZW50cykKKiBsaXNwL2VzaGVsbC9lc2gtbW9kZS5lbCAoZXNoZWxsLWludGVy Y2VwdC1jb21tYW5kcykKKGVzaGVsbC13YXRjaC1mb3ItcGFzc3dvcmQtcHJvbXB0KToKVXNl ICdlc2hlbGwtaW50ZXJhY3RpdmUtcHJvY2Vzcy1wJy4KCiogbGlzcC9lc2hlbGwvZW0tcmVi aW5kLmVsIChlc2hlbGwtZGVsY2hhci1vci1tYXliZS1lb2YpCiogbGlzcC9lc2hlbGwvZW0t dGVybS5lbCAoZXNoZWxsLXRlcm0tc2VuZC1yYXctc3RyaW5nKQoqIGxpc3AvZXNoZWxsL2Vz aC1tb2RlLmVsIChlc2hlbGwtc2VsZi1pbnNlcnQtY29tbWFuZCkKKGVzaGVsbC1zZW5kLWlu cHV0LCBlc2hlbGwtc2VuZC1pbnZpc2libGUpOgpVc2UgJ2VzaGVsbC1oZWFkLXByb2Nlc3Mn LgoKKiBsaXNwL2VzaGVsbC9lc2gtY21kLmVsIChlc2hlbGwtYXMtc3ViY29tbWFuZCk6ClVz ZSAnZXNoZWxsLXRhaWwtcHJvY2VzcycuCgoqIGxpc3AvZXNoZWxsL2VzaGVsbC5lbCAoZXNo ZWxsLWNvbW1hbmQpOgoqIHRlc3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLWhlbHBlcnMu ZWwKKGVzaGVsbC13YWl0LWZvci1zdWJwcm9jZXNzKToKVXNlICdlc2hlbGwtaW50ZXJhY3Rp dmUtcHJvY2Vzcy1wJyBhbmQgJ2VzaGVsbC10YWlsLXByb2Nlc3MnLgoKKiB0ZXN0L2xpc3Av ZXNoZWxsL2VzaGVsbC10ZXN0cy5lbCAoZXNoZWxsLXRlc3QvcGlwZS1oZWFkcHJvYy1zdGRp bik6Ck5ldyB0ZXN0LgotLS0KIGxpc3AvZXNoZWxsL2VtLWNtcGwuZWwgICAgICAgICAgICAg ICAgICAgfCAgMiArLQogbGlzcC9lc2hlbGwvZW0tcmViaW5kLmVsICAgICAgICAgICAgICAg ICB8ICAyICstCiBsaXNwL2VzaGVsbC9lbS10ZXJtLmVsICAgICAgICAgICAgICAgICAgIHwg IDIgKy0KIGxpc3AvZXNoZWxsL2VzaC1jbWQuZWwgICAgICAgICAgICAgICAgICAgfCA2NiAr KysrKysrKysrKysrKystLS0tLS0tLS0KIGxpc3AvZXNoZWxsL2VzaC1pby5lbCAgICAgICAg ICAgICAgICAgICAgfCAgMiArLQogbGlzcC9lc2hlbGwvZXNoLW1vZGUuZWwgICAgICAgICAg ICAgICAgICB8IDI4ICsrKysrKy0tLS0KIGxpc3AvZXNoZWxsL2VzaC1wcm9jLmVsICAgICAg ICAgICAgICAgICAgfCAxMSArLS0tCiBsaXNwL2VzaGVsbC9lc2gtdXRpbC5lbCAgICAgICAg ICAgICAgICAgIHwgMTQgKysrKysKIGxpc3AvZXNoZWxsL2VzaGVsbC5lbCAgICAgICAgICAg ICAgICAgICAgfCAgNiArLS0KIHRlc3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLWhlbHBl cnMuZWwgfCAgMiArLQogdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwgICAgICAg ICB8IDExICsrKysKIDExIGZpbGVzIGNoYW5nZWQsIDk3IGluc2VydGlvbnMoKyksIDQ5IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvZXNoZWxsL2VtLWNtcGwuZWwgYi9saXNw L2VzaGVsbC9lbS1jbXBsLmVsCmluZGV4IGM2YTUxYjE3OTMuLmI3OTQ3NWY2ZTAgMTAwNjQ0 Ci0tLSBhL2xpc3AvZXNoZWxsL2VtLWNtcGwuZWwKKysrIGIvbGlzcC9lc2hlbGwvZW0tY21w bC5lbApAQCAtMzE0LDcgKzMxNCw3IEBAIGVzaGVsbC1jb21wbGV0aW9uLWhlbHAKIChkZWZ1 biBlc2hlbGwtY29tcGxldGUtcGFyc2UtYXJndW1lbnRzICgpCiAgICJQYXJzZSB0aGUgY29t bWFuZCBsaW5lIGFyZ3VtZW50cyBmb3IgYHBjb21wbGV0ZS1hcmd1bWVudCcuIgogICAod2hl biAoYW5kIGVzaGVsbC1uby1jb21wbGV0aW9uLWR1cmluZy1qb2JzCi0JICAgICAoZXNoZWxs LWludGVyYWN0aXZlLXByb2Nlc3MpKQorCSAgICAgKGVzaGVsbC1pbnRlcmFjdGl2ZS1wcm9j ZXNzLXApKQogICAgIChpbnNlcnQtYW5kLWluaGVyaXQgIlx0IikKICAgICAodGhyb3cgJ3Bj b21wbGV0ZWQgdCkpCiAgIChsZXQgKChlbmQgKHBvaW50LW1hcmtlcikpCmRpZmYgLS1naXQg YS9saXNwL2VzaGVsbC9lbS1yZWJpbmQuZWwgYi9saXNwL2VzaGVsbC9lbS1yZWJpbmQuZWwK aW5kZXggZjI0NzU4ZDRlMy4uMmI1NmM5ZTg0NCAxMDA2NDQKLS0tIGEvbGlzcC9lc2hlbGwv ZW0tcmViaW5kLmVsCisrKyBiL2xpc3AvZXNoZWxsL2VtLXJlYmluZC5lbApAQCAtMjM4LDcg KzIzOCw3IEBAIGVzaGVsbC1kZWxjaGFyLW9yLW1heWJlLWVvZgogU2VuZHMgYW4gRU9GIG9u bHkgaWYgcG9pbnQgaXMgYXQgdGhlIGVuZCBvZiB0aGUgYnVmZmVyIGFuZCB0aGVyZSBpcyBu bwogaW5wdXQuIgogICAoaW50ZXJhY3RpdmUgInAiKQotICAobGV0ICgocHJvYyAoZXNoZWxs LWludGVyYWN0aXZlLXByb2Nlc3MpKSkKKyAgKGxldCAoKHByb2MgKGVzaGVsbC1oZWFkLXBy b2Nlc3MpKSkKICAgICAoaWYgKGVvYnApCiAJKGNvbmQKIAkgKCgvPSAocG9pbnQpIGVzaGVs bC1sYXN0LW91dHB1dC1lbmQpCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lbS10ZXJtLmVs IGIvbGlzcC9lc2hlbGwvZW0tdGVybS5lbAppbmRleCBlMzRjNWFlNDdjLi5kMTUwYzA3YjAz IDEwMDY0NAotLS0gYS9saXNwL2VzaGVsbC9lbS10ZXJtLmVsCisrKyBiL2xpc3AvZXNoZWxs L2VtLXRlcm0uZWwKQEAgLTIyNCw3ICsyMjQsNyBAQCBlc2hlbGwtdGVybS1zZW50aW5lbAog CiA7IChkZWZ1biBlc2hlbGwtdGVybS1zZW5kLXJhdy1zdHJpbmcgKGNoYXJzKQogOyAgIChn b3RvLWNoYXIgZXNoZWxsLWxhc3Qtb3V0cHV0LWVuZCkKLTsgICAocHJvY2Vzcy1zZW5kLXN0 cmluZyAoZXNoZWxsLWludGVyYWN0aXZlLXByb2Nlc3MpIGNoYXJzKSkKKzsgICAocHJvY2Vz cy1zZW5kLXN0cmluZyAoZXNoZWxsLWhlYWQtcHJvY2VzcykgY2hhcnMpKQogCiA7IChkZWZ1 biBlc2hlbGwtdGVybS1zZW5kLXJhdyAoKQogOyAgICJTZW5kIHRoZSBsYXN0IGNoYXJhY3Rl ciB0eXBlZCB0aHJvdWdoIHRoZSB0ZXJtaW5hbC1lbXVsYXRvcgpkaWZmIC0tZ2l0IGEvbGlz cC9lc2hlbGwvZXNoLWNtZC5lbCBiL2xpc3AvZXNoZWxsL2VzaC1jbWQuZWwKaW5kZXggMTQx Mzk4OTZkZC4uZTcwMmRlMDNhMCAxMDA2NDQKLS0tIGEvbGlzcC9lc2hlbGwvZXNoLWNtZC5l bAorKysgYi9saXNwL2VzaGVsbC9lc2gtY21kLmVsCkBAIC0yNzksMTQgKzI3OSwzMyBAQCBl c2hlbGwtaW4tcGlwZWxpbmUtcAogKGRlZnZhciBlc2hlbGwtaW4tc3ViY29tbWFuZC1wIG5p bCkKIChkZWZ2YXIgZXNoZWxsLWxhc3QtYXJndW1lbnRzIG5pbCkKIChkZWZ2YXIgZXNoZWxs LWxhc3QtY29tbWFuZC1uYW1lIG5pbCkKLShkZWZ2YXIgZXNoZWxsLWxhc3QtYXN5bmMtcHJv YyBuaWwKLSAgIldoZW4gdGhpcyBmb3JlZ3JvdW5kIHByb2Nlc3MgY29tcGxldGVzLCByZXN1 bWUgY29tbWFuZCBldmFsdWF0aW9uLiIpCisoZGVmdmFyIGVzaGVsbC1sYXN0LWFzeW5jLXBy b2NzIG5pbAorICAiVGhlIGN1cnJlbnRseS1ydW5uaW5nIGZvcmVncm91bmQgcHJvY2Vzcyhl cykuCitXaGVuIGV4ZWN1dGluZyBhIHBpcGVsaW5lLCB0aGlzIGlzIGEgY29ucyBjZWxsIHdo b3NlIENBUiBpcyB0aGUKK2ZpcnN0IHByb2Nlc3MgKHVzdWFsbHkgcmVhZGluZyBmcm9tIHN0 ZGluKSBhbmQgd2hvc2UgQ0RSIGlzIHRoZQorbGFzdCBwcm9jZXNzICh1c3VhbGx5IHdyaXRp bmcgdG8gc3Rkb3V0KS4gIE90aGVyd2lzZSwgdGhlIENBUiBhbmQKK0NEUiBhcmUgdGhlIHNh bWUgcHJvY2Vzcy4KKworV2hlbiB0aGUgcHJvY2VzcyBpbiB0aGUgQ0RSIGNvbXBsZXRlcywg cmVzdW1lIGNvbW1hbmQgZXZhbHVhdGlvbi4iKQogCiA7OzsgRnVuY3Rpb25zOgogCi0oZGVm c3Vic3QgZXNoZWxsLWludGVyYWN0aXZlLXByb2Nlc3MgKCkKLSAgIlJldHVybiBjdXJyZW50 bHkgcnVubmluZyBjb21tYW5kIHByb2Nlc3MsIGlmIG5vbi1MaXNwLiIKLSAgZXNoZWxsLWxh c3QtYXN5bmMtcHJvYykKKyhkZWZzdWJzdCBlc2hlbGwtaW50ZXJhY3RpdmUtcHJvY2Vzcy1w ICgpCisgICJSZXR1cm4gbm9uLW5pbCBpZiB0aGVyZSBpcyBhIGN1cnJlbnRseSBydW5uaW5n IGNvbW1hbmQgcHJvY2Vzcy4iCisgIGVzaGVsbC1sYXN0LWFzeW5jLXByb2NzKQorCisoZGVm c3Vic3QgZXNoZWxsLWhlYWQtcHJvY2VzcyAoKQorICAiUmV0dXJuIHRoZSBjdXJyZW50bHkg cnVubmluZyBwcm9jZXNzIGF0IHRoZSBoZWFkIG9mIGFueSBwaXBlbGluZS4KK1RoaXMgb25s eSByZXR1cm5zIGV4dGVybmFsIChub24tTGlzcCkgcHJvY2Vzc2VzLiIKKyAgKGNhci1zYWZl IGVzaGVsbC1sYXN0LWFzeW5jLXByb2NzKSkKKworKGRlZnN1YnN0IGVzaGVsbC10YWlsLXBy b2Nlc3MgKCkKKyAgIlJldHVybiB0aGUgY3VycmVudGx5IHJ1bm5pbmcgcHJvY2VzcyBhdCB0 aGUgdGFpbCBvZiBhbnkgcGlwZWxpbmUuCitUaGlzIG9ubHkgcmV0dXJucyBleHRlcm5hbCAo bm9uLUxpc3ApIHByb2Nlc3Nlcy4iCisgIChjZHItc2FmZSBlc2hlbGwtbGFzdC1hc3luYy1w cm9jcykpCisKKyhkZWZpbmUtb2Jzb2xldGUtZnVuY3Rpb24tYWxpYXMgJ2VzaGVsbC1pbnRl cmFjdGl2ZS1wcm9jZXNzCisgICdlc2hlbGwtdGFpbC1wcm9jZXNzICIyOS4xIikKIAogKGRl ZnVuIGVzaGVsbC1jbWQtaW5pdGlhbGl6ZSAoKSAgICAgO0NhbGxlZCBmcm9tIGBlc2hlbGwt bW9kZScgdmlhIGludGVybi1zb2Z0IQogICAiSW5pdGlhbGl6ZSB0aGUgRXNoZWxsIGNvbW1h bmQgcHJvY2Vzc2luZyBtb2R1bGUuIgpAQCAtMjk1LDcgKzMxNCw3IEBAIGVzaGVsbC1jbWQt aW5pdGlhbGl6ZQogICAoc2V0cS1sb2NhbCBlc2hlbGwtY29tbWFuZC1hcmd1bWVudHMgbmls KQogICAoc2V0cS1sb2NhbCBlc2hlbGwtbGFzdC1hcmd1bWVudHMgbmlsKQogICAoc2V0cS1s b2NhbCBlc2hlbGwtbGFzdC1jb21tYW5kLW5hbWUgbmlsKQotICAoc2V0cS1sb2NhbCBlc2hl bGwtbGFzdC1hc3luYy1wcm9jIG5pbCkKKyAgKHNldHEtbG9jYWwgZXNoZWxsLWxhc3QtYXN5 bmMtcHJvY3MgbmlsKQogCiAgIChhZGQtaG9vayAnZXNoZWxsLWtpbGwtaG9vayAjJ2VzaGVs bC1yZXN1bWUtY29tbWFuZCBuaWwgdCkKIApAQCAtMzA2LDcgKzMyNSw3IEBAIGVzaGVsbC1j bWQtaW5pdGlhbGl6ZQogICAoYWRkLWhvb2sgJ2VzaGVsbC1wb3N0LWNvbW1hbmQtaG9vawog ICAgICAgICAgICAgKGxhbWJkYSAoKQogICAgICAgICAgICAgICAoc2V0cSBlc2hlbGwtY3Vy cmVudC1jb21tYW5kIG5pbAotICAgICAgICAgICAgICAgICAgICBlc2hlbGwtbGFzdC1hc3lu Yy1wcm9jIG5pbCkpCisgICAgICAgICAgICAgICAgICAgIGVzaGVsbC1sYXN0LWFzeW5jLXBy b2NzIG5pbCkpCiAgICAgICAgICAgICBuaWwgdCkKIAogICAoYWRkLWhvb2sgJ2VzaGVsbC1w YXJzZS1hcmd1bWVudC1ob29rCkBAIC03ODEsNiArODAwLDggQEAgZXNoZWxsLWRvLXBpcGVs aW5lcwogCQkgICAgICAoKGNkciBwaXBlbGluZSkgdCkKIAkJICAgICAgKHQgKHF1b3RlICds YXN0KSkpKSkKICAgICAgICAgICAobGV0ICgocHJvYyAsKGNhciBwaXBlbGluZSkpKQorICAg ICAgICAgICAgLCh1bmxlc3Mgbm90Zmlyc3QKKyAgICAgICAgICAgICAgICcoc2V0cSBoZWFk cHJvYyBwcm9jKSkKICAgICAgICAgICAgIChzZXRxIHRhaWxwcm9jIChvciB0YWlscHJvYyBw cm9jKSkKICAgICAgICAgICAgIHByb2MpKSkpKSkKIApAQCAtODIzLDcgKzg0NCw3IEBAICdl c2hlbGwtcHJvY2Vzcy1pZGVudGl0eQogCiAoZGVmbWFjcm8gZXNoZWxsLWV4ZWN1dGUtcGlw ZWxpbmUgKHBpcGVsaW5lKQogICAiRXhlY3V0ZSB0aGUgY29tbWFuZHMgaW4gUElQRUxJTkUs IGNvbm5lY3RpbmcgZWFjaCB0byBvbmUgYW5vdGhlci4iCi0gIGAobGV0ICgoZXNoZWxsLWlu LXBpcGVsaW5lLXAgdCkgdGFpbHByb2MpCisgIGAobGV0ICgoZXNoZWxsLWluLXBpcGVsaW5l LXAgdCkgaGVhZHByb2MgdGFpbHByb2MpCiAgICAgIChwcm9nbgogICAgICAgICwoaWYgKGZi b3VuZHAgJ21ha2UtcHJvY2VzcykKIAkgICAgYChlc2hlbGwtZG8tcGlwZWxpbmVzICxwaXBl bGluZSkKQEAgLTgzMyw3ICs4NTQsNyBAQCBlc2hlbGwtZXhlY3V0ZS1waXBlbGluZQogCQkJ CShjYXIgKGFyZWYgZXNoZWxsLWN1cnJlbnQtaGFuZGxlcwogCQkJCQkgICAsZXNoZWxsLWVy cm9yLWhhbmRsZSkpIG5pbCkpKQogCSAgICAgKGVzaGVsbC1kby1waXBlbGluZXMtc3luY2hy b25vdXNseSAscGlwZWxpbmUpKSkKLSAgICAgICAoZXNoZWxsLXByb2Nlc3MtaWRlbnRpdHkg dGFpbHByb2MpKSkpCisgICAgICAgKGVzaGVsbC1wcm9jZXNzLWlkZW50aXR5IChjb25zIGhl YWRwcm9jIHRhaWxwcm9jKSkpKSkKIAogKGRlZm1hY3JvIGVzaGVsbC1hcy1zdWJjb21tYW5k IChjb21tYW5kKQogICAiRXhlY3V0ZSBDT01NQU5EIHVzaW5nIGEgdGVtcCBidWZmZXIuCkBA IC05OTMsMjQgKzEwMTQsMjQgQEAgZXNoZWxsLXJlc3VtZS1jb21tYW5kCiAgICAgKHVubGVz cyAob3IgKG5vdCAoc3RyaW5ncCBzdGF0dXMpKQogCQkoc3RyaW5nPSAic3RvcHBlZCIgc3Rh dHVzKQogCQkoc3RyaW5nLW1hdGNoIGVzaGVsbC1yZXNldC1zaWduYWxzIHN0YXR1cykpCi0g ICAgICAoaWYgKGVxIHByb2MgKGVzaGVsbC1pbnRlcmFjdGl2ZS1wcm9jZXNzKSkKKyAgICAg IChpZiAoZXEgcHJvYyAoZXNoZWxsLXRhaWwtcHJvY2VzcykpCiAJICAoZXNoZWxsLXJlc3Vt ZS1ldmFsKSkpKSkKIAogKGRlZnVuIGVzaGVsbC1yZXN1bWUtZXZhbCAoKQogICAiRGVzdHJ1 Y3RpdmVseSBldmFsdWF0ZSBhIGZvcm0gd2hpY2ggbWF5IG5lZWQgdG8gYmUgZGVmZXJyZWQu IgogICAoZXNoZWxsLWNvbmRpdGlvbi1jYXNlIGVycgogICAgICAgKHByb2duCi0JKHNldHEg ZXNoZWxsLWxhc3QtYXN5bmMtcHJvYyBuaWwpCisJKHNldHEgZXNoZWxsLWxhc3QtYXN5bmMt cHJvY3MgbmlsKQogCSh3aGVuIGVzaGVsbC1jdXJyZW50LWNvbW1hbmQKIAkgIChsZXQqIChy ZXR2YWwKLQkJIChwcm9jIChjYXRjaCAnZXNoZWxsLWRlZmVyCisJCSAocHJvY3MgKGNhdGNo ICdlc2hlbGwtZGVmZXIKIAkJCSAoaWdub3JlCiAJCQkgIChzZXRxIHJldHZhbAogCQkJCShl c2hlbGwtZG8tZXZhbAogCQkJCSBlc2hlbGwtY3VycmVudC1jb21tYW5kKSkpKSkpCi0JICAg IChpZiAoZXNoZWxsLXByb2Nlc3NwIHByb2MpCi0JCShpZ25vcmUgKHNldHEgZXNoZWxsLWxh c3QtYXN5bmMtcHJvYyBwcm9jKSkKLQkgICAgICAoY2FkciByZXR2YWwpKSkpKQorICAgICAg ICAgICAoaWYgKGVzaGVsbC1wcm9jZXNzLXBhaXItcCBwcm9jcykKKyAgICAgICAgICAgICAg IChpZ25vcmUgKHNldHEgZXNoZWxsLWxhc3QtYXN5bmMtcHJvY3MgcHJvY3MpKQorICAgICAg ICAgICAgIChjYWRyIHJldHZhbCkpKSkpCiAgICAgKGVycm9yCiAgICAgIChlcnJvciAoZXJy b3ItbWVzc2FnZS1zdHJpbmcgZXJyKSkpKSkKIApAQCAtMTE3MywxNyArMTE5NCwxNiBAQCBl c2hlbGwtZG8tZXZhbAogCQkgICAgKHNldGNhciBmb3JtIChjYXIgbmV3LWZvcm0pKQogCQkg ICAgKHNldGNkciBmb3JtIChjZHIgbmV3LWZvcm0pKSkKIAkJICAoZXNoZWxsLWRvLWV2YWwg Zm9ybSBzeW5jaHJvbm91cy1wKSkKLQkgICAgICAoaWYgKGFuZCAobWVtcSAoY2FyIGZvcm0p IGVzaGVsbC1kZWZlcnJhYmxlLWNvbW1hbmRzKQotCQkgICAgICAgKG5vdCBlc2hlbGwtY3Vy cmVudC1zdWJqb2ItcCkKLQkJICAgICAgIHJlc3VsdAotCQkgICAgICAgKGVzaGVsbC1wcm9j ZXNzcCByZXN1bHQpKQotCQkgIChpZiBzeW5jaHJvbm91cy1wCi0JCSAgICAgIChlc2hlbGwv d2FpdCByZXN1bHQpCisgICAgICAgICAgICAgIChpZi1sZXQgKCgobWVtcSAoY2FyIGZvcm0p IGVzaGVsbC1kZWZlcnJhYmxlLWNvbW1hbmRzKSkKKyAgICAgICAgICAgICAgICAgICAgICAg KChub3QgZXNoZWxsLWN1cnJlbnQtc3Viam9iLXApKQorICAgICAgICAgICAgICAgICAgICAg ICAocHJvY3MgKGVzaGVsbC1tYWtlLXByb2Nlc3MtcGFpciByZXN1bHQpKSkKKyAgICAgICAg ICAgICAgICAgIChpZiBzeW5jaHJvbm91cy1wCisJCSAgICAgIChlc2hlbGwvd2FpdCAoY2Ry IHByb2NzKSkKIAkJICAgIChlc2hlbGwtbWFuaXB1bGF0ZSAiaW5zZXJ0aW5nIGlnbm9yZSBm b3JtIgogCQkgICAgICAoc2V0Y2FyIGZvcm0gJ2lnbm9yZSkKIAkJICAgICAgKHNldGNkciBm b3JtIG5pbCkpCi0JCSAgICAodGhyb3cgJ2VzaGVsbC1kZWZlciByZXN1bHQpKQotCQkobGlz dCAncXVvdGUgcmVzdWx0KSkpKSkpKSkpKSkpCisJCSAgICAodGhyb3cgJ2VzaGVsbC1kZWZl ciBwcm9jcykpCisgICAgICAgICAgICAgICAgKGxpc3QgJ3F1b3RlIHJlc3VsdCkpKSkpKSkp KSkpKQogCiA7OyBjb21tYW5kIGludm9jYXRpb24KIApkaWZmIC0tZ2l0IGEvbGlzcC9lc2hl bGwvZXNoLWlvLmVsIGIvbGlzcC9lc2hlbGwvZXNoLWlvLmVsCmluZGV4IDJlMGYzMTJmNGEu LjhlNjQ2M2VhYzIgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2VzaC1pby5lbAorKysgYi9s aXNwL2VzaGVsbC9lc2gtaW8uZWwKQEAgLTQ4NSw3ICs0ODUsNyBAQCBlc2hlbGwtb3V0cHV0 LW9iamVjdC10by10YXJnZXQKICAgICgoZXNoZWxsLXByb2Nlc3NwIHRhcmdldCkKICAgICAo d2hlbiAoZXEgKHByb2Nlc3Mtc3RhdHVzIHRhcmdldCkgJ3J1bikKICAgICAgICh1bmxlc3Mg KHN0cmluZ3Agb2JqZWN0KQotCShzZXRxIG9iamVjdCAoZXNoZWxsLXN0cmluZ2lmeSBvYmpl Y3QpKSkKKyAgICAgICAoc2V0cSBvYmplY3QgKGVzaGVsbC1zdHJpbmdpZnkgb2JqZWN0KSkp CiAgICAgICAocHJvY2Vzcy1zZW5kLXN0cmluZyB0YXJnZXQgb2JqZWN0KSkpCiAKICAgICgo Y29uc3AgdGFyZ2V0KQpkaWZmIC0tZ2l0IGEvbGlzcC9lc2hlbGwvZXNoLW1vZGUuZWwgYi9s aXNwL2VzaGVsbC9lc2gtbW9kZS5lbAppbmRleCA4MzAyZWVmZTFlLi41OWM4ZjgwMzRmIDEw MDY0NAotLS0gYS9saXNwL2VzaGVsbC9lc2gtbW9kZS5lbAorKysgYi9saXNwL2VzaGVsbC9l c2gtbW9kZS5lbApAQCAtNDIzLDEzICs0MjMsMTMgQEAgZXNoZWxsLXRvZ2dsZS1kaXJlY3Qt c2VuZAogKGRlZnVuIGVzaGVsbC1zZWxmLWluc2VydC1jb21tYW5kICgpCiAgIChpbnRlcmFj dGl2ZSkKICAgKHByb2Nlc3Mtc2VuZC1zdHJpbmcKLSAgIChlc2hlbGwtaW50ZXJhY3RpdmUt cHJvY2VzcykKKyAgIChlc2hlbGwtaGVhZC1wcm9jZXNzKQogICAgKGNoYXItdG8tc3RyaW5n IChpZiAoc3ltYm9scCBsYXN0LWNvbW1hbmQtZXZlbnQpCiAJCSAgICAgICAoZ2V0IGxhc3Qt Y29tbWFuZC1ldmVudCAnYXNjaWktY2hhcmFjdGVyKQogCQkgICAgIGxhc3QtY29tbWFuZC1l dmVudCkpKSkKIAogKGRlZnVuIGVzaGVsbC1pbnRlcmNlcHQtY29tbWFuZHMgKCkKLSAgKHdo ZW4gKGFuZCAoZXNoZWxsLWludGVyYWN0aXZlLXByb2Nlc3MpCisgICh3aGVuIChhbmQgKGVz aGVsbC1pbnRlcmFjdGl2ZS1wcm9jZXNzLXApCiAJICAgICAobm90IChhbmQgKGludGVnZXJw IGxhc3QtaW5wdXQtZXZlbnQpCiAJCSAgICAgICAobWVtcSBsYXN0LWlucHV0LWV2ZW50ICco P1xDLXggP1xDLWMpKSkpKQogICAgIChsZXQgKChwb3NzaWJsZS1ldmVudHMgKHdoZXJlLWlz LWludGVybmFsIHRoaXMtY29tbWFuZCkpCkBAIC01OTUsMTMgKzU5NSwxMyBAQCBlc2hlbGwt c2VuZC1pbnB1dAogbmV3bGluZS4iCiAgIChpbnRlcmFjdGl2ZSAiUCIpCiAgIDs7IE5vdGUg dGhhdCB0aGUgaW5wdXQgc3RyaW5nIGRvZXMgbm90IGluY2x1ZGUgaXRzIHRlcm1pbmFsIG5l d2xpbmUuCi0gIChsZXQgKChwcm9jLXJ1bm5pbmctcCAoYW5kIChlc2hlbGwtaW50ZXJhY3Rp dmUtcHJvY2VzcykKKyAgKGxldCAoKHByb2MtcnVubmluZy1wIChhbmQgKGVzaGVsbC1oZWFk LXByb2Nlc3MpCiAJCQkgICAgIChub3QgcXVldWUtcCkpKQogCShpbmhpYml0LXBvaW50LW1v dGlvbi1ob29rcyB0KQogCShpbmhpYml0LW1vZGlmaWNhdGlvbi1ob29rcyB0KSkKICAgICAo dW5sZXNzIChhbmQgcHJvYy1ydW5uaW5nLXAKIAkJIChub3QgKGVxIChwcm9jZXNzLXN0YXR1 cwotCQkJICAgKGVzaGVsbC1pbnRlcmFjdGl2ZS1wcm9jZXNzKSkKKwkJCSAgIChlc2hlbGwt aGVhZC1wcm9jZXNzKSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3J1bikpKQogICAg ICAgKGlmIChvciBwcm9jLXJ1bm5pbmctcAogCSAgICAgICg+PSAocG9pbnQpIGVzaGVsbC1s YXN0LW91dHB1dC1lbmQpKQpAQCAtNjI3LDggKzYyNyw4IEBAIGVzaGVsbC1zZW5kLWlucHV0 CiAJICAgIChpZiAob3IgZXNoZWxsLXNlbmQtZGlyZWN0LXRvLXN1YnByb2Nlc3NlcwogCQkg ICAgKD0gZXNoZWxsLWxhc3QtaW5wdXQtc3RhcnQgZXNoZWxsLWxhc3QtaW5wdXQtZW5kKSkK IAkJKHVubGVzcyBuby1uZXdsaW5lCi0JCSAgKHByb2Nlc3Mtc2VuZC1zdHJpbmcgKGVzaGVs bC1pbnRlcmFjdGl2ZS1wcm9jZXNzKSAiXG4iKSkKLQkgICAgICAocHJvY2Vzcy1zZW5kLXJl Z2lvbiAoZXNoZWxsLWludGVyYWN0aXZlLXByb2Nlc3MpCisJCSAgKHByb2Nlc3Mtc2VuZC1z dHJpbmcgKGVzaGVsbC1oZWFkLXByb2Nlc3MpICJcbiIpKQorCSAgICAgIChwcm9jZXNzLXNl bmQtcmVnaW9uIChlc2hlbGwtaGVhZC1wcm9jZXNzKQogCQkJCSAgIGVzaGVsbC1sYXN0LWlu cHV0LXN0YXJ0CiAJCQkJICAgZXNoZWxsLWxhc3QtaW5wdXQtZW5kKSkpCiAJKGlmICg9IGVz aGVsbC1sYXN0LW91dHB1dC1lbmQgKHBvaW50KSkKQEAgLTY2NSw2ICs2NjUsMTYgQEAgZXNo ZWxsLXNlbmQtaW5wdXQKIAkgICAgICAgKHJ1bi1ob29rcyAnZXNoZWxsLXBvc3QtY29tbWFu ZC1ob29rKQogCSAgICAgICAoaW5zZXJ0LWFuZC1pbmhlcml0IGlucHV0KSkpKSkpKSkpCiAK KyhkZWZ1biBlc2hlbGwtc2VuZC1lb2YtdG8tcHJvY2VzcyAoKQorICAiU2VuZCBFT0YgdG8g dGhlIGN1cnJlbnRseS1ydW5uaW5nIFwiaGVhZFwiIHByb2Nlc3MuIgorICAoaW50ZXJhY3Rp dmUpCisgIChyZXF1aXJlICdlc2gtbW9kZSkKKyAgKGRlY2xhcmUtZnVuY3Rpb24gZXNoZWxs LXNlbmQtaW5wdXQgImVzaC1tb2RlIgorICAgICAgICAgICAgICAgICAgICAoJm9wdGlvbmFs IHVzZS1yZWdpb24gcXVldWUtcCBuby1uZXdsaW5lKSkKKyAgKGVzaGVsbC1zZW5kLWlucHV0 IG5pbCBuaWwgdCkKKyAgKHdoZW4gKGVzaGVsbC1oZWFkLXByb2Nlc3MpCisgICAgKHByb2Nl c3Mtc2VuZC1lb2YgKGVzaGVsbC1oZWFkLXByb2Nlc3MpKSkpCisKIChkZWZzdWJzdCBlc2hl bGwta2lsbC1uZXcgKCkKICAgIkFkZCB0aGUgbGFzdCBpbnB1dCB0ZXh0IHRvIHRoZSBraWxs IHJpbmcuIgogICAoa2lsbC1yaW5nLXNhdmUgZXNoZWxsLWxhc3QtaW5wdXQtc3RhcnQgZXNo ZWxsLWxhc3QtaW5wdXQtZW5kKSkKQEAgLTkyNCw5ICs5MzQsOSBAQCBlc2hlbGwtc2VuZC1p bnZpc2libGUKICAgKGludGVyYWN0aXZlKSA7IERvbid0IHBhc3Mgc3RyIGFzIGFyZ3VtZW50 LCB0byBhdm9pZCBzbm9vcGluZyB2aWEgQy14IEVTQyBFU0MKICAgKGxldCAoKHN0ciAocmVh ZC1wYXNzd2QKIAkgICAgICAoZm9ybWF0ICIlcyBQYXNzd29yZDogIgotCQkgICAgICAocHJv Y2Vzcy1uYW1lIChlc2hlbGwtaW50ZXJhY3RpdmUtcHJvY2VzcykpKSkpKQorCQkgICAgICAo cHJvY2Vzcy1uYW1lIChlc2hlbGwtaGVhZC1wcm9jZXNzKSkpKSkpCiAgICAgKGlmIChzdHJp bmdwIHN0cikKLQkocHJvY2Vzcy1zZW5kLXN0cmluZyAoZXNoZWxsLWludGVyYWN0aXZlLXBy b2Nlc3MpCisJKHByb2Nlc3Mtc2VuZC1zdHJpbmcgKGVzaGVsbC1oZWFkLXByb2Nlc3MpCiAJ CQkgICAgIChjb25jYXQgc3RyICJcbiIpKQogICAgICAgKG1lc3NhZ2UgIldhcm5pbmc6IHRl eHQgd2lsbCBiZSBlY2hvZWQiKSkpKQogCkBAIC05MzcsNyArOTQ3LDcgQEAgZXNoZWxsLXdh dGNoLWZvci1wYXNzd29yZC1wcm9tcHQKIGBlc2hlbGwtcGFzc3dvcmQtcHJvbXB0LXJlZ2V4 cCcuCiAKIFRoaXMgZnVuY3Rpb24gY291bGQgYmUgaW4gdGhlIGxpc3QgYGVzaGVsbC1vdXRw dXQtZmlsdGVyLWZ1bmN0aW9ucycuIgotICAod2hlbiAoZXNoZWxsLWludGVyYWN0aXZlLXBy b2Nlc3MpCisgICh3aGVuIChlc2hlbGwtaW50ZXJhY3RpdmUtcHJvY2Vzcy1wKQogICAgIChz YXZlLWV4Y3Vyc2lvbgogICAgICAgKGxldCAoKGNhc2UtZm9sZC1zZWFyY2ggdCkpCiAJKGdv dG8tY2hhciBlc2hlbGwtbGFzdC1vdXRwdXQtYmxvY2stYmVnaW4pCmRpZmYgLS1naXQgYS9s aXNwL2VzaGVsbC9lc2gtcHJvYy5lbCBiL2xpc3AvZXNoZWxsL2VzaC1wcm9jLmVsCmluZGV4 IDVlZDY5MmZiNWEuLmJiMjEzNmMwNmMgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2VzaC1w cm9jLmVsCisrKyBiL2xpc3AvZXNoZWxsL2VzaC1wcm9jLmVsCkBAIC0xMDEsNiArMTAxLDgg QEAgZXNoZWxsLWN1cnJlbnQtc3Viam9iLXAKIChkZWZ2YXIgZXNoZWxsLXByb2Nlc3MtbGlz dCBuaWwKICAgIkEgbGlzdCBvZiB0aGUgY3VycmVudCBzdGF0dXMgb2Ygc3VicHJvY2Vzc2Vz LiIpCiAKKyhkZWNsYXJlLWZ1bmN0aW9uIGVzaGVsbC1zZW5kLWVvZi10by1wcm9jZXNzICJl c2gtbW9kZSIpCisKIChkZWZ2YXIta2V5bWFwIGVzaGVsbC1wcm9jLW1vZGUtbWFwCiAgICJD LWMgTS1pIiAgIydlc2hlbGwtaW5zZXJ0LXByb2Nlc3MKICAgIkMtYyBDLWMiICAjJ2VzaGVs bC1pbnRlcnJ1cHQtcHJvY2VzcwpAQCAtNTQyLDE0ICs1NDQsNSBAQCBlc2hlbGwtcXVpdC1w cm9jZXNzCiA7ICAgIDs7IGBlc2hlbGwtcmVzdW1lLWV2YWwnLgogOyAgICAoZXNoZWxsLWtp bGwtcHJvY2Vzcy1mdW5jdGlvbiBuaWwgImNvbnRpbnVlIikpKQogCi0oZGVmdW4gZXNoZWxs LXNlbmQtZW9mLXRvLXByb2Nlc3MgKCkKLSAgIlNlbmQgRU9GIHRvIHByb2Nlc3MuIgotICAo aW50ZXJhY3RpdmUpCi0gIChyZXF1aXJlICdlc2gtbW9kZSkKLSAgKGRlY2xhcmUtZnVuY3Rp b24gZXNoZWxsLXNlbmQtaW5wdXQgImVzaC1tb2RlIgotICAgICAgICAgICAgICAgICAgICAo Jm9wdGlvbmFsIHVzZS1yZWdpb24gcXVldWUtcCBuby1uZXdsaW5lKSkKLSAgKGVzaGVsbC1z ZW5kLWlucHV0IG5pbCBuaWwgdCkKLSAgKGVzaGVsbC1wcm9jZXNzLWludGVyYWN0ICdwcm9j ZXNzLXNlbmQtZW9mKSkKLQogKHByb3ZpZGUgJ2VzaC1wcm9jKQogOzs7IGVzaC1wcm9jLmVs IGVuZHMgaGVyZQpkaWZmIC0tZ2l0IGEvbGlzcC9lc2hlbGwvZXNoLXV0aWwuZWwgYi9saXNw L2VzaGVsbC9lc2gtdXRpbC5lbAppbmRleCAwZTA0ZGJjN2M5Li43ODg0MDRmYzQzIDEwMDY0 NAotLS0gYS9saXNwL2VzaGVsbC9lc2gtdXRpbC5lbAorKysgYi9saXNwL2VzaGVsbC9lc2gt dXRpbC5lbApAQCAtNjA5LDYgKzYwOSwyMCBAQCBlc2hlbGwtcHJvY2Vzc3AKICAgIklmIHRo ZSBgcHJvY2Vzc3AnIGZ1bmN0aW9uIGRvZXMgbm90IGV4aXN0LCBQUk9DIGlzIG5vdCBhIHBy b2Nlc3MuIgogICAoYW5kIChmYm91bmRwICdwcm9jZXNzcCkgKHByb2Nlc3NwIHByb2MpKSkK IAorKGRlZnVuIGVzaGVsbC1wcm9jZXNzLXBhaXItcCAocHJvY3MpCisgICJSZXR1cm4gbm9u LW5pbCBpZiBQUk9DUyBpcyBhIHBhaXIgb2YgcHJvY2VzcyBvYmplY3RzLiIKKyAgKGFuZCAo Y29uc3AgcHJvY3MpCisgICAgICAgKGVzaGVsbC1wcm9jZXNzcCAoY2FyIHByb2NzKSkKKyAg ICAgICAoZXNoZWxsLXByb2Nlc3NwIChjZHIgcHJvY3MpKSkpCisKKyhkZWZ1biBlc2hlbGwt bWFrZS1wcm9jZXNzLXBhaXIgKHByb2NzKQorICAiTWFrZSBhIHBhaXIgb2YgcHJvY2VzcyBv YmplY3RzIGZyb20gUFJPQ1MgaWYgcG9zc2libGUuCitUaGlzIHJlcHJlc2VudHMgdGhlIGhl YWQgYW5kIHRhaWwgb2YgYSBwaXBlbGluZSBvZiBwcm9jZXNzZXMsCit3aGVyZSB0aGUgaGVh ZCBhbmQgdGFpbCBtYXkgYmUgdGhlIHNhbWUgcHJvY2Vzcy4iCisgIChwY2FzZSBwcm9jcwor ICAgICgocHJlZCBlc2hlbGwtcHJvY2Vzc3ApIChjb25zIHByb2NzIHByb2NzKSkKKyAgICAo KHByZWQgZXNoZWxsLXByb2Nlc3MtcGFpci1wKSBwcm9jcykpKQorCiA7OyAoZGVmdW4gZXNo ZWxsLWNvcHktZmlsZQogOzsgICAoZmlsZSBuZXduYW1lICZvcHRpb25hbCBvay1pZi1hbHJl YWR5LWV4aXN0cyBrZWVwLWRhdGUpCiA7OyAgICJDb3B5IEZJTEUgdG8gTkVXTkFNRS4gIFNl ZSBkb2NzIGZvciBgY29weS1maWxlJy4iCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lc2hl bGwuZWwgYi9saXNwL2VzaGVsbC9lc2hlbGwuZWwKaW5kZXggNWMzNTZlODkyOC4uMmM0NzJh MmFmYSAxMDA2NDQKLS0tIGEvbGlzcC9lc2hlbGwvZXNoZWxsLmVsCisrKyBiL2xpc3AvZXNo ZWxsL2VzaGVsbC5lbApAQCAtMzMyLDkgKzMzMiw5IEBAIGVzaGVsbC1jb21tYW5kCiAJOzsg bWFrZSB0aGUgb3V0cHV0IGFzIGF0dHJhY3RpdmUgYXMgcG9zc2libGUsIHdpdGggbm8KIAk7 OyBleHRyYW5lb3VzIG5ld2xpbmVzCiAJKHdoZW4gaW50cgotCSAgKGlmIChlc2hlbGwtaW50 ZXJhY3RpdmUtcHJvY2VzcykKLQkgICAgICAoZXNoZWxsLXdhaXQtZm9yLXByb2Nlc3MgKGVz aGVsbC1pbnRlcmFjdGl2ZS1wcm9jZXNzKSkpCi0JICAoY2wtYXNzZXJ0IChub3QgKGVzaGVs bC1pbnRlcmFjdGl2ZS1wcm9jZXNzKSkpCisJICAoaWYgKGVzaGVsbC1pbnRlcmFjdGl2ZS1w cm9jZXNzLXApCisJICAgICAgKGVzaGVsbC13YWl0LWZvci1wcm9jZXNzIChlc2hlbGwtdGFp bC1wcm9jZXNzKSkpCisJICAoY2wtYXNzZXJ0IChub3QgKGVzaGVsbC1pbnRlcmFjdGl2ZS1w cm9jZXNzLXApKSkKIAkgIChnb3RvLWNoYXIgKHBvaW50LW1heCkpCiAJICAod2hpbGUgKGFu ZCAoYm9scCkgKG5vdCAoYm9icCkpKQogCSAgICAoZGVsZXRlLWNoYXIgLTEpKSkKZGlmZiAt LWdpdCBhL3Rlc3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLWhlbHBlcnMuZWwgYi90ZXN0 L2xpc3AvZXNoZWxsL2VzaGVsbC10ZXN0cy1oZWxwZXJzLmVsCmluZGV4IDc3ZjUzMTNkNTcu LmYzZmJlOTAzNTYgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3Rz LWhlbHBlcnMuZWwKKysrIGIvdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMtaGVscGVy cy5lbApAQCAtNTMsNyArNTMsNyBAQCBlc2hlbGwtd2FpdC1mb3Itc3VicHJvY2VzcwogSWYg dGhpcyB0YWtlcyBsb25nZXIgdGhhbiBgZXNoZWxsLXRlc3QtLW1heC1zdWJwcm9jZXNzLXRp bWUnLAogcmFpc2UgYW4gZXJyb3IuIgogICAobGV0ICgoc3RhcnQgKGN1cnJlbnQtdGltZSkp KQotICAgICh3aGlsZSAoZXNoZWxsLWludGVyYWN0aXZlLXByb2Nlc3MpCisgICAgKHdoaWxl IChlc2hlbGwtaW50ZXJhY3RpdmUtcHJvY2Vzcy1wKQogICAgICAgKHdoZW4gKD4gKGZsb2F0 LXRpbWUgKHRpbWUtc2luY2Ugc3RhcnQpKQogICAgICAgICAgICAgICAgZXNoZWxsLXRlc3Qt LW1heC1zdWJwcm9jZXNzLXRpbWUpCiAgICAgICAgIChlcnJvciAidGltZWQgb3V0IHdhaXRp bmcgZm9yIHN1YnByb2Nlc3MiKSkKZGlmZiAtLWdpdCBhL3Rlc3QvbGlzcC9lc2hlbGwvZXNo ZWxsLXRlc3RzLmVsIGIvdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwKaW5kZXgg NzY1OGQ1ZjU1MS4uM2IxYmJlNzE4OCAxMDA2NDQKLS0tIGEvdGVzdC9saXNwL2VzaGVsbC9l c2hlbGwtdGVzdHMuZWwKKysrIGIvdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwK QEAgLTEzNiw2ICsxMzYsMTcgQEAgZXNoZWxsLXRlc3QvcGlwZS10YWlscHJvYwogICAgKGVz aGVsbC1jb21tYW5kLXJlc3VsdC1wICIqZWNobyBoaSB8IGVjaG8gYnllIgogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICJieWVcbmhpXG4iKSkpCiAKKyhlcnQtZGVmdGVzdCBlc2hl bGwtdGVzdC9waXBlLWhlYWRwcm9jLXN0ZGluICgpCisgICJDaGVjayB0aGF0IHN0YW5kYXJk IGlucHV0IGlzIHNlbnQgdG8gdGhlIGhlYWQgcHJvY2VzcyBpbiBhIHBpcGVsaW5lIgorICAo c2tpcC11bmxlc3MgKGFuZCAoZXhlY3V0YWJsZS1maW5kICJ0ciIpCisgICAgICAgICAgICAg ICAgICAgIChleGVjdXRhYmxlLWZpbmQgInJldiIpKSkKKyAgKHdpdGgtdGVtcC1lc2hlbGwK KyAgIChlc2hlbGwtaW5zZXJ0LWNvbW1hbmQgInRyIGEteiBBLVogfCByZXYiKQorICAgKGVz aGVsbC1pbnNlcnQtY29tbWFuZCAiaGVsbG8iKQorICAgKGVzaGVsbC1zZW5kLWVvZi10by1w cm9jZXNzKQorICAgKGVzaGVsbC13YWl0LWZvci1zdWJwcm9jZXNzKQorICAgKGVzaGVsbC1t YXRjaC1yZXN1bHQgIk9MTEVIXG4iKSkpCisKIChlcnQtZGVmdGVzdCBlc2hlbGwtdGVzdC93 aW5kb3ctaGVpZ2h0ICgpCiAgICIkTElORVMgc2hvdWxkIGVxdWFsICh3aW5kb3ctaGVpZ2h0 KSIKICAgKHNob3VsZCAoZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1bHQgIj0gJExJTkVTICh3 aW5kb3ctaGVpZ2h0KSIpKSkKLS0gCjIuMjUuMQoK --------------3B9ADAD3AB4D55543CE4FD11-- From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 02 21:35:13 2022 Received: (at 53715) by debbugs.gnu.org; 3 Feb 2022 02:35:13 +0000 Received: from localhost ([127.0.0.1]:54041 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFRxo-0000bA-06 for submit@debbugs.gnu.org; Wed, 02 Feb 2022 21:35:13 -0500 Received: from mail-pl1-f182.google.com ([209.85.214.182]:34795) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFRxk-0000ae-Ri for 53715@debbugs.gnu.org; Wed, 02 Feb 2022 21:35:10 -0500 Received: by mail-pl1-f182.google.com with SMTP id h14so968700plf.1 for <53715@debbugs.gnu.org>; Wed, 02 Feb 2022 18:35:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:from:to:cc:references:message-id:date:mime-version :in-reply-to:content-language; bh=WbEhtqOSVAx3aiTFRqP4WOItcFRGWyia0SQ+O4sgMoY=; b=ez03F7GwaEa9tRE2C5AVy3SeclPzyFpmARi1dQsTCXt1ocWyNcs0267wu7rYJN3HN7 wB9qQYmDxxkaxQ2ViRcv1bNoXcEla9VnrqBUfFif0//CEvDH7LDvHFl43t1SjfB8yB9X YaiHgqhBTCr5QBxVXBbcFptwn8K7CtjPZgciq0shV6VbwNWPO8NUjo4hyRRvw6Cf5qbv mRZdhOa2Hqf8tNruVpUzLNRDIYkcvWQf4yaj5Dh5xJ4U8JSFUQ94DHkcXTD4B5RrDN6w TQk9YHd//gQvoU0PsapiIvIOPKX1jIbgVOEQgtq6Q/9+VTH0NtkPjJ0UnjWt+zk+HnXE Nd5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :mime-version:in-reply-to:content-language; bh=WbEhtqOSVAx3aiTFRqP4WOItcFRGWyia0SQ+O4sgMoY=; b=bZQZ/2LckB7WvCjmE5ZnGoonJRYx/XVRt7wCcg0BMFixpF3MDPXEsdJ8Kh3jcGmBZU iBDBBBJBDU9sF2wJwne90+d24STUr88WIAj1ihUsmCqWYpjHm2UzBHVBiJDm5uWekqVR 1t9YYlBf+XFOYIR5KkChd86SNjfTIJfJDkKTC2se5+atpuixWxZK9YP0mBrUYrrfaY9N iMRvs4ZRSmuOBzYM73h+azJlQyZP0F/ZxY2PxEwwGxHwCuD+Iip5cJqCgOpKSagCW3Sr GDJ02qLwGaSBNL6wgdGks1dSZhXzA9XXxqCEAq5k//2+YOWFCtQa+qbhe9/ukwjz1uH4 yHfQ== X-Gm-Message-State: AOAM530PXx7JtDuWuHDDCHKdNFqUt9u/BwcQm5nDgCkewesHfY67ajL3 H/Lt2ozFG5y0P3LybdSH7uuW1xPWfWZCDw== X-Google-Smtp-Source: ABdhPJzVrh5XaKJpmA5oZvX1GpDiZiRij6t85SDmAEsEaSZA0AEgNfNxx4tnsq1slpHftkXY1bNmrw== X-Received: by 2002:a17:90a:b107:: with SMTP id z7mr11527157pjq.38.1643855701632; Wed, 02 Feb 2022 18:35:01 -0800 (PST) Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id s4sm25368578pgg.80.2022.02.02.18.35.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 02 Feb 2022 18:35:00 -0800 (PST) Subject: Re: bug#53715: 29.0.50; [PATCH] Improve correctness of pipelines in Eshell From: Jim Porter To: Lars Ingebrigtsen References: <75056e6b-c739-a48c-2bf8-56ddc456da8e@gmail.com> <871r0lrvg1.fsf@gnus.org> <4733b4db-705c-2b52-e1e6-68b0902f87d3@gmail.com> <87wnidnj4q.fsf@gnus.org> <6b9ef041-4562-6590-0eb9-f42520085a40@gmail.com> Message-ID: <1c276f7a-5074-b826-ed29-ff4e61d9da78@gmail.com> Date: Wed, 2 Feb 2022 18:35:00 -0800 MIME-Version: 1.0 In-Reply-To: <6b9ef041-4562-6590-0eb9-f42520085a40@gmail.com> Content-Type: multipart/mixed; boundary="------------B10F1F4C95B83E039BBCFFCF" Content-Language: en-US X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53715 Cc: 53715@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------B10F1F4C95B83E039BBCFFCF Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 2/2/2022 1:01 PM, Jim Porter wrote: > Ah, I think I see the issue. I should have updated > `eshell-wait-for-subprocess' in test/lisp/eshell/eshell-tests-helpers.el > to use the new defsubst, which would have caused it to get recompiled. > (Though manually recompiling it should also work.) > > I've attached a fixed patch (the first one is the same; I only updated > the second). Here's a small additional improvement that I hope is correct. The third patch here changes how eshell-tests-helpers.el is loaded to that it uses `require'. This reduces some of the boilerplate and will hopefully prevent issues with this file not getting recompiled when it's updated. The first two patches are the same as before. I've just included them for completeness/ease of applying. --------------B10F1F4C95B83E039BBCFFCF Content-Type: text/plain; charset=UTF-8; name="0001-Ensure-that-tailproc-is-set-for-the-last-process-in-.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Ensure-that-tailproc-is-set-for-the-last-process-in-.pa"; filename*1="tch" RnJvbSBiZGE1ZDFkYmUzMjJiOGZkY2FjNjAxNzUzZjc0ZDFhNjJkOWIyNTZjIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFRodSwgMjcgSmFuIDIwMjIgMjM6MTM6MzYgLTA4MDAKU3ViamVjdDogW1BB VENIIDEvM10gRW5zdXJlIHRoYXQgdGFpbHByb2MgaXMgc2V0IGZvciB0aGUgbGFzdCBwcm9j ZXNzIGluIGFuCiBFc2hlbGwgcGlwZWxpbmUKCkluIHBhcnRpY3VsYXIsIHRoaXMgdXNlZCB0 byBmYWlsIGZvciBwaXBlbGluZXMgd2hlcmUgdGhlIGxhc3QgcHJvY2VzcwppbiB0aGUgcGlw ZWxpbmUgY2FtZSBmcm9tIHRoZSBmaXJzdCBlbGVtZW50IG9mIHRoZSBwaXBlbGluZS4gVGhp cwpjb3VsZCBoYXBwZW4gd2hlbiBhIHByb2Nlc3Mgd2FzIHBpcGVkIHRvIGFuIG9yZGluYXJ5 IExpc3AgZnVuY3Rpb24sCmxpa2UgaW4gJyplY2hvIGhpIHwgZWNobyBieWUnLgoKKiBsaXNw L2VzaGVsbC9lc2gtY21kLmVsIChlc2hlbGwtZG8tcGlwZWxpbmVzKTogU2V0IHRoZSB0YWls cHJvYyBldmVuCmZvciB0aGUgZmlyc3QgcHJvY2VzcyBpbiB0aGUgcGlwZWxpbmUuCgoqIHRl c3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLmVsIChlc2hlbGwtdGVzdC9waXBlLXRhaWxw cm9jKTogTmV3CnRlc3QuCi0tLQogbGlzcC9lc2hlbGwvZXNoLWNtZC5lbCAgICAgICAgICAg fCA3ICsrKystLS0KIHRlc3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLmVsIHwgNyArKysr KysrCiAyIGZpbGVzIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvbGlzcC9lc2hlbGwvZXNoLWNtZC5lbCBiL2xpc3AvZXNoZWxsL2Vz aC1jbWQuZWwKaW5kZXggMDRkNjVkZjRmMy4uMTQxMzk4OTZkZCAxMDA2NDQKLS0tIGEvbGlz cC9lc2hlbGwvZXNoLWNtZC5lbAorKysgYi9saXNwL2VzaGVsbC9lc2gtY21kLmVsCkBAIC03 NjQsOCArNzY0LDcgQEAgZXNoZWxsLWRvLXBpcGVsaW5lcwogICAgICAgICAgICAgICAoZXNo ZWxsLXNldC1vdXRwdXQtaGFuZGxlICxlc2hlbGwtb3V0cHV0LWhhbmRsZQogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdhcHBlbmQgbmV4dHByb2MpCiAgICAg ICAgICAgICAgIChlc2hlbGwtc2V0LW91dHB1dC1oYW5kbGUgLGVzaGVsbC1lcnJvci1oYW5k bGUKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnYXBwZW5kIG5l eHRwcm9jKQotICAgICAgICAgICAgICAoc2V0cSB0YWlscHJvYyAob3IgdGFpbHByb2MgbmV4 dHByb2MpKSkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2Fw cGVuZCBuZXh0cHJvYykpKQogCSwobGV0ICgoaGVhZCAoY2FyIHBpcGVsaW5lKSkpCiAJICAg KGlmIChtZW1xIChjYXIgaGVhZCkgJyhsZXQgcHJvZ24pKQogCSAgICAgICAoc2V0cSBoZWFk IChjYXIgKGxhc3QgaGVhZCkpKSkKQEAgLTc4MSw3ICs3ODAsOSBAQCBlc2hlbGwtZG8tcGlw ZWxpbmVzCiAJICAgICAgICwoY29uZCAoKG5vdCBub3RmaXJzdCkgKHF1b3RlICdmaXJzdCkp CiAJCSAgICAgICgoY2RyIHBpcGVsaW5lKSB0KQogCQkgICAgICAodCAocXVvdGUgJ2xhc3Qp KSkpKQotCSAgLChjYXIgcGlwZWxpbmUpKSkpKSkKKyAgICAgICAgICAobGV0ICgocHJvYyAs KGNhciBwaXBlbGluZSkpKQorICAgICAgICAgICAgKHNldHEgdGFpbHByb2MgKG9yIHRhaWxw cm9jIHByb2MpKQorICAgICAgICAgICAgcHJvYykpKSkpKQogCiAoZGVmbWFjcm8gZXNoZWxs LWRvLXBpcGVsaW5lcy1zeW5jaHJvbm91c2x5IChwaXBlbGluZSkKICAgIkV4ZWN1dGUgdGhl IGNvbW1hbmRzIGluIFBJUEVMSU5FIGluIHNlcXVlbmNlIHN5bmNocm9ub3VzbHkuCmRpZmYg LS1naXQgYS90ZXN0L2xpc3AvZXNoZWxsL2VzaGVsbC10ZXN0cy5lbCBiL3Rlc3QvbGlzcC9l c2hlbGwvZXNoZWxsLXRlc3RzLmVsCmluZGV4IDU0MjgxNWRmODAuLjc2NThkNWY1NTEgMTAw NjQ0Ci0tLSBhL3Rlc3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLmVsCisrKyBiL3Rlc3Qv bGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLmVsCkBAIC0xMjksNiArMTI5LDEzIEBAIGVzaGVs bC10ZXN0L2ludGVycC1jbWQtZXh0ZXJuYWwtY29uY2F0CiAgICAoZXNoZWxsLWNvbW1hbmQt cmVzdWx0LXAgImVjaG8gJHtlY2hvIGhpfS0keyplY2hvIHRoZXJlfSIKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAiaGktdGhlcmVcbiIpKSkKIAorKGVydC1kZWZ0ZXN0IGVzaGVs bC10ZXN0L3BpcGUtdGFpbHByb2MgKCkKKyAgIkNoZWNrIHRoYXQgcGlwaW5nIGEgcHJvY2Vz cyB0byBhIG5vbi1wcm9jZXNzIGNvbW1hbmQgd2FpdHMgZm9yIHRoZSBwcm9jZXNzIgorICAo c2tpcC11bmxlc3MgKGV4ZWN1dGFibGUtZmluZCAiZWNobyIpKQorICAod2l0aC10ZW1wLWVz aGVsbAorICAgKGVzaGVsbC1jb21tYW5kLXJlc3VsdC1wICIqZWNobyBoaSB8IGVjaG8gYnll IgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICJieWVcbmhpXG4iKSkpCisKIChlcnQt ZGVmdGVzdCBlc2hlbGwtdGVzdC93aW5kb3ctaGVpZ2h0ICgpCiAgICIkTElORVMgc2hvdWxk IGVxdWFsICh3aW5kb3ctaGVpZ2h0KSIKICAgKHNob3VsZCAoZXNoZWxsLXRlc3QtY29tbWFu ZC1yZXN1bHQgIj0gJExJTkVTICh3aW5kb3ctaGVpZ2h0KSIpKSkKLS0gCjIuMjUuMQoK --------------B10F1F4C95B83E039BBCFFCF Content-Type: text/plain; charset=UTF-8; name="0002-When-executing-an-Eshell-pipeline-send-input-to-the-.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0002-When-executing-an-Eshell-pipeline-send-input-to-the-.pa"; filename*1="tch" RnJvbSA3OGI4Y2M5MjZlOTc4ZjllNjBlZmU0MTkzZjFmMjkwMTkwOTA0NTVhIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFN1biwgMzAgSmFuIDIwMjIgMTg6NTM6NTMgLTA4MDAKU3ViamVjdDogW1BB VENIIDIvM10gV2hlbiBleGVjdXRpbmcgYW4gRXNoZWxsIHBpcGVsaW5lLCBzZW5kIGlucHV0 IHRvIHRoZQogZmlyc3QgcHJvY2VzcwoKUHJldmlvdXNseSwgaW5wdXQgd2FzIHNlbnQgdG8g dGhlIGxhc3QgcHJvY2VzcyBpbiB0aGUgcGlwZWxpbmUsCnJlc3VsdGluZyBpbiB1bmV4cGVj dGVkIGJlaGF2aW9yIHdoZW4gcnVubmluZyBjb21tYW5kcyBsaWtlCid0ciBhLXogQS1aIHwg cmV2Jy4KCiogbGlzcC9lc2hlbGwvZXNoLXV0aWwuZWwgKGVzaGVsbC1wcm9jZXNzLXBhaXIt cCkKKGVzaGVsbC1tYWtlLXByb2Nlc3MtcGFpcik6IE5ldyBmdW5jdGlvbnMuCgoqIGxpc3Av ZXNoZWxsL2VzaC1jbWQuZWwgKGVzaGVsbC1sYXN0LWFzeW5jLXByb2MpOiBSZW5hbWUgdG8u Li4KKGVzaGVsbC1sYXN0LWFzeW5jLXByb2NzKTogLi4uIHRoaXMsIGFuZCBzdG9yZSBhIHBh aXIgb2YgcHJvY2Vzc2VzLgooZXNoZWxsLWludGVyYWN0aXZlLXByb2Nlc3MpOiBSZXBsYWNl IHdpdGguLi4KKGVzaGVsbC1pbnRlcmFjdGl2ZS1wcm9jZXNzLXAsIGVzaGVsbC1oZWFkLXBy b2Nlc3MpCihlc2hlbGwtdGFpbC1wcm9jZXNzKTogLi4uIHRoZXNlLgooZXNoZWxsLWNtZC1p bml0aWFsaXplKTogU2V0ICdlc2hlbGwtbGFzdC1hc3luYy1wcm9jcycuCihlc2hlbGwtZG8t cGlwZWxpbmVzKTogU2V0ICdoZWFkcHJvYycuCihlc2hlbGwtZXhlY3V0ZS1waXBlbGluZSk6 IFJldHVybiAnaGVhZHByb2MnIGFuZCAndGFpbHByb2MnLgooZXNoZWxsLXJlc3VtZS1ldmFs KTogVXNlICdlc2hlbGwtbGFzdC1hc3luYy1wcm9jcycuCihlc2hlbGwtZG8tZXZhbCk6IE1h a2Ugc3VyZSB3ZSB3b3JrIHdpdGggYSBwYWlyIG9mIHByb2Nlc3Nlcy4KCiogbGlzcC9lc2hl bGwvZXNoLXByb2MuZWwgKGVzaGVsbC1zZW5kLWVvZi10by1wcm9jZXNzKTogTW92ZSBmcm9t CmhlcmUuLi4KKiBsaXNwL2VzaGVsbC9lc2gtbW9kZS5lbCAoZXNoZWxsLXNlbmQtZW9mLXRv LXByb2Nlc3MpOiAuLi4gdG8gaGVyZSwKYW5kIG9ubHkgc2VuZCBFT0YgdG8gdGhlIGhlYWQg cHJvY2Vzcy4KCiogbGlzcC9lc2hlbGwvZW0tY21wbC5lbCAoZXNoZWxsLWNvbXBsZXRlLXBh cnNlLWFyZ3VtZW50cykKKiBsaXNwL2VzaGVsbC9lc2gtbW9kZS5lbCAoZXNoZWxsLWludGVy Y2VwdC1jb21tYW5kcykKKGVzaGVsbC13YXRjaC1mb3ItcGFzc3dvcmQtcHJvbXB0KToKVXNl ICdlc2hlbGwtaW50ZXJhY3RpdmUtcHJvY2Vzcy1wJy4KCiogbGlzcC9lc2hlbGwvZW0tcmVi aW5kLmVsIChlc2hlbGwtZGVsY2hhci1vci1tYXliZS1lb2YpCiogbGlzcC9lc2hlbGwvZW0t dGVybS5lbCAoZXNoZWxsLXRlcm0tc2VuZC1yYXctc3RyaW5nKQoqIGxpc3AvZXNoZWxsL2Vz aC1tb2RlLmVsIChlc2hlbGwtc2VsZi1pbnNlcnQtY29tbWFuZCkKKGVzaGVsbC1zZW5kLWlu cHV0LCBlc2hlbGwtc2VuZC1pbnZpc2libGUpOgpVc2UgJ2VzaGVsbC1oZWFkLXByb2Nlc3Mn LgoKKiBsaXNwL2VzaGVsbC9lc2gtY21kLmVsIChlc2hlbGwtYXMtc3ViY29tbWFuZCk6ClVz ZSAnZXNoZWxsLXRhaWwtcHJvY2VzcycuCgoqIGxpc3AvZXNoZWxsL2VzaGVsbC5lbCAoZXNo ZWxsLWNvbW1hbmQpOgoqIHRlc3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLWhlbHBlcnMu ZWwKKGVzaGVsbC13YWl0LWZvci1zdWJwcm9jZXNzKToKVXNlICdlc2hlbGwtaW50ZXJhY3Rp dmUtcHJvY2Vzcy1wJyBhbmQgJ2VzaGVsbC10YWlsLXByb2Nlc3MnLgoKKiB0ZXN0L2xpc3Av ZXNoZWxsL2VzaGVsbC10ZXN0cy5lbCAoZXNoZWxsLXRlc3QvcGlwZS1oZWFkcHJvYy1zdGRp bik6Ck5ldyB0ZXN0LgotLS0KIGxpc3AvZXNoZWxsL2VtLWNtcGwuZWwgICAgICAgICAgICAg ICAgICAgfCAgMiArLQogbGlzcC9lc2hlbGwvZW0tcmViaW5kLmVsICAgICAgICAgICAgICAg ICB8ICAyICstCiBsaXNwL2VzaGVsbC9lbS10ZXJtLmVsICAgICAgICAgICAgICAgICAgIHwg IDIgKy0KIGxpc3AvZXNoZWxsL2VzaC1jbWQuZWwgICAgICAgICAgICAgICAgICAgfCA2NiAr KysrKysrKysrKysrKystLS0tLS0tLS0KIGxpc3AvZXNoZWxsL2VzaC1pby5lbCAgICAgICAg ICAgICAgICAgICAgfCAgMiArLQogbGlzcC9lc2hlbGwvZXNoLW1vZGUuZWwgICAgICAgICAg ICAgICAgICB8IDI4ICsrKysrKy0tLS0KIGxpc3AvZXNoZWxsL2VzaC1wcm9jLmVsICAgICAg ICAgICAgICAgICAgfCAxMSArLS0tCiBsaXNwL2VzaGVsbC9lc2gtdXRpbC5lbCAgICAgICAg ICAgICAgICAgIHwgMTQgKysrKysKIGxpc3AvZXNoZWxsL2VzaGVsbC5lbCAgICAgICAgICAg ICAgICAgICAgfCAgNiArLS0KIHRlc3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLWhlbHBl cnMuZWwgfCAgMiArLQogdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwgICAgICAg ICB8IDExICsrKysKIDExIGZpbGVzIGNoYW5nZWQsIDk3IGluc2VydGlvbnMoKyksIDQ5IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvZXNoZWxsL2VtLWNtcGwuZWwgYi9saXNw L2VzaGVsbC9lbS1jbXBsLmVsCmluZGV4IGM2YTUxYjE3OTMuLmI3OTQ3NWY2ZTAgMTAwNjQ0 Ci0tLSBhL2xpc3AvZXNoZWxsL2VtLWNtcGwuZWwKKysrIGIvbGlzcC9lc2hlbGwvZW0tY21w bC5lbApAQCAtMzE0LDcgKzMxNCw3IEBAIGVzaGVsbC1jb21wbGV0aW9uLWhlbHAKIChkZWZ1 biBlc2hlbGwtY29tcGxldGUtcGFyc2UtYXJndW1lbnRzICgpCiAgICJQYXJzZSB0aGUgY29t bWFuZCBsaW5lIGFyZ3VtZW50cyBmb3IgYHBjb21wbGV0ZS1hcmd1bWVudCcuIgogICAod2hl biAoYW5kIGVzaGVsbC1uby1jb21wbGV0aW9uLWR1cmluZy1qb2JzCi0JICAgICAoZXNoZWxs LWludGVyYWN0aXZlLXByb2Nlc3MpKQorCSAgICAgKGVzaGVsbC1pbnRlcmFjdGl2ZS1wcm9j ZXNzLXApKQogICAgIChpbnNlcnQtYW5kLWluaGVyaXQgIlx0IikKICAgICAodGhyb3cgJ3Bj b21wbGV0ZWQgdCkpCiAgIChsZXQgKChlbmQgKHBvaW50LW1hcmtlcikpCmRpZmYgLS1naXQg YS9saXNwL2VzaGVsbC9lbS1yZWJpbmQuZWwgYi9saXNwL2VzaGVsbC9lbS1yZWJpbmQuZWwK aW5kZXggZjI0NzU4ZDRlMy4uMmI1NmM5ZTg0NCAxMDA2NDQKLS0tIGEvbGlzcC9lc2hlbGwv ZW0tcmViaW5kLmVsCisrKyBiL2xpc3AvZXNoZWxsL2VtLXJlYmluZC5lbApAQCAtMjM4LDcg KzIzOCw3IEBAIGVzaGVsbC1kZWxjaGFyLW9yLW1heWJlLWVvZgogU2VuZHMgYW4gRU9GIG9u bHkgaWYgcG9pbnQgaXMgYXQgdGhlIGVuZCBvZiB0aGUgYnVmZmVyIGFuZCB0aGVyZSBpcyBu bwogaW5wdXQuIgogICAoaW50ZXJhY3RpdmUgInAiKQotICAobGV0ICgocHJvYyAoZXNoZWxs LWludGVyYWN0aXZlLXByb2Nlc3MpKSkKKyAgKGxldCAoKHByb2MgKGVzaGVsbC1oZWFkLXBy b2Nlc3MpKSkKICAgICAoaWYgKGVvYnApCiAJKGNvbmQKIAkgKCgvPSAocG9pbnQpIGVzaGVs bC1sYXN0LW91dHB1dC1lbmQpCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lbS10ZXJtLmVs IGIvbGlzcC9lc2hlbGwvZW0tdGVybS5lbAppbmRleCBlMzRjNWFlNDdjLi5kMTUwYzA3YjAz IDEwMDY0NAotLS0gYS9saXNwL2VzaGVsbC9lbS10ZXJtLmVsCisrKyBiL2xpc3AvZXNoZWxs L2VtLXRlcm0uZWwKQEAgLTIyNCw3ICsyMjQsNyBAQCBlc2hlbGwtdGVybS1zZW50aW5lbAog CiA7IChkZWZ1biBlc2hlbGwtdGVybS1zZW5kLXJhdy1zdHJpbmcgKGNoYXJzKQogOyAgIChn b3RvLWNoYXIgZXNoZWxsLWxhc3Qtb3V0cHV0LWVuZCkKLTsgICAocHJvY2Vzcy1zZW5kLXN0 cmluZyAoZXNoZWxsLWludGVyYWN0aXZlLXByb2Nlc3MpIGNoYXJzKSkKKzsgICAocHJvY2Vz cy1zZW5kLXN0cmluZyAoZXNoZWxsLWhlYWQtcHJvY2VzcykgY2hhcnMpKQogCiA7IChkZWZ1 biBlc2hlbGwtdGVybS1zZW5kLXJhdyAoKQogOyAgICJTZW5kIHRoZSBsYXN0IGNoYXJhY3Rl ciB0eXBlZCB0aHJvdWdoIHRoZSB0ZXJtaW5hbC1lbXVsYXRvcgpkaWZmIC0tZ2l0IGEvbGlz cC9lc2hlbGwvZXNoLWNtZC5lbCBiL2xpc3AvZXNoZWxsL2VzaC1jbWQuZWwKaW5kZXggMTQx Mzk4OTZkZC4uZTcwMmRlMDNhMCAxMDA2NDQKLS0tIGEvbGlzcC9lc2hlbGwvZXNoLWNtZC5l bAorKysgYi9saXNwL2VzaGVsbC9lc2gtY21kLmVsCkBAIC0yNzksMTQgKzI3OSwzMyBAQCBl c2hlbGwtaW4tcGlwZWxpbmUtcAogKGRlZnZhciBlc2hlbGwtaW4tc3ViY29tbWFuZC1wIG5p bCkKIChkZWZ2YXIgZXNoZWxsLWxhc3QtYXJndW1lbnRzIG5pbCkKIChkZWZ2YXIgZXNoZWxs LWxhc3QtY29tbWFuZC1uYW1lIG5pbCkKLShkZWZ2YXIgZXNoZWxsLWxhc3QtYXN5bmMtcHJv YyBuaWwKLSAgIldoZW4gdGhpcyBmb3JlZ3JvdW5kIHByb2Nlc3MgY29tcGxldGVzLCByZXN1 bWUgY29tbWFuZCBldmFsdWF0aW9uLiIpCisoZGVmdmFyIGVzaGVsbC1sYXN0LWFzeW5jLXBy b2NzIG5pbAorICAiVGhlIGN1cnJlbnRseS1ydW5uaW5nIGZvcmVncm91bmQgcHJvY2Vzcyhl cykuCitXaGVuIGV4ZWN1dGluZyBhIHBpcGVsaW5lLCB0aGlzIGlzIGEgY29ucyBjZWxsIHdo b3NlIENBUiBpcyB0aGUKK2ZpcnN0IHByb2Nlc3MgKHVzdWFsbHkgcmVhZGluZyBmcm9tIHN0 ZGluKSBhbmQgd2hvc2UgQ0RSIGlzIHRoZQorbGFzdCBwcm9jZXNzICh1c3VhbGx5IHdyaXRp bmcgdG8gc3Rkb3V0KS4gIE90aGVyd2lzZSwgdGhlIENBUiBhbmQKK0NEUiBhcmUgdGhlIHNh bWUgcHJvY2Vzcy4KKworV2hlbiB0aGUgcHJvY2VzcyBpbiB0aGUgQ0RSIGNvbXBsZXRlcywg cmVzdW1lIGNvbW1hbmQgZXZhbHVhdGlvbi4iKQogCiA7OzsgRnVuY3Rpb25zOgogCi0oZGVm c3Vic3QgZXNoZWxsLWludGVyYWN0aXZlLXByb2Nlc3MgKCkKLSAgIlJldHVybiBjdXJyZW50 bHkgcnVubmluZyBjb21tYW5kIHByb2Nlc3MsIGlmIG5vbi1MaXNwLiIKLSAgZXNoZWxsLWxh c3QtYXN5bmMtcHJvYykKKyhkZWZzdWJzdCBlc2hlbGwtaW50ZXJhY3RpdmUtcHJvY2Vzcy1w ICgpCisgICJSZXR1cm4gbm9uLW5pbCBpZiB0aGVyZSBpcyBhIGN1cnJlbnRseSBydW5uaW5n IGNvbW1hbmQgcHJvY2Vzcy4iCisgIGVzaGVsbC1sYXN0LWFzeW5jLXByb2NzKQorCisoZGVm c3Vic3QgZXNoZWxsLWhlYWQtcHJvY2VzcyAoKQorICAiUmV0dXJuIHRoZSBjdXJyZW50bHkg cnVubmluZyBwcm9jZXNzIGF0IHRoZSBoZWFkIG9mIGFueSBwaXBlbGluZS4KK1RoaXMgb25s eSByZXR1cm5zIGV4dGVybmFsIChub24tTGlzcCkgcHJvY2Vzc2VzLiIKKyAgKGNhci1zYWZl IGVzaGVsbC1sYXN0LWFzeW5jLXByb2NzKSkKKworKGRlZnN1YnN0IGVzaGVsbC10YWlsLXBy b2Nlc3MgKCkKKyAgIlJldHVybiB0aGUgY3VycmVudGx5IHJ1bm5pbmcgcHJvY2VzcyBhdCB0 aGUgdGFpbCBvZiBhbnkgcGlwZWxpbmUuCitUaGlzIG9ubHkgcmV0dXJucyBleHRlcm5hbCAo bm9uLUxpc3ApIHByb2Nlc3Nlcy4iCisgIChjZHItc2FmZSBlc2hlbGwtbGFzdC1hc3luYy1w cm9jcykpCisKKyhkZWZpbmUtb2Jzb2xldGUtZnVuY3Rpb24tYWxpYXMgJ2VzaGVsbC1pbnRl cmFjdGl2ZS1wcm9jZXNzCisgICdlc2hlbGwtdGFpbC1wcm9jZXNzICIyOS4xIikKIAogKGRl ZnVuIGVzaGVsbC1jbWQtaW5pdGlhbGl6ZSAoKSAgICAgO0NhbGxlZCBmcm9tIGBlc2hlbGwt bW9kZScgdmlhIGludGVybi1zb2Z0IQogICAiSW5pdGlhbGl6ZSB0aGUgRXNoZWxsIGNvbW1h bmQgcHJvY2Vzc2luZyBtb2R1bGUuIgpAQCAtMjk1LDcgKzMxNCw3IEBAIGVzaGVsbC1jbWQt aW5pdGlhbGl6ZQogICAoc2V0cS1sb2NhbCBlc2hlbGwtY29tbWFuZC1hcmd1bWVudHMgbmls KQogICAoc2V0cS1sb2NhbCBlc2hlbGwtbGFzdC1hcmd1bWVudHMgbmlsKQogICAoc2V0cS1s b2NhbCBlc2hlbGwtbGFzdC1jb21tYW5kLW5hbWUgbmlsKQotICAoc2V0cS1sb2NhbCBlc2hl bGwtbGFzdC1hc3luYy1wcm9jIG5pbCkKKyAgKHNldHEtbG9jYWwgZXNoZWxsLWxhc3QtYXN5 bmMtcHJvY3MgbmlsKQogCiAgIChhZGQtaG9vayAnZXNoZWxsLWtpbGwtaG9vayAjJ2VzaGVs bC1yZXN1bWUtY29tbWFuZCBuaWwgdCkKIApAQCAtMzA2LDcgKzMyNSw3IEBAIGVzaGVsbC1j bWQtaW5pdGlhbGl6ZQogICAoYWRkLWhvb2sgJ2VzaGVsbC1wb3N0LWNvbW1hbmQtaG9vawog ICAgICAgICAgICAgKGxhbWJkYSAoKQogICAgICAgICAgICAgICAoc2V0cSBlc2hlbGwtY3Vy cmVudC1jb21tYW5kIG5pbAotICAgICAgICAgICAgICAgICAgICBlc2hlbGwtbGFzdC1hc3lu Yy1wcm9jIG5pbCkpCisgICAgICAgICAgICAgICAgICAgIGVzaGVsbC1sYXN0LWFzeW5jLXBy b2NzIG5pbCkpCiAgICAgICAgICAgICBuaWwgdCkKIAogICAoYWRkLWhvb2sgJ2VzaGVsbC1w YXJzZS1hcmd1bWVudC1ob29rCkBAIC03ODEsNiArODAwLDggQEAgZXNoZWxsLWRvLXBpcGVs aW5lcwogCQkgICAgICAoKGNkciBwaXBlbGluZSkgdCkKIAkJICAgICAgKHQgKHF1b3RlICds YXN0KSkpKSkKICAgICAgICAgICAobGV0ICgocHJvYyAsKGNhciBwaXBlbGluZSkpKQorICAg ICAgICAgICAgLCh1bmxlc3Mgbm90Zmlyc3QKKyAgICAgICAgICAgICAgICcoc2V0cSBoZWFk cHJvYyBwcm9jKSkKICAgICAgICAgICAgIChzZXRxIHRhaWxwcm9jIChvciB0YWlscHJvYyBw cm9jKSkKICAgICAgICAgICAgIHByb2MpKSkpKSkKIApAQCAtODIzLDcgKzg0NCw3IEBAICdl c2hlbGwtcHJvY2Vzcy1pZGVudGl0eQogCiAoZGVmbWFjcm8gZXNoZWxsLWV4ZWN1dGUtcGlw ZWxpbmUgKHBpcGVsaW5lKQogICAiRXhlY3V0ZSB0aGUgY29tbWFuZHMgaW4gUElQRUxJTkUs IGNvbm5lY3RpbmcgZWFjaCB0byBvbmUgYW5vdGhlci4iCi0gIGAobGV0ICgoZXNoZWxsLWlu LXBpcGVsaW5lLXAgdCkgdGFpbHByb2MpCisgIGAobGV0ICgoZXNoZWxsLWluLXBpcGVsaW5l LXAgdCkgaGVhZHByb2MgdGFpbHByb2MpCiAgICAgIChwcm9nbgogICAgICAgICwoaWYgKGZi b3VuZHAgJ21ha2UtcHJvY2VzcykKIAkgICAgYChlc2hlbGwtZG8tcGlwZWxpbmVzICxwaXBl bGluZSkKQEAgLTgzMyw3ICs4NTQsNyBAQCBlc2hlbGwtZXhlY3V0ZS1waXBlbGluZQogCQkJ CShjYXIgKGFyZWYgZXNoZWxsLWN1cnJlbnQtaGFuZGxlcwogCQkJCQkgICAsZXNoZWxsLWVy cm9yLWhhbmRsZSkpIG5pbCkpKQogCSAgICAgKGVzaGVsbC1kby1waXBlbGluZXMtc3luY2hy b25vdXNseSAscGlwZWxpbmUpKSkKLSAgICAgICAoZXNoZWxsLXByb2Nlc3MtaWRlbnRpdHkg dGFpbHByb2MpKSkpCisgICAgICAgKGVzaGVsbC1wcm9jZXNzLWlkZW50aXR5IChjb25zIGhl YWRwcm9jIHRhaWxwcm9jKSkpKSkKIAogKGRlZm1hY3JvIGVzaGVsbC1hcy1zdWJjb21tYW5k IChjb21tYW5kKQogICAiRXhlY3V0ZSBDT01NQU5EIHVzaW5nIGEgdGVtcCBidWZmZXIuCkBA IC05OTMsMjQgKzEwMTQsMjQgQEAgZXNoZWxsLXJlc3VtZS1jb21tYW5kCiAgICAgKHVubGVz cyAob3IgKG5vdCAoc3RyaW5ncCBzdGF0dXMpKQogCQkoc3RyaW5nPSAic3RvcHBlZCIgc3Rh dHVzKQogCQkoc3RyaW5nLW1hdGNoIGVzaGVsbC1yZXNldC1zaWduYWxzIHN0YXR1cykpCi0g ICAgICAoaWYgKGVxIHByb2MgKGVzaGVsbC1pbnRlcmFjdGl2ZS1wcm9jZXNzKSkKKyAgICAg IChpZiAoZXEgcHJvYyAoZXNoZWxsLXRhaWwtcHJvY2VzcykpCiAJICAoZXNoZWxsLXJlc3Vt ZS1ldmFsKSkpKSkKIAogKGRlZnVuIGVzaGVsbC1yZXN1bWUtZXZhbCAoKQogICAiRGVzdHJ1 Y3RpdmVseSBldmFsdWF0ZSBhIGZvcm0gd2hpY2ggbWF5IG5lZWQgdG8gYmUgZGVmZXJyZWQu IgogICAoZXNoZWxsLWNvbmRpdGlvbi1jYXNlIGVycgogICAgICAgKHByb2duCi0JKHNldHEg ZXNoZWxsLWxhc3QtYXN5bmMtcHJvYyBuaWwpCisJKHNldHEgZXNoZWxsLWxhc3QtYXN5bmMt cHJvY3MgbmlsKQogCSh3aGVuIGVzaGVsbC1jdXJyZW50LWNvbW1hbmQKIAkgIChsZXQqIChy ZXR2YWwKLQkJIChwcm9jIChjYXRjaCAnZXNoZWxsLWRlZmVyCisJCSAocHJvY3MgKGNhdGNo ICdlc2hlbGwtZGVmZXIKIAkJCSAoaWdub3JlCiAJCQkgIChzZXRxIHJldHZhbAogCQkJCShl c2hlbGwtZG8tZXZhbAogCQkJCSBlc2hlbGwtY3VycmVudC1jb21tYW5kKSkpKSkpCi0JICAg IChpZiAoZXNoZWxsLXByb2Nlc3NwIHByb2MpCi0JCShpZ25vcmUgKHNldHEgZXNoZWxsLWxh c3QtYXN5bmMtcHJvYyBwcm9jKSkKLQkgICAgICAoY2FkciByZXR2YWwpKSkpKQorICAgICAg ICAgICAoaWYgKGVzaGVsbC1wcm9jZXNzLXBhaXItcCBwcm9jcykKKyAgICAgICAgICAgICAg IChpZ25vcmUgKHNldHEgZXNoZWxsLWxhc3QtYXN5bmMtcHJvY3MgcHJvY3MpKQorICAgICAg ICAgICAgIChjYWRyIHJldHZhbCkpKSkpCiAgICAgKGVycm9yCiAgICAgIChlcnJvciAoZXJy b3ItbWVzc2FnZS1zdHJpbmcgZXJyKSkpKSkKIApAQCAtMTE3MywxNyArMTE5NCwxNiBAQCBl c2hlbGwtZG8tZXZhbAogCQkgICAgKHNldGNhciBmb3JtIChjYXIgbmV3LWZvcm0pKQogCQkg ICAgKHNldGNkciBmb3JtIChjZHIgbmV3LWZvcm0pKSkKIAkJICAoZXNoZWxsLWRvLWV2YWwg Zm9ybSBzeW5jaHJvbm91cy1wKSkKLQkgICAgICAoaWYgKGFuZCAobWVtcSAoY2FyIGZvcm0p IGVzaGVsbC1kZWZlcnJhYmxlLWNvbW1hbmRzKQotCQkgICAgICAgKG5vdCBlc2hlbGwtY3Vy cmVudC1zdWJqb2ItcCkKLQkJICAgICAgIHJlc3VsdAotCQkgICAgICAgKGVzaGVsbC1wcm9j ZXNzcCByZXN1bHQpKQotCQkgIChpZiBzeW5jaHJvbm91cy1wCi0JCSAgICAgIChlc2hlbGwv d2FpdCByZXN1bHQpCisgICAgICAgICAgICAgIChpZi1sZXQgKCgobWVtcSAoY2FyIGZvcm0p IGVzaGVsbC1kZWZlcnJhYmxlLWNvbW1hbmRzKSkKKyAgICAgICAgICAgICAgICAgICAgICAg KChub3QgZXNoZWxsLWN1cnJlbnQtc3Viam9iLXApKQorICAgICAgICAgICAgICAgICAgICAg ICAocHJvY3MgKGVzaGVsbC1tYWtlLXByb2Nlc3MtcGFpciByZXN1bHQpKSkKKyAgICAgICAg ICAgICAgICAgIChpZiBzeW5jaHJvbm91cy1wCisJCSAgICAgIChlc2hlbGwvd2FpdCAoY2Ry IHByb2NzKSkKIAkJICAgIChlc2hlbGwtbWFuaXB1bGF0ZSAiaW5zZXJ0aW5nIGlnbm9yZSBm b3JtIgogCQkgICAgICAoc2V0Y2FyIGZvcm0gJ2lnbm9yZSkKIAkJICAgICAgKHNldGNkciBm b3JtIG5pbCkpCi0JCSAgICAodGhyb3cgJ2VzaGVsbC1kZWZlciByZXN1bHQpKQotCQkobGlz dCAncXVvdGUgcmVzdWx0KSkpKSkpKSkpKSkpCisJCSAgICAodGhyb3cgJ2VzaGVsbC1kZWZl ciBwcm9jcykpCisgICAgICAgICAgICAgICAgKGxpc3QgJ3F1b3RlIHJlc3VsdCkpKSkpKSkp KSkpKQogCiA7OyBjb21tYW5kIGludm9jYXRpb24KIApkaWZmIC0tZ2l0IGEvbGlzcC9lc2hl bGwvZXNoLWlvLmVsIGIvbGlzcC9lc2hlbGwvZXNoLWlvLmVsCmluZGV4IDJlMGYzMTJmNGEu LjhlNjQ2M2VhYzIgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2VzaC1pby5lbAorKysgYi9s aXNwL2VzaGVsbC9lc2gtaW8uZWwKQEAgLTQ4NSw3ICs0ODUsNyBAQCBlc2hlbGwtb3V0cHV0 LW9iamVjdC10by10YXJnZXQKICAgICgoZXNoZWxsLXByb2Nlc3NwIHRhcmdldCkKICAgICAo d2hlbiAoZXEgKHByb2Nlc3Mtc3RhdHVzIHRhcmdldCkgJ3J1bikKICAgICAgICh1bmxlc3Mg KHN0cmluZ3Agb2JqZWN0KQotCShzZXRxIG9iamVjdCAoZXNoZWxsLXN0cmluZ2lmeSBvYmpl Y3QpKSkKKyAgICAgICAoc2V0cSBvYmplY3QgKGVzaGVsbC1zdHJpbmdpZnkgb2JqZWN0KSkp CiAgICAgICAocHJvY2Vzcy1zZW5kLXN0cmluZyB0YXJnZXQgb2JqZWN0KSkpCiAKICAgICgo Y29uc3AgdGFyZ2V0KQpkaWZmIC0tZ2l0IGEvbGlzcC9lc2hlbGwvZXNoLW1vZGUuZWwgYi9s aXNwL2VzaGVsbC9lc2gtbW9kZS5lbAppbmRleCA4MzAyZWVmZTFlLi41OWM4ZjgwMzRmIDEw MDY0NAotLS0gYS9saXNwL2VzaGVsbC9lc2gtbW9kZS5lbAorKysgYi9saXNwL2VzaGVsbC9l c2gtbW9kZS5lbApAQCAtNDIzLDEzICs0MjMsMTMgQEAgZXNoZWxsLXRvZ2dsZS1kaXJlY3Qt c2VuZAogKGRlZnVuIGVzaGVsbC1zZWxmLWluc2VydC1jb21tYW5kICgpCiAgIChpbnRlcmFj dGl2ZSkKICAgKHByb2Nlc3Mtc2VuZC1zdHJpbmcKLSAgIChlc2hlbGwtaW50ZXJhY3RpdmUt cHJvY2VzcykKKyAgIChlc2hlbGwtaGVhZC1wcm9jZXNzKQogICAgKGNoYXItdG8tc3RyaW5n IChpZiAoc3ltYm9scCBsYXN0LWNvbW1hbmQtZXZlbnQpCiAJCSAgICAgICAoZ2V0IGxhc3Qt Y29tbWFuZC1ldmVudCAnYXNjaWktY2hhcmFjdGVyKQogCQkgICAgIGxhc3QtY29tbWFuZC1l dmVudCkpKSkKIAogKGRlZnVuIGVzaGVsbC1pbnRlcmNlcHQtY29tbWFuZHMgKCkKLSAgKHdo ZW4gKGFuZCAoZXNoZWxsLWludGVyYWN0aXZlLXByb2Nlc3MpCisgICh3aGVuIChhbmQgKGVz aGVsbC1pbnRlcmFjdGl2ZS1wcm9jZXNzLXApCiAJICAgICAobm90IChhbmQgKGludGVnZXJw IGxhc3QtaW5wdXQtZXZlbnQpCiAJCSAgICAgICAobWVtcSBsYXN0LWlucHV0LWV2ZW50ICco P1xDLXggP1xDLWMpKSkpKQogICAgIChsZXQgKChwb3NzaWJsZS1ldmVudHMgKHdoZXJlLWlz LWludGVybmFsIHRoaXMtY29tbWFuZCkpCkBAIC01OTUsMTMgKzU5NSwxMyBAQCBlc2hlbGwt c2VuZC1pbnB1dAogbmV3bGluZS4iCiAgIChpbnRlcmFjdGl2ZSAiUCIpCiAgIDs7IE5vdGUg dGhhdCB0aGUgaW5wdXQgc3RyaW5nIGRvZXMgbm90IGluY2x1ZGUgaXRzIHRlcm1pbmFsIG5l d2xpbmUuCi0gIChsZXQgKChwcm9jLXJ1bm5pbmctcCAoYW5kIChlc2hlbGwtaW50ZXJhY3Rp dmUtcHJvY2VzcykKKyAgKGxldCAoKHByb2MtcnVubmluZy1wIChhbmQgKGVzaGVsbC1oZWFk LXByb2Nlc3MpCiAJCQkgICAgIChub3QgcXVldWUtcCkpKQogCShpbmhpYml0LXBvaW50LW1v dGlvbi1ob29rcyB0KQogCShpbmhpYml0LW1vZGlmaWNhdGlvbi1ob29rcyB0KSkKICAgICAo dW5sZXNzIChhbmQgcHJvYy1ydW5uaW5nLXAKIAkJIChub3QgKGVxIChwcm9jZXNzLXN0YXR1 cwotCQkJICAgKGVzaGVsbC1pbnRlcmFjdGl2ZS1wcm9jZXNzKSkKKwkJCSAgIChlc2hlbGwt aGVhZC1wcm9jZXNzKSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3J1bikpKQogICAg ICAgKGlmIChvciBwcm9jLXJ1bm5pbmctcAogCSAgICAgICg+PSAocG9pbnQpIGVzaGVsbC1s YXN0LW91dHB1dC1lbmQpKQpAQCAtNjI3LDggKzYyNyw4IEBAIGVzaGVsbC1zZW5kLWlucHV0 CiAJICAgIChpZiAob3IgZXNoZWxsLXNlbmQtZGlyZWN0LXRvLXN1YnByb2Nlc3NlcwogCQkg ICAgKD0gZXNoZWxsLWxhc3QtaW5wdXQtc3RhcnQgZXNoZWxsLWxhc3QtaW5wdXQtZW5kKSkK IAkJKHVubGVzcyBuby1uZXdsaW5lCi0JCSAgKHByb2Nlc3Mtc2VuZC1zdHJpbmcgKGVzaGVs bC1pbnRlcmFjdGl2ZS1wcm9jZXNzKSAiXG4iKSkKLQkgICAgICAocHJvY2Vzcy1zZW5kLXJl Z2lvbiAoZXNoZWxsLWludGVyYWN0aXZlLXByb2Nlc3MpCisJCSAgKHByb2Nlc3Mtc2VuZC1z dHJpbmcgKGVzaGVsbC1oZWFkLXByb2Nlc3MpICJcbiIpKQorCSAgICAgIChwcm9jZXNzLXNl bmQtcmVnaW9uIChlc2hlbGwtaGVhZC1wcm9jZXNzKQogCQkJCSAgIGVzaGVsbC1sYXN0LWlu cHV0LXN0YXJ0CiAJCQkJICAgZXNoZWxsLWxhc3QtaW5wdXQtZW5kKSkpCiAJKGlmICg9IGVz aGVsbC1sYXN0LW91dHB1dC1lbmQgKHBvaW50KSkKQEAgLTY2NSw2ICs2NjUsMTYgQEAgZXNo ZWxsLXNlbmQtaW5wdXQKIAkgICAgICAgKHJ1bi1ob29rcyAnZXNoZWxsLXBvc3QtY29tbWFu ZC1ob29rKQogCSAgICAgICAoaW5zZXJ0LWFuZC1pbmhlcml0IGlucHV0KSkpKSkpKSkpCiAK KyhkZWZ1biBlc2hlbGwtc2VuZC1lb2YtdG8tcHJvY2VzcyAoKQorICAiU2VuZCBFT0YgdG8g dGhlIGN1cnJlbnRseS1ydW5uaW5nIFwiaGVhZFwiIHByb2Nlc3MuIgorICAoaW50ZXJhY3Rp dmUpCisgIChyZXF1aXJlICdlc2gtbW9kZSkKKyAgKGRlY2xhcmUtZnVuY3Rpb24gZXNoZWxs LXNlbmQtaW5wdXQgImVzaC1tb2RlIgorICAgICAgICAgICAgICAgICAgICAoJm9wdGlvbmFs IHVzZS1yZWdpb24gcXVldWUtcCBuby1uZXdsaW5lKSkKKyAgKGVzaGVsbC1zZW5kLWlucHV0 IG5pbCBuaWwgdCkKKyAgKHdoZW4gKGVzaGVsbC1oZWFkLXByb2Nlc3MpCisgICAgKHByb2Nl c3Mtc2VuZC1lb2YgKGVzaGVsbC1oZWFkLXByb2Nlc3MpKSkpCisKIChkZWZzdWJzdCBlc2hl bGwta2lsbC1uZXcgKCkKICAgIkFkZCB0aGUgbGFzdCBpbnB1dCB0ZXh0IHRvIHRoZSBraWxs IHJpbmcuIgogICAoa2lsbC1yaW5nLXNhdmUgZXNoZWxsLWxhc3QtaW5wdXQtc3RhcnQgZXNo ZWxsLWxhc3QtaW5wdXQtZW5kKSkKQEAgLTkyNCw5ICs5MzQsOSBAQCBlc2hlbGwtc2VuZC1p bnZpc2libGUKICAgKGludGVyYWN0aXZlKSA7IERvbid0IHBhc3Mgc3RyIGFzIGFyZ3VtZW50 LCB0byBhdm9pZCBzbm9vcGluZyB2aWEgQy14IEVTQyBFU0MKICAgKGxldCAoKHN0ciAocmVh ZC1wYXNzd2QKIAkgICAgICAoZm9ybWF0ICIlcyBQYXNzd29yZDogIgotCQkgICAgICAocHJv Y2Vzcy1uYW1lIChlc2hlbGwtaW50ZXJhY3RpdmUtcHJvY2VzcykpKSkpKQorCQkgICAgICAo cHJvY2Vzcy1uYW1lIChlc2hlbGwtaGVhZC1wcm9jZXNzKSkpKSkpCiAgICAgKGlmIChzdHJp bmdwIHN0cikKLQkocHJvY2Vzcy1zZW5kLXN0cmluZyAoZXNoZWxsLWludGVyYWN0aXZlLXBy b2Nlc3MpCisJKHByb2Nlc3Mtc2VuZC1zdHJpbmcgKGVzaGVsbC1oZWFkLXByb2Nlc3MpCiAJ CQkgICAgIChjb25jYXQgc3RyICJcbiIpKQogICAgICAgKG1lc3NhZ2UgIldhcm5pbmc6IHRl eHQgd2lsbCBiZSBlY2hvZWQiKSkpKQogCkBAIC05MzcsNyArOTQ3LDcgQEAgZXNoZWxsLXdh dGNoLWZvci1wYXNzd29yZC1wcm9tcHQKIGBlc2hlbGwtcGFzc3dvcmQtcHJvbXB0LXJlZ2V4 cCcuCiAKIFRoaXMgZnVuY3Rpb24gY291bGQgYmUgaW4gdGhlIGxpc3QgYGVzaGVsbC1vdXRw dXQtZmlsdGVyLWZ1bmN0aW9ucycuIgotICAod2hlbiAoZXNoZWxsLWludGVyYWN0aXZlLXBy b2Nlc3MpCisgICh3aGVuIChlc2hlbGwtaW50ZXJhY3RpdmUtcHJvY2Vzcy1wKQogICAgIChz YXZlLWV4Y3Vyc2lvbgogICAgICAgKGxldCAoKGNhc2UtZm9sZC1zZWFyY2ggdCkpCiAJKGdv dG8tY2hhciBlc2hlbGwtbGFzdC1vdXRwdXQtYmxvY2stYmVnaW4pCmRpZmYgLS1naXQgYS9s aXNwL2VzaGVsbC9lc2gtcHJvYy5lbCBiL2xpc3AvZXNoZWxsL2VzaC1wcm9jLmVsCmluZGV4 IDVlZDY5MmZiNWEuLmJiMjEzNmMwNmMgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2VzaC1w cm9jLmVsCisrKyBiL2xpc3AvZXNoZWxsL2VzaC1wcm9jLmVsCkBAIC0xMDEsNiArMTAxLDgg QEAgZXNoZWxsLWN1cnJlbnQtc3Viam9iLXAKIChkZWZ2YXIgZXNoZWxsLXByb2Nlc3MtbGlz dCBuaWwKICAgIkEgbGlzdCBvZiB0aGUgY3VycmVudCBzdGF0dXMgb2Ygc3VicHJvY2Vzc2Vz LiIpCiAKKyhkZWNsYXJlLWZ1bmN0aW9uIGVzaGVsbC1zZW5kLWVvZi10by1wcm9jZXNzICJl c2gtbW9kZSIpCisKIChkZWZ2YXIta2V5bWFwIGVzaGVsbC1wcm9jLW1vZGUtbWFwCiAgICJD LWMgTS1pIiAgIydlc2hlbGwtaW5zZXJ0LXByb2Nlc3MKICAgIkMtYyBDLWMiICAjJ2VzaGVs bC1pbnRlcnJ1cHQtcHJvY2VzcwpAQCAtNTQyLDE0ICs1NDQsNSBAQCBlc2hlbGwtcXVpdC1w cm9jZXNzCiA7ICAgIDs7IGBlc2hlbGwtcmVzdW1lLWV2YWwnLgogOyAgICAoZXNoZWxsLWtp bGwtcHJvY2Vzcy1mdW5jdGlvbiBuaWwgImNvbnRpbnVlIikpKQogCi0oZGVmdW4gZXNoZWxs LXNlbmQtZW9mLXRvLXByb2Nlc3MgKCkKLSAgIlNlbmQgRU9GIHRvIHByb2Nlc3MuIgotICAo aW50ZXJhY3RpdmUpCi0gIChyZXF1aXJlICdlc2gtbW9kZSkKLSAgKGRlY2xhcmUtZnVuY3Rp b24gZXNoZWxsLXNlbmQtaW5wdXQgImVzaC1tb2RlIgotICAgICAgICAgICAgICAgICAgICAo Jm9wdGlvbmFsIHVzZS1yZWdpb24gcXVldWUtcCBuby1uZXdsaW5lKSkKLSAgKGVzaGVsbC1z ZW5kLWlucHV0IG5pbCBuaWwgdCkKLSAgKGVzaGVsbC1wcm9jZXNzLWludGVyYWN0ICdwcm9j ZXNzLXNlbmQtZW9mKSkKLQogKHByb3ZpZGUgJ2VzaC1wcm9jKQogOzs7IGVzaC1wcm9jLmVs IGVuZHMgaGVyZQpkaWZmIC0tZ2l0IGEvbGlzcC9lc2hlbGwvZXNoLXV0aWwuZWwgYi9saXNw L2VzaGVsbC9lc2gtdXRpbC5lbAppbmRleCAwZTA0ZGJjN2M5Li43ODg0MDRmYzQzIDEwMDY0 NAotLS0gYS9saXNwL2VzaGVsbC9lc2gtdXRpbC5lbAorKysgYi9saXNwL2VzaGVsbC9lc2gt dXRpbC5lbApAQCAtNjA5LDYgKzYwOSwyMCBAQCBlc2hlbGwtcHJvY2Vzc3AKICAgIklmIHRo ZSBgcHJvY2Vzc3AnIGZ1bmN0aW9uIGRvZXMgbm90IGV4aXN0LCBQUk9DIGlzIG5vdCBhIHBy b2Nlc3MuIgogICAoYW5kIChmYm91bmRwICdwcm9jZXNzcCkgKHByb2Nlc3NwIHByb2MpKSkK IAorKGRlZnVuIGVzaGVsbC1wcm9jZXNzLXBhaXItcCAocHJvY3MpCisgICJSZXR1cm4gbm9u LW5pbCBpZiBQUk9DUyBpcyBhIHBhaXIgb2YgcHJvY2VzcyBvYmplY3RzLiIKKyAgKGFuZCAo Y29uc3AgcHJvY3MpCisgICAgICAgKGVzaGVsbC1wcm9jZXNzcCAoY2FyIHByb2NzKSkKKyAg ICAgICAoZXNoZWxsLXByb2Nlc3NwIChjZHIgcHJvY3MpKSkpCisKKyhkZWZ1biBlc2hlbGwt bWFrZS1wcm9jZXNzLXBhaXIgKHByb2NzKQorICAiTWFrZSBhIHBhaXIgb2YgcHJvY2VzcyBv YmplY3RzIGZyb20gUFJPQ1MgaWYgcG9zc2libGUuCitUaGlzIHJlcHJlc2VudHMgdGhlIGhl YWQgYW5kIHRhaWwgb2YgYSBwaXBlbGluZSBvZiBwcm9jZXNzZXMsCit3aGVyZSB0aGUgaGVh ZCBhbmQgdGFpbCBtYXkgYmUgdGhlIHNhbWUgcHJvY2Vzcy4iCisgIChwY2FzZSBwcm9jcwor ICAgICgocHJlZCBlc2hlbGwtcHJvY2Vzc3ApIChjb25zIHByb2NzIHByb2NzKSkKKyAgICAo KHByZWQgZXNoZWxsLXByb2Nlc3MtcGFpci1wKSBwcm9jcykpKQorCiA7OyAoZGVmdW4gZXNo ZWxsLWNvcHktZmlsZQogOzsgICAoZmlsZSBuZXduYW1lICZvcHRpb25hbCBvay1pZi1hbHJl YWR5LWV4aXN0cyBrZWVwLWRhdGUpCiA7OyAgICJDb3B5IEZJTEUgdG8gTkVXTkFNRS4gIFNl ZSBkb2NzIGZvciBgY29weS1maWxlJy4iCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lc2hl bGwuZWwgYi9saXNwL2VzaGVsbC9lc2hlbGwuZWwKaW5kZXggNWMzNTZlODkyOC4uMmM0NzJh MmFmYSAxMDA2NDQKLS0tIGEvbGlzcC9lc2hlbGwvZXNoZWxsLmVsCisrKyBiL2xpc3AvZXNo ZWxsL2VzaGVsbC5lbApAQCAtMzMyLDkgKzMzMiw5IEBAIGVzaGVsbC1jb21tYW5kCiAJOzsg bWFrZSB0aGUgb3V0cHV0IGFzIGF0dHJhY3RpdmUgYXMgcG9zc2libGUsIHdpdGggbm8KIAk7 OyBleHRyYW5lb3VzIG5ld2xpbmVzCiAJKHdoZW4gaW50cgotCSAgKGlmIChlc2hlbGwtaW50 ZXJhY3RpdmUtcHJvY2VzcykKLQkgICAgICAoZXNoZWxsLXdhaXQtZm9yLXByb2Nlc3MgKGVz aGVsbC1pbnRlcmFjdGl2ZS1wcm9jZXNzKSkpCi0JICAoY2wtYXNzZXJ0IChub3QgKGVzaGVs bC1pbnRlcmFjdGl2ZS1wcm9jZXNzKSkpCisJICAoaWYgKGVzaGVsbC1pbnRlcmFjdGl2ZS1w cm9jZXNzLXApCisJICAgICAgKGVzaGVsbC13YWl0LWZvci1wcm9jZXNzIChlc2hlbGwtdGFp bC1wcm9jZXNzKSkpCisJICAoY2wtYXNzZXJ0IChub3QgKGVzaGVsbC1pbnRlcmFjdGl2ZS1w cm9jZXNzLXApKSkKIAkgIChnb3RvLWNoYXIgKHBvaW50LW1heCkpCiAJICAod2hpbGUgKGFu ZCAoYm9scCkgKG5vdCAoYm9icCkpKQogCSAgICAoZGVsZXRlLWNoYXIgLTEpKSkKZGlmZiAt LWdpdCBhL3Rlc3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLWhlbHBlcnMuZWwgYi90ZXN0 L2xpc3AvZXNoZWxsL2VzaGVsbC10ZXN0cy1oZWxwZXJzLmVsCmluZGV4IDc3ZjUzMTNkNTcu LmYzZmJlOTAzNTYgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3Rz LWhlbHBlcnMuZWwKKysrIGIvdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMtaGVscGVy cy5lbApAQCAtNTMsNyArNTMsNyBAQCBlc2hlbGwtd2FpdC1mb3Itc3VicHJvY2VzcwogSWYg dGhpcyB0YWtlcyBsb25nZXIgdGhhbiBgZXNoZWxsLXRlc3QtLW1heC1zdWJwcm9jZXNzLXRp bWUnLAogcmFpc2UgYW4gZXJyb3IuIgogICAobGV0ICgoc3RhcnQgKGN1cnJlbnQtdGltZSkp KQotICAgICh3aGlsZSAoZXNoZWxsLWludGVyYWN0aXZlLXByb2Nlc3MpCisgICAgKHdoaWxl IChlc2hlbGwtaW50ZXJhY3RpdmUtcHJvY2Vzcy1wKQogICAgICAgKHdoZW4gKD4gKGZsb2F0 LXRpbWUgKHRpbWUtc2luY2Ugc3RhcnQpKQogICAgICAgICAgICAgICAgZXNoZWxsLXRlc3Qt LW1heC1zdWJwcm9jZXNzLXRpbWUpCiAgICAgICAgIChlcnJvciAidGltZWQgb3V0IHdhaXRp bmcgZm9yIHN1YnByb2Nlc3MiKSkKZGlmZiAtLWdpdCBhL3Rlc3QvbGlzcC9lc2hlbGwvZXNo ZWxsLXRlc3RzLmVsIGIvdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwKaW5kZXgg NzY1OGQ1ZjU1MS4uM2IxYmJlNzE4OCAxMDA2NDQKLS0tIGEvdGVzdC9saXNwL2VzaGVsbC9l c2hlbGwtdGVzdHMuZWwKKysrIGIvdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwK QEAgLTEzNiw2ICsxMzYsMTcgQEAgZXNoZWxsLXRlc3QvcGlwZS10YWlscHJvYwogICAgKGVz aGVsbC1jb21tYW5kLXJlc3VsdC1wICIqZWNobyBoaSB8IGVjaG8gYnllIgogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICJieWVcbmhpXG4iKSkpCiAKKyhlcnQtZGVmdGVzdCBlc2hl bGwtdGVzdC9waXBlLWhlYWRwcm9jLXN0ZGluICgpCisgICJDaGVjayB0aGF0IHN0YW5kYXJk IGlucHV0IGlzIHNlbnQgdG8gdGhlIGhlYWQgcHJvY2VzcyBpbiBhIHBpcGVsaW5lIgorICAo c2tpcC11bmxlc3MgKGFuZCAoZXhlY3V0YWJsZS1maW5kICJ0ciIpCisgICAgICAgICAgICAg ICAgICAgIChleGVjdXRhYmxlLWZpbmQgInJldiIpKSkKKyAgKHdpdGgtdGVtcC1lc2hlbGwK KyAgIChlc2hlbGwtaW5zZXJ0LWNvbW1hbmQgInRyIGEteiBBLVogfCByZXYiKQorICAgKGVz aGVsbC1pbnNlcnQtY29tbWFuZCAiaGVsbG8iKQorICAgKGVzaGVsbC1zZW5kLWVvZi10by1w cm9jZXNzKQorICAgKGVzaGVsbC13YWl0LWZvci1zdWJwcm9jZXNzKQorICAgKGVzaGVsbC1t YXRjaC1yZXN1bHQgIk9MTEVIXG4iKSkpCisKIChlcnQtZGVmdGVzdCBlc2hlbGwtdGVzdC93 aW5kb3ctaGVpZ2h0ICgpCiAgICIkTElORVMgc2hvdWxkIGVxdWFsICh3aW5kb3ctaGVpZ2h0 KSIKICAgKHNob3VsZCAoZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1bHQgIj0gJExJTkVTICh3 aW5kb3ctaGVpZ2h0KSIpKSkKLS0gCjIuMjUuMQoK --------------B10F1F4C95B83E039BBCFFCF Content-Type: text/plain; charset=UTF-8; name="0003-Use-require-to-load-eshell-tests-helpers.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0003-Use-require-to-load-eshell-tests-helpers.patch" RnJvbSBhMTc4ZmQxOTdjZjUzZjc3MzFlMWIwYzZmOWFmMzJhMTQ0MTg1YWI1IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFdlZCwgMiBGZWIgMjAyMiAxODoyNjo1MCAtMDgwMApTdWJqZWN0OiBbUEFU Q0ggMy8zXSBVc2UgJ3JlcXVpcmUnIHRvIGxvYWQgZXNoZWxsLXRlc3RzLWhlbHBlcnMKCiog dGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwKKiB0ZXN0L2xpc3AvZXNoZWxsL2Vt LWV4dHBpcGUtdGVzdHMuZWw6IExvYWQgZXNoZWxsLXRlc3RzLWhlbHBlcnMgd2l0aAoncmVx dWlyZScuCgoqIHRlc3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLWhlbHBlcnMuZWwgKGVz aGVsbC1oaXN0b3J5LWZpbGUtbmFtZSk6CkRlZmluZSB0aGlzIGhlcmUgc28gaW5kaXZpZHVh bCB0ZXN0IGZpbGVzIGRvbid0IGhhdmUgdG8uCi0tLQogdGVzdC9saXNwL2VzaGVsbC9lbS1l eHRwaXBlLXRlc3RzLmVsICAgICB8IDEyICsrKystLS0tLS0tLQogdGVzdC9saXNwL2VzaGVs bC9lc2hlbGwtdGVzdHMtaGVscGVycy5lbCB8ICAyICsrCiB0ZXN0L2xpc3AvZXNoZWxsL2Vz aGVsbC10ZXN0cy5lbCAgICAgICAgIHwgMTQgKysrKy0tLS0tLS0tLS0KIDMgZmlsZXMgY2hh bmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgMTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv dGVzdC9saXNwL2VzaGVsbC9lbS1leHRwaXBlLXRlc3RzLmVsIGIvdGVzdC9saXNwL2VzaGVs bC9lbS1leHRwaXBlLXRlc3RzLmVsCmluZGV4IDA4NzlhZDViMGMuLmExZDE1ZmU3M2EgMTAw NjQ0Ci0tLSBhL3Rlc3QvbGlzcC9lc2hlbGwvZW0tZXh0cGlwZS10ZXN0cy5lbAorKysgYi90 ZXN0L2xpc3AvZXNoZWxsL2VtLWV4dHBpcGUtdGVzdHMuZWwKQEAgLTI4LDE0ICsyOCwxMCBA QAogKHJlcXVpcmUgJ2VydCkKIChyZXF1aXJlICdlcnQteCkKIChyZXF1aXJlICdlbS1leHRw aXBlKQotKGV2YWwtYW5kLWNvbXBpbGUKLSAgKGxvYWQgKGV4cGFuZC1maWxlLW5hbWUgImVz aGVsbC10ZXN0cy1oZWxwZXJzIgotICAgICAgICAgICAgICAgICAgICAgICAgICAoZmlsZS1u YW1lLWRpcmVjdG9yeSAob3IgbG9hZC1maWxlLW5hbWUKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRlZmF1bHQtZGlyZWN0b3J5KSkpKSkK LQotKGRlZnZhciBlc2hlbGwtaGlzdG9yeS1maWxlLW5hbWUpCi0oZGVmdmFyIGVzaGVsbC10 ZXN0LS1tYXgtc3VicHJvY2Vzcy10aW1lKQotKGRlY2xhcmUtZnVuY3Rpb24gZXNoZWxsLWNv bW1hbmQtcmVzdWx0LXAgImVzaGVsbC10ZXN0cy1oZWxwZXJzIikKKyhyZXF1aXJlICdlc2hl bGwtdGVzdHMtaGVscGVycworICAgICAgICAgKGV4cGFuZC1maWxlLW5hbWUgImVzaGVsbC10 ZXN0cy1oZWxwZXJzIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgKGZpbGUtbmFtZS1k aXJlY3RvcnkgKG9yIGxvYWQtZmlsZS1uYW1lCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZGVmYXVsdC1kaXJlY3RvcnkpKSkpCiAKIChk ZWZtYWNybyBlbS1leHRwaXBlLXRlc3RzLS1kZWZ0ZXN0IChuYW1lIGlucHV0ICZyZXN0IGJv ZHkpCiAgIChkZWNsYXJlIChpbmRlbnQgMikpCmRpZmYgLS1naXQgYS90ZXN0L2xpc3AvZXNo ZWxsL2VzaGVsbC10ZXN0cy1oZWxwZXJzLmVsIGIvdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwt dGVzdHMtaGVscGVycy5lbAppbmRleCBmM2ZiZTkwMzU2Li4zM2NkZDYwMTEzIDEwMDY0NAot LS0gYS90ZXN0L2xpc3AvZXNoZWxsL2VzaGVsbC10ZXN0cy1oZWxwZXJzLmVsCisrKyBiL3Rl c3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLWhlbHBlcnMuZWwKQEAgLTMwLDYgKzMwLDgg QEAKIChyZXF1aXJlICdlc2gtbW9kZSkKIChyZXF1aXJlICdlc2hlbGwpCiAKKyhkZWZ2YXIg ZXNoZWxsLWhpc3RvcnktZmlsZS1uYW1lIG5pbCkKKwogKGRlZnZhciBlc2hlbGwtdGVzdC0t bWF4LXN1YnByb2Nlc3MtdGltZSA1CiAgICJUaGUgbWF4aW11bSBhbW91bnQgb2YgdGltZSB0 byB3YWl0IGZvciBhIHN1YnByb2Nlc3MgdG8gZmluaXNoLCBpbiBzZWNvbmRzLgogU2VlIGBl c2hlbGwtd2FpdC1mb3Itc3VicHJvY2VzcycuIikKZGlmZiAtLWdpdCBhL3Rlc3QvbGlzcC9l c2hlbGwvZXNoZWxsLXRlc3RzLmVsIGIvdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMu ZWwKaW5kZXggM2IxYmJlNzE4OC4uYzVjYTBhNTQ4NSAxMDA2NDQKLS0tIGEvdGVzdC9saXNw L2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwKKysrIGIvdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwt dGVzdHMuZWwKQEAgLTI5LDE2ICsyOSwxMCBAQAogKHJlcXVpcmUgJ2VydC14KQogKHJlcXVp cmUgJ2VzaC1tb2RlKQogKHJlcXVpcmUgJ2VzaGVsbCkKLShldmFsLWFuZC1jb21waWxlCi0g IChsb2FkIChleHBhbmQtZmlsZS1uYW1lICJlc2hlbGwtdGVzdHMtaGVscGVycyIKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgKGZpbGUtbmFtZS1kaXJlY3RvcnkgKG9yIGxvYWQtZmls ZS1uYW1lCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBkZWZhdWx0LWRpcmVjdG9yeSkpKSkpCi0KLShkZWZ2YXIgZXNoZWxsLWhpc3Rvcnkt ZmlsZS1uYW1lKQotKGRlZnZhciBlc2hlbGwtdGVzdC0tbWF4LXN1YnByb2Nlc3MtdGltZSkK LShkZWNsYXJlLWZ1bmN0aW9uIGVzaGVsbC1pbnNlcnQtY29tbWFuZCAiZXNoZWxsLXRlc3Rz LWhlbHBlcnMiKQotKGRlY2xhcmUtZnVuY3Rpb24gZXNoZWxsLW1hdGNoLXJlc3VsdCAiZXNo ZWxsLXRlc3RzLWhlbHBlcnMiKQotKGRlY2xhcmUtZnVuY3Rpb24gZXNoZWxsLWNvbW1hbmQt cmVzdWx0LXAgImVzaGVsbC10ZXN0cy1oZWxwZXJzIikKKyhyZXF1aXJlICdlc2hlbGwtdGVz dHMtaGVscGVycworICAgICAgICAgKGV4cGFuZC1maWxlLW5hbWUgImVzaGVsbC10ZXN0cy1o ZWxwZXJzIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgKGZpbGUtbmFtZS1kaXJlY3Rv cnkgKG9yIGxvYWQtZmlsZS1uYW1lCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZGVmYXVsdC1kaXJlY3RvcnkpKSkpCiAKIDs7OyBUZXN0 czoKIAotLSAKMi4yNS4xCgo= --------------B10F1F4C95B83E039BBCFFCF-- From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 03 14:03:52 2022 Received: (at 53715) by debbugs.gnu.org; 3 Feb 2022 19:03:52 +0000 Received: from localhost ([127.0.0.1]:57784 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFhOa-0002xL-Ix for submit@debbugs.gnu.org; Thu, 03 Feb 2022 14:03:52 -0500 Received: from quimby.gnus.org ([95.216.78.240]:53828) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFhOZ-0002x1-42 for 53715@debbugs.gnu.org; Thu, 03 Feb 2022 14:03:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=5GCYkJbaxyHZv7xqgJlKiVIHfiHDs2LHVD/dk5g6WaE=; b=irgNbLnZ1505PivyIOWXe1XDdm 09vTuJdhHLaV0Kb2AdS+5VkvTrqF0Lm3L9JN9mzPUeUhOv6EWKxadu9MPCUr80qxrcgzTGeimTBpo QQNdEDjLmsLgjK8cMGEGfOc0MNrKu3xMFDmraoFhpK5f/KMHZoWaa9TLQsSzIhAgsw+Y=; Received: from [84.212.220.105] (helo=giant) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nFhOQ-0003Tc-9Z; Thu, 03 Feb 2022 20:03:45 +0100 From: Lars Ingebrigtsen To: Jim Porter Subject: Re: bug#53715: 29.0.50; [PATCH] Improve correctness of pipelines in Eshell References: <75056e6b-c739-a48c-2bf8-56ddc456da8e@gmail.com> <871r0lrvg1.fsf@gnus.org> <4733b4db-705c-2b52-e1e6-68b0902f87d3@gmail.com> <87wnidnj4q.fsf@gnus.org> <6b9ef041-4562-6590-0eb9-f42520085a40@gmail.com> <1c276f7a-5074-b826-ed29-ff4e61d9da78@gmail.com> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAElBMVEXftaDTkHOeamBJ Nj+GeIP///9UTBKyAAAAAWJLR0QF+G/pxwAAAAd0SU1FB+YCAxI5JEmZsMQAAAGFSURBVDjLbZQN bsMgDIXN1gMAu8Cwd4DVzgGqJfc/055NkkJaS5Uqf/jvGUKU6YNb6VaZuRHs0ygR8QSWG8DNKGeA chiAbkSJjUo+MlEHtoFsRvUokSl1sGwPopWYhMOLzFHEPORPqCVB8eytUI9wsAr9VgAEwZ/cD4Bc q9E9gGnJpYjtpmKkVVpJYmgAh/2MA7S71BW+KncqTiv3kIjgMKrGLbpyEwDzEg4Uf84yDqquD7QF sNppBHfhWlrKtZXbj+gJWH2ukqhy8ol4BNCkhMh9wg4wW8nQD8d9yDoBNwch8BWUWGQdUlmsoxVx sGsygsQawJ4gVp5TrP4VIJVcge8iQekQV0bQsHMxe6q+Azhyqu/AXtVFkwmoLyjmuwI+zSYAhdk1 H/wH8J/YaB2oXtwH6MPzO8DjDCPQqfITaPfKDNhBXI+53e+AjBvOUyo8ppjd7+mYKvuj1iA6RcC+ /KH4Q7YLwODSk12BR+h0/gTzcAcQ4xcNLT4oS2J+F2G/VF9C/gEWf6lMTPjvrwAAACV0RVh0ZGF0 ZTpjcmVhdGUAMjAyMi0wMi0wM1QxODo1NzozNSswMDowMPeAsBUAAAAldEVYdGRhdGU6bW9kaWZ5 ADIwMjItMDItMDNUMTg6NTc6MzUrMDA6MDCG3QipAAAAAElFTkSuQmCC X-Now-Playing: Richard And Linda Thompson's _Pour Down Like Silver_: "Beat The Retreat" Date: Thu, 03 Feb 2022 20:03:41 +0100 In-Reply-To: <1c276f7a-5074-b826-ed29-ff4e61d9da78@gmail.com> (Jim Porter's message of "Wed, 2 Feb 2022 18:35:00 -0800") Message-ID: <87bkznojqq.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Jim Porter writes: > Here's a small additional improvement that I hope is correct. The > third patch here changes how eshell-tests-helpers.el is loaded to that > it uses `require'. This reduces some of the boilerplate a [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 53715 Cc: 53715@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Jim Porter writes: > Here's a small additional improvement that I hope is correct. The > third patch here changes how eshell-tests-helpers.el is loaded to that > it uses `require'. This reduces some of the boilerplate and will > hopefully prevent issues with this file not getting recompiled when > it's updated. > > The first two patches are the same as before. I've just included them > for completeness/ease of applying. Thanks; seems to work well for me, so I've now pushed them to Emacs 29. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 03 14:04:03 2022 Received: (at control) by debbugs.gnu.org; 3 Feb 2022 19:04:03 +0000 Received: from localhost ([127.0.0.1]:57788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFhOk-0002y6-Pp for submit@debbugs.gnu.org; Thu, 03 Feb 2022 14:04:02 -0500 Received: from quimby.gnus.org ([95.216.78.240]:53842) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFhOj-0002xW-17 for control@debbugs.gnu.org; Thu, 03 Feb 2022 14:04:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Subject:From:To:Message-Id:Date:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=MdcYsQjzIHAi5Y09hgjJC571hM9HmyuCR/DPBekF+C4=; b=hIV5/zZA4Ipael4lwubTI/i22x GtsbfadKGejlTxNIWNH5EJvCuGmxkv3ZR83TjzOYIa0n/2QwklPEai/1aJAq8R7LSNd8PrnobcqpZ Hg5/7ViG5MElextp/C2vxUi1LhWBtdrpkqBHrKNWIDmiv0nbrOyVPg0AuafVd+nhFCeE=; Received: from [84.212.220.105] (helo=giant) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nFhOb-0003Tp-8G for control@debbugs.gnu.org; Thu, 03 Feb 2022 20:03:55 +0100 Date: Thu, 03 Feb 2022 20:03:52 +0100 Message-Id: <87a6f7ojqf.fsf@gnus.org> To: control@debbugs.gnu.org From: Lars Ingebrigtsen Subject: control message for bug #53715 X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: close 53715 29.1 quit Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) close 53715 29.1 quit From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 05 01:51:52 2022 Received: (at 53715) by debbugs.gnu.org; 5 Feb 2022 06:51:52 +0000 Received: from localhost ([127.0.0.1]:33568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGEvI-0008Rr-DQ for submit@debbugs.gnu.org; Sat, 05 Feb 2022 01:51:52 -0500 Received: from mail-pl1-f179.google.com ([209.85.214.179]:34654) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGEvG-0008RP-OU for 53715@debbugs.gnu.org; Sat, 05 Feb 2022 01:51:51 -0500 Received: by mail-pl1-f179.google.com with SMTP id h14so7018443plf.1 for <53715@debbugs.gnu.org>; Fri, 04 Feb 2022 22:51:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:to:cc:references:from:message-id:date:mime-version :in-reply-to:content-language; bh=rvpWgGeKIxAG71hObigvLIy1aFfGkxvLwzQ2BQQQifk=; b=iAUdkgVXpBClDZhHqGGhJxp/IzjqJth+scGog+ZWNiZaD9MdbBZarRWsNWhbHE+isS +pSNLi123y9yB9e64g9U/n5EeAUsWMwJyRlI207twhyj/IQj9B481GHMWXDioqpRdZsM aYCcXZTUVyw68hqKCNz2jpBoRsiun5tLJFl7xk7I1JgNq0njkzChI2tYwxt9ypAdNOTu H96hSWQ/zzS3DZIdmWImwjyvOQKegEDKK1kuXU7yk73zRVpYhwc0jZigik3+dWP0a++A 1AUIitV8hsjLs75BdWpFeOv229OuC28KeXgYJYx93fg0miQV7kVPD132wgKi/Qi88EHP h5Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :mime-version:in-reply-to:content-language; bh=rvpWgGeKIxAG71hObigvLIy1aFfGkxvLwzQ2BQQQifk=; b=08IZOPYCAT1pRi/ANUVBQBzDYY2Q792uErWs7U7dGWyOdpMdO//D5OwInfIo0VeOI6 pGDwj2G1sp/NZyyFPyFdgm9T2h6R68haoPFa7IwtVnH2jh9BJtMVIT4JqjmbDHfAJOl9 QBjnF3l9OxJn4c2FxmgF/rbPCW0HgPeFGTlwX+5d/a9xlRGzfnbklXWRK1b1gGriPqVH fyzgNvtymEyuBKFGnnntx3VklM+feYq7g7NUMLx+jFpWpjTpWuhik/ExXPU1swIQj8l/ f2UubM8EQZv02PqAncAzX/QIPNFcqhCmxuSRO3v+3hW6eL2bURYOqP0p7dRkyJPPXzi3 zzpQ== X-Gm-Message-State: AOAM532gD5j9HUjFDvD4EQTG0avKArx0HQ3UisjphBD1FpMoUOi775X2 jwLxHbJo7odB6Pxg/tz72EhNlKTuGSgspg== X-Google-Smtp-Source: ABdhPJzxpNKV2VfkferapBjBu75LbU+Kkx8vP632ctfQt+JsAz/oAfPKNjxrQyb9jW9oC0kMUC8QJw== X-Received: by 2002:a17:902:758c:: with SMTP id j12mr6722190pll.34.1644043904737; Fri, 04 Feb 2022 22:51:44 -0800 (PST) Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id y8sm3141542pgs.31.2022.02.04.22.51.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 04 Feb 2022 22:51:43 -0800 (PST) Subject: Re: bug#53715: 29.0.50; [PATCH] Improve correctness of pipelines in Eshell To: Lars Ingebrigtsen References: <75056e6b-c739-a48c-2bf8-56ddc456da8e@gmail.com> <871r0lrvg1.fsf@gnus.org> <4733b4db-705c-2b52-e1e6-68b0902f87d3@gmail.com> <87wnidnj4q.fsf@gnus.org> <6b9ef041-4562-6590-0eb9-f42520085a40@gmail.com> <1c276f7a-5074-b826-ed29-ff4e61d9da78@gmail.com> <87bkznojqq.fsf@gnus.org> From: Jim Porter Message-ID: <609c5390-3c7f-3f94-2148-d602ea7190ce@gmail.com> Date: Fri, 4 Feb 2022 22:51:43 -0800 MIME-Version: 1.0 In-Reply-To: <87bkznojqq.fsf@gnus.org> Content-Type: multipart/mixed; boundary="------------317A2DD56FAFC814E57E1D1C" Content-Language: en-US X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53715 Cc: 53715@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------317A2DD56FAFC814E57E1D1C Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 2/3/2022 11:03 AM, Lars Ingebrigtsen wrote: > Jim Porter writes: > >> Here's a small additional improvement that I hope is correct. The >> third patch here changes how eshell-tests-helpers.el is loaded to that >> it uses `require'. This reduces some of the boilerplate and will >> hopefully prevent issues with this file not getting recompiled when >> it's updated. >> >> The first two patches are the same as before. I've just included them >> for completeness/ease of applying. > > Thanks; seems to work well for me, so I've now pushed them to Emacs 29. I found a bug in the second patch. emacs -Q --eval '(eshell)' ~ $ echo hi | *cat This prints: ~ $ hi That is, the output of the command is printed *after* the next prompt. That's because my patch wasn't smart enough about finding the "head" process in a pipeline. In "echo hi | *cat", the head process is "cat" (Eshell's builtin echo command doesn't create a process). In my old patch, it thought the head process was nil, which confused Eshell. Here's a patch with a test to verify that things work correctly. Now the output is: hi~ $ (That's a bit ugly, but Eshell's builtin echo doesn't normally print a newline, so it's correct.) --------------317A2DD56FAFC814E57E1D1C Content-Type: text/plain; charset=UTF-8; name="0001-Ensure-that-the-CAR-of-eshell-last-async-procs-alway.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Ensure-that-the-CAR-of-eshell-last-async-procs-alway.pa"; filename*1="tch" RnJvbSA5Y2QwOGM4ZDY2Y2ZhYjk3NzE5MDM5ODk0N2Q2MmI1ZTMwNDQxOTcyIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IEZyaSwgNCBGZWIgMjAyMiAyMjo0MTozOSAtMDgwMApTdWJqZWN0OiBbUEFU Q0hdIEVuc3VyZSB0aGF0IHRoZSBDQVIgb2YgJ2VzaGVsbC1sYXN0LWFzeW5jLXByb2NzJyBh bHdheXMKIHBvaW50cyB0byBhIHByb2Nlc3MKClByZXZpb3VzbHksIGlmIGEgbm9uLXByb2Nl c3Mgd2FzIHBpcGVkIHRvIGEgcHJvY2VzcywgdGhpcyBjb3VsZCBlbmQgdXAKYmVpbmcgbmls LCB3aGljaCBpc24ndCBjb3JyZWN0LiAgJ2VzaGVsbC1sYXN0LWFzeW5jLXByb2NzJyBzaG91 bGQganVzdAppZ25vcmUgbm9uLXByb2Nlc3MgY29tbWFuZHMgaW4gYSBwaXBlbGluZS4KCiog bGlzcC9lc2hlbGwvZXNoLWNtZC5lbCAoZXNoZWxsLWRvLXBpcGVsaW5lcyk6IFNldCAnaGVh ZHByb2MnCmNvcnJlY3RseS4KCiogdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwg KGVzaGVsbC10ZXN0L3BpcGUtaGVhZHByb2MpOiBOZXcgdGVzdC4KLS0tCiBsaXNwL2VzaGVs bC9lc2gtY21kLmVsICAgICAgICAgICB8IDMgKy0tCiB0ZXN0L2xpc3AvZXNoZWxsL2VzaGVs bC10ZXN0cy5lbCB8IDcgKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCA4IGluc2VydGlvbnMo KyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9lc2hlbGwvZXNoLWNtZC5l bCBiL2xpc3AvZXNoZWxsL2VzaC1jbWQuZWwKaW5kZXggZTcwMmRlMDNhMC4uNTgxOTUwNmNj MCAxMDA2NDQKLS0tIGEvbGlzcC9lc2hlbGwvZXNoLWNtZC5lbAorKysgYi9saXNwL2VzaGVs bC9lc2gtY21kLmVsCkBAIC04MDAsOCArODAwLDcgQEAgZXNoZWxsLWRvLXBpcGVsaW5lcwog CQkgICAgICAoKGNkciBwaXBlbGluZSkgdCkKIAkJICAgICAgKHQgKHF1b3RlICdsYXN0KSkp KSkKICAgICAgICAgICAobGV0ICgocHJvYyAsKGNhciBwaXBlbGluZSkpKQotICAgICAgICAg ICAgLCh1bmxlc3Mgbm90Zmlyc3QKLSAgICAgICAgICAgICAgICcoc2V0cSBoZWFkcHJvYyBw cm9jKSkKKyAgICAgICAgICAgIChzZXRxIGhlYWRwcm9jIChvciBwcm9jIGhlYWRwcm9jKSkK ICAgICAgICAgICAgIChzZXRxIHRhaWxwcm9jIChvciB0YWlscHJvYyBwcm9jKSkKICAgICAg ICAgICAgIHByb2MpKSkpKSkKIApkaWZmIC0tZ2l0IGEvdGVzdC9saXNwL2VzaGVsbC9lc2hl bGwtdGVzdHMuZWwgYi90ZXN0L2xpc3AvZXNoZWxsL2VzaGVsbC10ZXN0cy5lbAppbmRleCBj NWNhMGE1NDg1Li5kNmVlMWJkYjE3IDEwMDY0NAotLS0gYS90ZXN0L2xpc3AvZXNoZWxsL2Vz aGVsbC10ZXN0cy5lbAorKysgYi90ZXN0L2xpc3AvZXNoZWxsL2VzaGVsbC10ZXN0cy5lbApA QCAtMTIzLDYgKzEyMywxMyBAQCBlc2hlbGwtdGVzdC9pbnRlcnAtY21kLWV4dGVybmFsLWNv bmNhdAogICAgKGVzaGVsbC1jb21tYW5kLXJlc3VsdC1wICJlY2hvICR7ZWNobyBoaX0tJHsq ZWNobyB0aGVyZX0iCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImhpLXRoZXJlXG4i KSkpCiAKKyhlcnQtZGVmdGVzdCBlc2hlbGwtdGVzdC9waXBlLWhlYWRwcm9jICgpCisgICJD aGVjayB0aGF0IHBpcGluZyBhIG5vbi1wcm9jZXNzIHRvIGEgcHJvY2VzcyBjb21tYW5kIHdh aXRzIGZvciB0aGUgcHJvY2VzcyIKKyAgKHNraXAtdW5sZXNzIChleGVjdXRhYmxlLWZpbmQg ImNhdCIpKQorICAod2l0aC10ZW1wLWVzaGVsbAorICAgKGVzaGVsbC1jb21tYW5kLXJlc3Vs dC1wICJlY2hvIGhpIHwgKmNhdCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAiaGki KSkpCisKIChlcnQtZGVmdGVzdCBlc2hlbGwtdGVzdC9waXBlLXRhaWxwcm9jICgpCiAgICJD aGVjayB0aGF0IHBpcGluZyBhIHByb2Nlc3MgdG8gYSBub24tcHJvY2VzcyBjb21tYW5kIHdh aXRzIGZvciB0aGUgcHJvY2VzcyIKICAgKHNraXAtdW5sZXNzIChleGVjdXRhYmxlLWZpbmQg ImVjaG8iKSkKLS0gCjIuMjUuMQoK --------------317A2DD56FAFC814E57E1D1C-- From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 05 01:59:34 2022 Received: (at 53715) by debbugs.gnu.org; 5 Feb 2022 06:59:34 +0000 Received: from localhost ([127.0.0.1]:33594 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGF2k-0000Ec-4A for submit@debbugs.gnu.org; Sat, 05 Feb 2022 01:59:34 -0500 Received: from quimby.gnus.org ([95.216.78.240]:42434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGF2i-0000EQ-Q9 for 53715@debbugs.gnu.org; Sat, 05 Feb 2022 01:59:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=0SZSzcVQFr6HQ03c2D2CKv7K4I23/1/Bf2/NTvct1tg=; b=Cv3gbHD7R6gpf+jtdqL6Uye0kY 4zQFF4RtFbAOUn5LYkb+mL37uyohJH1F1TUhlh3s3HyZF95sQtfam9ZumSoEQt77+/zrlihqqvPhb 0gxFhBRH0n/CJ5L2MRMBx/ovnDexnGzXsn88At/yz3s+VG/xneRiYtd7hHt817dE3lDA=; Received: from [84.212.220.105] (helo=giant) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nGF2Z-0005LX-TL; Sat, 05 Feb 2022 07:59:26 +0100 From: Lars Ingebrigtsen To: Jim Porter Subject: Re: bug#53715: 29.0.50; [PATCH] Improve correctness of pipelines in Eshell References: <75056e6b-c739-a48c-2bf8-56ddc456da8e@gmail.com> <871r0lrvg1.fsf@gnus.org> <4733b4db-705c-2b52-e1e6-68b0902f87d3@gmail.com> <87wnidnj4q.fsf@gnus.org> <6b9ef041-4562-6590-0eb9-f42520085a40@gmail.com> <1c276f7a-5074-b826-ed29-ff4e61d9da78@gmail.com> <87bkznojqq.fsf@gnus.org> <609c5390-3c7f-3f94-2148-d602ea7190ce@gmail.com> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAG1BMVEX9/f3RpKvivsFE HyegVGKwkpbp0tO6eoL////k9b6kAAAAAWJLR0QIht6VegAAAAd0SU1FB+YCBQYaG38SvugAAAGr SURBVDjLbZTBcpswEIZlT1GuXaXEVyTXzrUz0PZaBlGuVo3cK9B4fS0JDq9fCZxmkLQzoJn9dtn9 dwcR8marbSo/Et/WRWosQO6tP/1KsUGKiO8fSmdL3IQ/xinN88UFpkJmMzK39C0hTZsliIyrmPo6 BEAaaJiaCjLYVpFlc79uV0c5FFKWLz4omeYjHzxwX+1y/toFQPkpB2xlANR9YoEjkGyrzch78MGT rOQoZZ+5YC3TGh5LXnqLklfJG3LxVwifK57QjQ8uddwm3csPD9xVLSAPgA/5HjsYfnpgm8cAsfzm gSIfxn5z9MDq+waYeD4eXECT6ITtQ018YwrivfL9q54D63yBVCshRAfKHWKsNBOCM86W8bGKlQUo OrZ/97f6qvUE2E4B/E+KRqWHq2Kd0PGgEHenGxi0ZibDzOokkO878XvuICq1gisT5j+CBgUSep71 P2kAzdBa20yx7Tzj+hfyB0fsdJSuJqPWvtf+bsijjY0OPjjbkUWBSa9s8DkA1ha0ZklLt1FymI9X 00hjLgpCib0rngm9rWVcFvhLyE3BZaHkbgr/B5RbZYu6CG6kAAAAJXRFWHRkYXRlOmNyZWF0ZQAy MDIyLTAyLTA1VDA2OjI2OjI3KzAwOjAwXjRbPQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAyMi0wMi0w NVQwNjoyNjoyNyswMDowMC9p44EAAAAASUVORK5CYII= X-Now-Playing: David Bowie's _Aladdin Sane_: "Lady Grinning Soul" Date: Sat, 05 Feb 2022 07:59:22 +0100 In-Reply-To: <609c5390-3c7f-3f94-2148-d602ea7190ce@gmail.com> (Jim Porter's message of "Fri, 4 Feb 2022 22:51:43 -0800") Message-ID: <87ilttdcj9.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Jim Porter writes: > Here's a patch with a test to verify that things work correctly. Now > the output is: Thanks; pushed to Emacs 29. Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 53715 Cc: 53715@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Jim Porter writes: > Here's a patch with a test to verify that things work correctly. Now > the output is: Thanks; pushed to Emacs 29. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From unknown Thu Jun 19 14:27:31 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 05 Mar 2022 12:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator