From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id sDg7BMhA3GRkoQAASxT56A (envelope-from ) for ; Wed, 16 Aug 2023 05:21:44 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id oLxjA8hA3GQFdAAAG6o9tA (envelope-from ) for ; Wed, 16 Aug 2023 05:21:44 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 981A4327AF for ; Wed, 16 Aug 2023 05:21:43 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=dhRHLXJu; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1692156103; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=XlY9Lfit7X+/lUcuF2cMzrw3zwsCmV8qfM8rgKkat8o=; b=MTd9z++oznsJ4mfh2RD0oXA5jXGMTYsUhUl0TatWOL3bqXnwU86Hux7t7A6L5ZTgYUr6oW W6GHPBmp6MgDjHn3FZ/ShasBG/rbCQPyM6vLLV3QwHiMf//iNSXLHcH/khl7LUmrm98mvQ 5hyQBxUrFvGaNkFPFaNWzM6K9O5Gyt62MBsUpln7dColdcrt7zXCfx86++C+73b6c5ONXG j7yhSkyewIeh94AnL45WS0PFm4dz5l45ux9e4OvbsGUiISk+DywToECoGITlYa/7KBr3/D +gAdiEz+vHcmKb0iv54t8Yl2IRVMCgVtok0LubOmKyJt/L0J7vVDyFr3m7qUzA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=dhRHLXJu; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692156103; a=rsa-sha256; cv=none; b=m9VUkQPVuXA2HS7NKir911Ip2/isaGgReLHGac7One25Sjqab5bsSTVaFLHy65Vv4S5qVy UqBdwTpyXc/aTkUo2Plf28sJPHfib6mcXMwFLLfmAnfVxl08WawiU5+g3x3i6NAvAjmSuB iABhM+R1qcN+RI+uiQh/FGatAdAJV2yr1ea5TQvjF8yu+mPHbJU7fAV+6bseu2Quyp2NFE z+GwfnOP7Kq79VpuBhpZk5t4iI2301BBMPt69jnyPuA7FAOadEhZZ8v/7OfxOtBROwTc96 yrBVQIr3ahJ0UZHzn14xJ1U+T6c04lf6bodAq9lTBVldLQXQ3PP0JCvY0+GDQA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qW75v-0004WN-N5; Tue, 15 Aug 2023 23:21:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qW75u-0004W0-48 for emacs-orgmode@gnu.org; Tue, 15 Aug 2023 23:21:14 -0400 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qW75r-0003r2-H7 for emacs-orgmode@gnu.org; Tue, 15 Aug 2023 23:21:13 -0400 Received: by mail-pj1-x102d.google.com with SMTP id 98e67ed59e1d1-26b4c6a5e61so2324985a91.1 for ; Tue, 15 Aug 2023 20:21:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692156069; x=1692760869; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=XlY9Lfit7X+/lUcuF2cMzrw3zwsCmV8qfM8rgKkat8o=; b=dhRHLXJuss1RERmGHBEVjRIxe+oQle677V72ZMaBYlg41xKgRlDIkG0RWLQGtceEon xSaFEUg3sHO0BNl4RgQurs6HZAV29zhzFODh1h8BlfJPBvXS5k/KewcWvITCWQsT768H zgjMuqU7rPtJN5hmzTBv8M2g/hAQbHqLMc4uijtf2NnKGRM3Fuhsam9piKP/jQbhpLlv Q8HNaJgIXqKleF234wUa80u9cvYI+NymWOzwirEvtXkhguhOAf0ipJf6A8c/jhsrpOun h7sn64Ok32T0gmAqbJx7+/HOHmPiQKWGKYFH3ZoUBNRA6r8YB1x6Nct6cN5lHhRPCzIJ ZTJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692156069; x=1692760869; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=XlY9Lfit7X+/lUcuF2cMzrw3zwsCmV8qfM8rgKkat8o=; b=RXImfVqvZ0VgJDXYfE0GsafQbaU1uEPkBZM38VpxVQ8jtLCFZ87E1/4n7WiQn9LZPo EUyH2ve+Ce51Gg68kg8eQnmVzbhU+RJXxYov9ZNaQ3DC//zCzBqHPxHsW9MzEWHpRHRU 7YUdPi36iaDwiAkdx8GzS9TqGgDGMvrbbPndwjpFTsBjRoskuFSMYVZnC0ruilZSO6Ti fnww08TPt1Ni3gZ0+G7RRRkKD192oEQenfiQMZRzJhJPlJ7KFYpIkMpws4ZgG6UWhpx9 VMwICdTg6AEbS7XJiZWebH39uTRVJbmeTsCMguj/Uwjwd2hx4+HZZjxz+VPM7gTCDVL4 KUgQ== X-Gm-Message-State: AOJu0YyUY33Kw0TapGhhsQSGu4ttXXF33KjWgGP1GCtqS8ophpI3u781 PFwB8mBPnjql/BGfdjSS9SGGbc39PDIuTN30LtKmYrzj X-Google-Smtp-Source: AGHT+IEQ6Mxxzk8LTMclLxaxf4TFVNlo5vwxOTaXE7MrvI/jbCvXdmt+7/P/TNBGm+Ouc6G1byBh/IyADOUVy5UlEqU= X-Received: by 2002:a17:90a:c7d8:b0:262:f99b:a530 with SMTP id gf24-20020a17090ac7d800b00262f99ba530mr428527pjb.34.1692156068986; Tue, 15 Aug 2023 20:21:08 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Tom Gillespie Date: Tue, 15 Aug 2023 20:20:56 -0700 Message-ID: Subject: Re: [PATCH] ob-tangle.el: restore :tangle closure nil behavior To: emacs-orgmode Content-Type: multipart/mixed; boundary="00000000000065a3d2060301c9ef" Received-SPF: pass client-ip=2607:f8b0:4864:20::102d; envelope-from=tgbugs@gmail.com; helo=mail-pj1-x102d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: emacs-orgmode-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.46 X-Spam-Score: -5.46 X-Migadu-Queue-Id: 981A4327AF X-Migadu-Scanner: mx2.migadu.com X-TUID: VD3nYgDoDp2l --00000000000065a3d2060301c9ef Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Here is a corrected patch that fixes the fact that closures passed to the :tangle header were not being evaluated. Details in the commit message. Best, Tom On Tue, Aug 15, 2023 at 6:41=E2=80=AFPM Tom Gillespie wr= ote: > > After a bit more investigation don't apply this patch because the change > is insufficient to correct another issue. > > Specifically org-babel-tangle-collect-blocks must check for and resolve > any closures that are passed to :tangle _before_ testing (string=3D > src-tfile "no"). > As it stands blocks that are marked :tangle (and "no") with a closure > incorrectly make it to a call to (org-babel-get-src-block-info) which cau= ses > a call to org-babel-process-params when :tangle would be "no". > > Working on a proper fix now. --00000000000065a3d2060301c9ef Content-Type: text/x-patch; charset="US-ASCII"; name="0001-ob-tangle.el-restore-tangle-closure-evaluation-befor.patch" Content-Disposition: attachment; filename="0001-ob-tangle.el-restore-tangle-closure-evaluation-befor.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lld5zkxo0 RnJvbSBjZTU2ZmU1YzFhMjRiYTM3YzVjN2MyZjU0MWM0ODY4NGIwY2IxZTBiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUb20gR2lsbGVzcGllIDx0Z2J1Z3NAZ21haWwuY29tPgpEYXRl OiBUdWUsIDE1IEF1ZyAyMDIzIDEzOjQ2OjA4IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gb2ItdGFu Z2xlLmVsOiByZXN0b3JlIDp0YW5nbGUgY2xvc3VyZSBldmFsdWF0aW9uIGJlZm9yZSBldmFsCiBp bmZvCgoqIGxpc3Avb2ItdGFuZ2xlLmVsIChvcmctYmFiZWwtdGFuZ2xlKTogY2hlY2sgdGhhdCA6 dGFuZ2xlIGlzIG5vdCBubwpiZWZvcmUgYXR0ZW1wdGluZyB0byB0YW5nbGUgYSBzaW5nbGUgYmxv Y2sKKG9yZy1iYWJlbC10YW5nbGUtLXVuYnJhY2tldGVkLWxpbmspOiBuZXcgb3B0aW9uYWwgYXJn dW1lbnQKaW5mby13YXMtZXZhbGVkIHRvIGNvbnRyb2wgd2hldGhlciAoY2RyIChhc3NxIDp0YW5n bGUgcGFyYW1zKSkgaXMKZXhwYW5kZWQgdmlhIGBvcmctYmFiZWwtcmVhZCcKKG9yZy1iYWJlbC10 YW5nbGUtY29sbGVjdC1ibG9ja3MpOiBleHBhbmQgY2xvc3VyZXMgcGFzc2VkIHRvIDp0YW5nbGUK d2l0aCBgb3JnLWJhYmVsLXJlYWQnIHNvIHRoYXQgYmxvY2tzIHdpdGggOnRhbmdsZSBjbG9zdXJl IHRoYXQgZXZhbCB0bwoibm8iIHdpbGwgbm90IGluY29ycmVjdGx5IGV2YWwgb3RoZXIgcGFyYW1l dGVycwoob3JnLWJhYmVsLXRhbmdsZS1zaW5nbGUtYmxvY2spOiBzcmMtdGZpbGUgaGFuZGxlIGNh c2VzIHdoZXJlIG91dHB1dApvZiA6dGFuZ2xlIGNsb3N1cmUgY291bGQgYmUgbmlsIGFuZCBjb252 ZXIgdG8gIm5vIgoKVGhpcyBwYXRjaCBmaXhlcyBhIGJ1ZyB3aGVyZSBoZWFkZXIgYXJndW1lbnRz IGxpa2UgOnRhbmdsZSAob3IgIm5vIikKd2VyZSB0cmVhdGVkIGFzIGlmIHRoZXkgd2VyZSB0YW5n bGluZyB0byBhIGZpbGUgbmFtZWQgIihvciBcIm5vXCIpIi4KQXMgYSByZXN1bHQsIG9yZy1iYWJs ZSB3b3VsZCBjYWxsIG9yZy1iYWJlbC1nZXQtc3JjLWJsb2NrLWluZm8gd2l0aAonbm8tZXZhbCBz ZXQgdG8gbmlsLCBjYXVzaW5nIHBhcmFtZXRlcnMgdG8gYmUgZXZhbHVhdGVkIGRlc3BpdGUgdGhl CmZhY3QgdGhhdCB3aGVuIDp0YW5nbGUgbm8gb3IgZXF1aXZhbGVudCBpcyBzZXQsIHRoZSBvdGhl ciBwYXJhbWV0ZXJzCnNob3VsZCBuZXZlciBiZSBldmFsdWF0ZWQuCgpUaGlzIHBhdGNoIGFsc28g cmVzdG9yZXMgdGhlIG9yaWdpbmFsIGJlaGF2aW9yIG9mIHRoZSA6dGFuZ2xlIGhlYWRlcgphcmd1 bWVudCB3aGVuIGEgY2xvc3VyZSByZXR1cm5lZCBuaWwsIGUuZy4gIytoZWFkZXI6IDp0YW5nbGUg KG9yKSwgYnkKdXNpbmcgKG9yIChjZHIgKGFzc3EgOnRhbmdsZSBwYXJhbXMpKSAibm8iKS4gV2l0 aG91dCB0aGlzIHRoZSBjYWxsIHRvCmBmaWxlLW5hbWUtZGlyZWN0b3J5JyBpbiBgb3JnLWJhYmVs LXRhbmdsZS0tdW5icmFja2V0ZWQtbGluaycgY2FuIGZhaWwKd2l0aCBhIHdyb25nLXR5cGUtYXJn dW1lbnQgc3RyaW5ncCBuaWwgZXJyb3IuCi0tLQogbGlzcC9vYi10YW5nbGUuZWwgfCAzMiArKysr KysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIzIGluc2VydGlv bnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9vYi10YW5nbGUuZWwgYi9s aXNwL29iLXRhbmdsZS5lbAppbmRleCA0NTY2ZTAzYWQuLmE5ZmIwZTI4NiAxMDA2NDQKLS0tIGEv bGlzcC9vYi10YW5nbGUuZWwKKysrIGIvbGlzcC9vYi10YW5nbGUuZWwKQEAgLTMxNiw5ICszMTYs MTMgQEAgbWF0Y2hpbmcgYSByZWd1bGFyIGV4cHJlc3Npb24uIgogCQkgICAgICh3cml0ZS1yZWdp b24gbmlsIG5pbCBmaWxlLW5hbWUpCiAJCSAgICAgKG1hcGMgKGxhbWJkYSAobW9kZSkgKHNldC1m aWxlLW1vZGVzIGZpbGUtbmFtZSBtb2RlKSkgbW9kZXMpKQogICAgICAgICAgICAgICAgICAgIChw dXNoIGZpbGUtbmFtZSBwYXRoLWNvbGxlY3RvcikpKSkpKQotCSAoaWYgKGVxdWFsIGFyZyAnKDQp KQotCSAgICAgKG9yZy1iYWJlbC10YW5nbGUtc2luZ2xlLWJsb2NrIDEgdCkKLQkgICAob3JnLWJh YmVsLXRhbmdsZS1jb2xsZWN0LWJsb2NrcyBsYW5nLXJlIHRhbmdsZS1maWxlKSkpCisgICAgICAg ICAoaWYgKGVxdWFsIGFyZyAnKDQpKQorICAgICAgICAgICAgIChsZXQqICgoaW5mbyAob3JnLWJh YmVsLWdldC1zcmMtYmxvY2staW5mbyAnbm8tZXZhbCkpCisgICAgICAgICAgICAgICAgICAgIChw YXJhbXMgKG50aCAyIGluZm8pKQorICAgICAgICAgICAgICAgICAgICAoc3JjLXRmaWxlIChvciAo b3JnLWJhYmVsLXJlYWQgKGNkciAoYXNzcSA6dGFuZ2xlIHBhcmFtcykpKSAibm8iKSkpCisgICAg ICAgICAgICAgICAodW5sZXNzIChzdHJpbmc9IHNyYy10ZmlsZSAibm8iKQorICAgICAgICAgICAg ICAgICAob3JnLWJhYmVsLXRhbmdsZS1zaW5nbGUtYmxvY2sgMSB0KSkpCisgICAgICAgICAgIChv cmctYmFiZWwtdGFuZ2xlLWNvbGxlY3QtYmxvY2tzIGxhbmctcmUgdGFuZ2xlLWZpbGUpKSkKIAko bWVzc2FnZSAiVGFuZ2xlZCAlZCBjb2RlIGJsb2NrJXMgZnJvbSAlcyIgYmxvY2stY291bnRlcgog CQkgKGlmICg9IGJsb2NrLWNvdW50ZXIgMSkgIiIgInMiKQogCQkgKGZpbGUtbmFtZS1ub25kaXJl Y3RvcnkKQEAgLTQ3MywxNCArNDc3LDE0IEBAIGNvZGUgYmxvY2tzIGJ5IHRhcmdldCBmaWxlLiIK IAkJICAob3JnLWluLWFyY2hpdmVkLWhlYWRpbmctcCkpCiAJKGxldCogKChpbmZvIChvcmctYmFi ZWwtZ2V0LXNyYy1ibG9jay1pbmZvICduby1ldmFsKSkKIAkgICAgICAgKHNyYy1sYW5nIChudGgg MCBpbmZvKSkKLQkgICAgICAgKHNyYy10ZmlsZSAoY2RyIChhc3NxIDp0YW5nbGUgKG50aCAyIGlu Zm8pKSkpKQorCSAgICAgICAoc3JjLXRmaWxlIChvciAob3JnLWJhYmVsLXJlYWQgKGNkciAoYXNz cSA6dGFuZ2xlIChudGggMiBpbmZvKSkpKSAibm8iKSkpCiAJICAodW5sZXNzIChvciAoc3RyaW5n PSBzcmMtdGZpbGUgIm5vIikKIAkJICAgICAgKGFuZCB0YW5nbGUtZmlsZSAobm90IChlcXVhbCB0 YW5nbGUtZmlsZSBzcmMtdGZpbGUpKSkKIAkJICAgICAgKGFuZCBsYW5nLXJlIChub3QgKHN0cmlu Zy1tYXRjaC1wIGxhbmctcmUgc3JjLWxhbmcpKSkpCiAJICAgIDs7IEFkZCB0aGUgc3BlYyBmb3Ig dGhpcyBibG9jayB0byBibG9ja3MgdW5kZXIgaXRzIHRhbmdsZWQKIAkgICAgOzsgZmlsZSBuYW1l LgogCSAgICAobGV0KiAoKGJsb2NrIChvcmctYmFiZWwtdGFuZ2xlLXNpbmdsZS1ibG9jayBjb3Vu dGVyKSkKLSAgICAgICAgICAgICAgICAgICAoc3JjLXRmaWxlIChjZHIgKGFzc3EgOnRhbmdsZSAo bnRoIDQgYmxvY2spKSkpCisgICAgICAgICAgICAgICAgICAgKHNyYy10ZmlsZSAob3IgKGNkciAo YXNzcSA6dGFuZ2xlIChudGggNCBibG9jaykpKSAibm8iKSkKIAkJICAgKGZpbGUtbmFtZSAob3Jn LWJhYmVsLWVmZmVjdGl2ZS10YW5nbGVkLWZpbGVuYW1lCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgYnVmZmVyLWZuIHNyYy1sYW5nIHNyYy10ZmlsZSkpCiAJCSAgIChieS1mbiAoYXNz b2MgZmlsZS1uYW1lIGJsb2NrcykpKQpAQCAtNDkwLDcgKzQ5NCw3IEBAIGNvZGUgYmxvY2tzIGJ5 IHRhcmdldCBmaWxlLiIKICAgICAobWFwY2FyIChsYW1iZGEgKGIpIChjb25zIChjYXIgYikgKG5y ZXZlcnNlIChjZHIgYikpKSkKIAkgICAgKG5yZXZlcnNlIGJsb2NrcykpKSkKIAotKGRlZnVuIG9y Zy1iYWJlbC10YW5nbGUtLXVuYnJhY2tldGVkLWxpbmsgKHBhcmFtcykKKyhkZWZ1biBvcmctYmFi ZWwtdGFuZ2xlLS11bmJyYWNrZXRlZC1saW5rIChwYXJhbXMgJm9wdGlvbmFsIGluZm8td2FzLWV2 YWxlZCkKICAgIkdldCBhIHJhdyBsaW5rIHRvIHRoZSBzcmMgYmxvY2sgYXQgcG9pbnQsIHdpdGhv dXQgYnJhY2tldHMuCiAKIFRoZSBQQVJBTVMgYXJlIHRoZSAzcmQgZWxlbWVudCBvZiB0aGUgaW5m byBmb3IgdGhlIHNhbWUgc3JjIGJsb2NrLiIKQEAgLTUxMCw3ICs1MTQsMTAgQEAgVGhlIFBBUkFN UyBhcmUgdGhlIDNyZCBlbGVtZW50IG9mIHRoZSBpbmZvIGZvciB0aGUgc2FtZSBzcmMgYmxvY2su IgogICAgICAgICAgICAgICAoY29uY2F0ICJmaWxlOiIKICAgICAgICAgICAgICAgICAgICAgICAo ZmlsZS1yZWxhdGl2ZS1uYW1lIChzdWJzdHJpbmcgYmFyZSAobWF0Y2gtZW5kIDApKQogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGZpbGUtbmFtZS1kaXJlY3RvcnkK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoY2RyIChhc3NxIDp0 YW5nbGUgcGFyYW1zKSkpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAob3IgKGlmIGluZm8td2FzLWV2YWxlZAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKGNkciAoYXNzcSA6dGFuZ2xlIHBhcmFtcykpCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG9yZy1iYWJlbC1y ZWFkIChjZHIgKGFzc3EgOnRhbmdsZSBwYXJhbXMpKSkpCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICJubyIpKSkpCiAgICAgICAgICAgICBiYXJlKSkpKSkp CiAKIChkZWZ2YXIgb3JnLW91dGxpbmUtcmVnZXhwKSA7IGRlZmluZWQgaW4gbGlzcC9vcmcuZWwK QEAgLTUyMCw2ICs1MjcsOCBAQCBSZXR1cm4gdGhlIGxpc3Qgb2YgYmxvY2sgYXR0cmlidXRlcyBu ZWVkZWQgYnkKIGBvcmctYmFiZWwtdGFuZ2xlLWNvbGxlY3QtYmxvY2tzJy4gIFdoZW4gT05MWS1U SElTLUJMT0NLIGlzCiBub24tbmlsLCByZXR1cm4gdGhlIGZ1bGwgYXNzb2NpYXRpb24gbGlzdCB0 byBiZSB1c2VkIGJ5CiBgb3JnLWJhYmVsLXRhbmdsZScgZGlyZWN0bHkuIgorICA7OyB0aGlzIHNo b3VsZCBvbmx5IGV2ZXIgYmUgY2FsbGVkIHdoZW4gOnRhbmdsZSBoYXMgYWxyZWFkeSBiZWVuIGRl dGVybWluZWQKKyAgOzsgdG8gYmUgbm9uLW5pbCBhbmQgbm90IHN0cmluZz0gIm5vIgogICAobGV0 KiAoKGluZm8gKG9yZy1iYWJlbC1nZXQtc3JjLWJsb2NrLWluZm8pKQogCSAoc3RhcnQtbGluZQog CSAgKHNhdmUtcmVzdHJpY3Rpb24gKHdpZGVuKQpAQCAtNTMwLDcgKzUzOSw3IEBAIG5vbi1uaWws IHJldHVybiB0aGUgZnVsbCBhc3NvY2lhdGlvbiBsaXN0IHRvIGJlIHVzZWQgYnkKIAkgKGV4dHJh IChudGggMyBpbmZvKSkKICAgICAgICAgIChjb2RlcmVmIChudGggNiBpbmZvKSkKIAkgKGNyZWYt cmVnZXhwIChvcmctc3JjLWNvZGVyZWYtcmVnZXhwIGNvZGVyZWYpKQotCSAobGluayAob3JnLWJh YmVsLXRhbmdsZS0tdW5icmFja2V0ZWQtbGluayBwYXJhbXMpKQorCSAobGluayAob3JnLWJhYmVs LXRhbmdsZS0tdW5icmFja2V0ZWQtbGluayBwYXJhbXMgJ2luZm8td2FzLWV2YWxlZCkpCiAJIChz b3VyY2UtbmFtZQogCSAgKG9yIChudGggNCBpbmZvKQogCSAgICAgIChmb3JtYXQgIiVzOiVkIgpA QCAtNTgwLDcgKzU4OSw3IEBAIG5vbi1uaWwsIHJldHVybiB0aGUgZnVsbCBhc3NvY2lhdGlvbiBs aXN0IHRvIGJlIHVzZWQgYnkKIAkJCSAobWF0Y2gtZW5kIDApCiAJCSAgICAgICAocG9pbnQtbWlu KSkpKQogCSAgICAgIChwb2ludCkpKSkpCi0gICAgICAgICAoc3JjLXRmaWxlIChjZHIgKGFzc3Eg OnRhbmdsZSBwYXJhbXMpKSkKKyAgICAgICAgIChzcmMtdGZpbGUgKG9yIChjZHIgKGFzc3EgOnRh bmdsZSBwYXJhbXMpKSAibm8iKSkKIAkgKHJlc3VsdAogCSAgKGxpc3Qgc3RhcnQtbGluZQogCQko aWYgb3JnLWJhYmVsLXRhbmdsZS11c2UtcmVsYXRpdmUtZmlsZS1saW5rcwpAQCAtNjAyLDYgKzYx MSwxMSBAQCBub24tbmlsLCByZXR1cm4gdGhlIGZ1bGwgYXNzb2NpYXRpb24gbGlzdCB0byBiZSB1 c2VkIGJ5CiAgICJSZXR1cm4gYSBsaXN0IG9mIGJlZ2luIGFuZCBlbmQgbGluayBjb21tZW50cyBm b3IgdGhlIGNvZGUgYmxvY2sgYXQgcG9pbnQuCiBJTkZPLCB3aGVuIG5vbiBuaWwsIGlzIHRoZSBz b3VyY2UgYmxvY2sgaW5mb3JtYXRpb24sIGFzIHJldHVybmVkCiBieSBgb3JnLWJhYmVsLWdldC1z cmMtYmxvY2staW5mbycuIgorICA7OyBjdXJyZW50bHkgYWxsIGNhbGwgc2l0ZXMgZm9yIHRoaXMg ZnVuY3Rpb24gcGFzcyBpbmZvIHRoYXQgY2FtZSBmcm9tIGEKKyAgOzsgJ25vLWV2YWwgY2FsbCB0 byBgb3JnLWJhYmVsLWdldC1zcmMtYmxvY2staW5mbycsIHNwZWNpZmljYWxseSB0aGV5IGNvbWUK KyAgOzsgaW5mbyBwb3B1bGF0ZWQgaW50byBgb3JnLWJhYmVsLWV4cGFuZC1ub3dlYi1yZWZlcmVu Y2VzLS1jYWNoZScsIGFzIHN1Y2gKKyAgOzsgd2UgRE8gTk9UIHBhc3MgdGhlIGluZGljYXRvciB0 aGF0ICdpbmZvLXdhcy1ldmFsZWQgdG8KKyAgOzsgYG9yZy1iYWJlbC10YW5nbGUtLXVuYnJhY2tl dGVkLWxpbmsnIGJlbG93CiAgIChsZXQgKChsaW5rLWRhdGEgKHBjYXNlIChvciBpbmZvIChvcmct YmFiZWwtZ2V0LXNyYy1ibG9jay1pbmZvICduby1ldmFsKSkKIAkJICAgICAoYCgsXyAsXyAscGFy YW1zICxfICxuYW1lICxzdGFydCAsXykKIAkJICAgICAgYCgoInN0YXJ0LWxpbmUiIC4gLChvcmct d2l0aC1wb2ludC1hdCBzdGFydAotLSAKMi40MS4wCgo= --00000000000065a3d2060301c9ef--