From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id gEGjBMm59WKpOwAAbAwnHQ (envelope-from ) for ; Fri, 12 Aug 2022 04:24:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id MIm1BMm59WKoTAAAauVa8A (envelope-from ) for ; Fri, 12 Aug 2022 04:24:09 +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 54F7137FE0 for ; Fri, 12 Aug 2022 04:24:08 +0200 (CEST) Received: from localhost ([::1]:48600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oMKLH-0005ML-0Y for larch@yhetil.org; Thu, 11 Aug 2022 22:24:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oMKIa-0003oH-AU for emacs-orgmode@gnu.org; Thu, 11 Aug 2022 22:21:20 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]:43383) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oMKIW-0002Pj-2R for emacs-orgmode@gnu.org; Thu, 11 Aug 2022 22:21:19 -0400 Date: Fri, 12 Aug 2022 02:21:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=0brg.net; s=protonmail3; t=1660270871; x=1660530071; bh=1TFg3vU04TiyTSToYod8M9yLuDRIE8RsIew2Y2ha4H8=; h=Date:To:From:Reply-To:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID; b=T9MLpi0baZ4YVyV0zgz5Xh6LQZuhSAO633SzZ8QsZqVolPP/xQmndfYmkszajutu8 xHBQp0Y9opJkoy/RmfmQs8JSqkxUjdsUNGrrwyiGPM0IlYih2Z2A2FGWLtEpW8YSKy P68wUisZEOOTdiQp0m3OakMDh26ZWp9zMBZW7/WdA0lX90x/LNCiE4xSbqjpBCrXJx hy/FJEQLDO3lcrXRSFtwWN9Z/Zk6uvzTjAjMa0qeQSNI3f8mdnu9fZ0138UXqIqMgD TmjpBPAQcJZhlhvpAqkEBXCWB1auRSS4Mu41Do4lpmPrwsIvEnIgsOMC2S3xH9leHz 7D8F3Xc65cNcg== To: emacs-orgmode@gnu.org From: Hraban Luyat Subject: =?utf-8?Q?Re:_[PATCH]_ob-tangle.el:_fix_=E2=80=98:comments_noweb=E2=80=99_double_linking?= Message-ID: In-Reply-To: <87o7wr9zhw.fsf@localhost> References: <01070182484e44f3-f0fd271a-def3-4c86-961f-9a4bb63949d5-000000@eu-central-1.amazonses.com> <87wnbvtcz9.fsf@localhost> <87o7wr9zhw.fsf@localhost> Feedback-ID: 10755604:user:proton MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_HImMluUwxvffIV8wiG0vIjdaoGAwWvflW0UYvSRdx4" Received-SPF: pass client-ip=185.70.40.18; envelope-from=hraban@0brg.net; helo=mail-4018.proton.ch 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Reply-To: Hraban Luyat Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1660271048; h=from:from:sender:sender:reply-to: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=1TFg3vU04TiyTSToYod8M9yLuDRIE8RsIew2Y2ha4H8=; b=A04QeON63ASh3UGi+t6ukiy2PKt7KjiHit3l1jstjfRv6getuvWqZqGT44U/vKvlobWV4m elxHjTVHD+txmRqob6OzQ5bZ8CfKsUx7wKnSei5uAJYyzO+oOuEX7aDcbRFI6EPPTJo4Z+ 4WQB5vPjatcm4ju0LabdO89FcJGjSkIT775WuYuf2Ue/swMXMIulMJakDtQ+KKOxbECkFW 5hXMg0EkcQA0+I2ZslM9ZG+IrTSsWgmxkHIS9DUr6DUZa7OhSdDqZTvZ/Lma+mbbI0D7k/ i2rlBcw6+QNREc9cKW5oFqBipIEGKLM5YpUPqRByOBqeySOqg0i05O0vgchg8w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1660271048; a=rsa-sha256; cv=none; b=HCN+fL414b5uDNBrDLFAwmuwCmctI/lA+xXv99jMndOZ+62jx2tBaF91cz6Nsj5Ajb4GOc BGHeA6A6o9LtRkTifCh+01AcHg4K1qSj5zblazmpfHTSRJq3iwMbESXXeznRxaFyN6lFA8 YUYybUfzVY3ELAq+3uRKJ1B6iqsMNFEvHqFHb7ovuzUYtfgLot/IOT+/ILTPQq/2zOrXlp r3AdRcRSnZosIbNy8lTs/4dKuLtY2+3qGg1MaJmJ+czKjAGjM+nWVDgTzVdJCMbg2Nwba1 UF6AcAQmw6RrKNUZjC8yk9tGFnJWfCj7u5U+KRiZECWqEj9Em+29tyEMGS2opA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=0brg.net header.s=protonmail3 header.b=T9MLpi0b; dmarc=pass (policy=reject) header.from=0brg.net; 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" X-Migadu-Spam-Score: -8.58 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=0brg.net header.s=protonmail3 header.b=T9MLpi0b; dmarc=pass (policy=reject) header.from=0brg.net; 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" X-Migadu-Queue-Id: 54F7137FE0 X-Spam-Score: -8.58 X-Migadu-Scanner: scn0.migadu.com X-TUID: BMxElW7YbTa8 This is a multi-part message in MIME format. --b1_HImMluUwxvffIV8wiG0vIjdaoGAwWvflW0UYvSRdx4 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 8/11/22 12:26 AM, Ihor Radchenko wrote: > Hraban Luyat writes: > >>> Is there any problem with the following? >>> >>> (alist-get :tangle params) >> >> This bit of code was moved, I didn't write it. The original code uses a >> variable `src-tfile' which isn't available here, so I reused the >> definition of that variable (which is (cdr (assq yada yada))). When >> creating this patch, I tried to change as little as possible, to keep >> everything the same as much as I can. Don't write new code, just move >> existing code around. >> >> The (cdr (assq ..)) is used in some other places, too; maybe it's worth >> a separate refactor if we want to change that? I'd rather keep this >> patch as isolated as possible. > > I suspect that alist-get was not there in Emacs 24. > Otherwise, alist-get with no optional parameters is just a wrapper for > (cdr (assq...)) > > We can change it, though I do not see this as a big problem. > >> @Ihor: I have rebased the patch and attached it. > > Sorry, but the patch still does not apply on my side onto the current > main branch. Just rebased and recreated it. Based off 6acc58c9c6bcfd45dcc5964cac7e3df8347121cc. @Max: what do you think of when-let? That seems more appropriate for this situation. Thoughts? > > -- > Ihor Radchenko, > Org mode contributor, > Learn more about Org mode at https://orgmode.org/. > Support Org development at https://liberapay.com/org-mode, > or support my work at https://liberapay.com/yantar92 --b1_HImMluUwxvffIV8wiG0vIjdaoGAwWvflW0UYvSRdx4 Content-Type: text/plain; name=0001-ob-tangle.el-fix-comments-noweb-double-linking.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-ob-tangle.el-fix-comments-noweb-double-linking.patch RnJvbSAwYzg5YzQ4YTgwYjAwOTVjNDBhMWM0YzQ3OGZkZmQ1ODFlMDExMGZkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIcmFiYW4gTHV5YXQgPGhyYWJhbkAwYnJnLm5ldD4KRGF0ZTog TW9uLCA4IEF1ZyAyMDIyIDE2OjU4OjA1IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gPT9VVEYtOD9x P29iLXRhbmdsZS5lbDo9MjBmaXg9MjA9RTI9ODA9OTg6Y29tbWVudHM9MjBub3dlPz0KID0/VVRG LTg/cT9iPUUyPTgwPTk5PTIwZG91YmxlPTIwbGlua2luZz89Ck1JTUUtVmVyc2lvbjogMS4wCkNv bnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD1VVEYtOApDb250ZW50LVRyYW5zZmVyLUVu Y29kaW5nOiA4Yml0CgoqIGxpc3Avb2ItdGFuZ2xlLmVsOiBSZWZhY3RvciB0aGUgZG91YmxlIGlt cGxlbWVudGF0aW9uIHRvIGEgc2luZ2xlCmhlbHBlciBmdW5jdGlvbi4gIFRoaXMgYXZvaWRzIHRo ZSBkb3VibGUgbGluayB3cmFwcGluZy4KCiogdGVzdGluZy9saXNwL3Rlc3Qtb2ItdGFuZ2xlLmVs OiBBZGQgdW5pdCB0ZXN0cy4KCkJhYmVsIHRhbmdsZSBhbGxvd3MgaW5zZXJ0aW5nIGNvbW1lbnRz IGF0IHRoZSB0YW5nbGVkIHNpdGUgd2hpY2ggbGluawpiYWNrIHRvIHRoZSBzb3VyY2UgaW4gdGhl IG9yZyBmaWxlLiAgVGhpcyBsaW5raW5nIHdhcyBpbXBsZW1lbnRlZAp0d2ljZSwgdG8gaGFuZGxl IHNlcGFyYXRlIGNhc2VzLCBidXQgd2hlbiB1c2luZyDigJg6Y29tbWVudHMgbm93ZWLigJkgaXQK ZW5kZWQgdXAgZ29pbmcgdGhyb3VnaCBib3RoIGNvZGVwYXRocy4gIFRoaXMgcmVzdWx0ZWQgaW4g ZG91Ymx5CndyYXBwZWQgbGlua3MuCgpCeSByZWZhY3RvcmluZyBhbGwgbGluayBnZW5lcmF0aW9u IGludG8gYSBzaW5nbGUgZnVuY3Rpb24sIHRoaXMgZG91YmxlCndyYXBwaW5nIGlzIGF2b2lkZWQu CgpFeGFtcGxlIGZpbGUsIC90bXAvdGVzdC5vcmc6CgogICAgKiBJbm5lcgogICAgIytuYW1lOiBp bm5lcgogICAgIytiZWdpbl9zcmMgZW1hY3MtbGlzcAogICAgMgogICAgIytlbmRfc3JjCgogICAg KiBNYWluCiAgICAjK2hlYWRlcjogOnRhbmdsZSB0ZXN0LmVsIDpjb21tZW50cyBub3dlYiA6bm93 ZWIgeWVzCiAgICAjK2JlZ2luX3NyYyBlbWFjcy1saXNwCiAgICAxCiAgICA8PGlubmVyPj4KICAg ICMrZW5kX3NyYwoKQmVmb3JlOgoKICAgIDs7IFtbZmlsZTp0ZXN0Lm9yZzo6Kk1haW5dW01haW46 MV1dCiAgICAxCiAgICA7OyBbW1tbZmlsZTovdG1wL3Rlc3Qub3JnOjppbm5lcl1baW5uZXJdXV1b aW5uZXJdXQogICAgMgogICAgOzsgaW5uZXIgZW5kcyBoZXJlCiAgICA7OyBNYWluOjEgZW5kcyBo ZXJlCgpBZnRlcjoKCiAgICA7OyBbW2ZpbGU6dGVzdC5vcmc6OipNYWluXVtNYWluOjFdXQogICAg MQogICAgOzsgW1tmaWxlOnRlc3Qub3JnOjppbm5lcl1baW5uZXJdXQogICAgMgogICAgOzsgaW5u ZXIgZW5kcyBoZXJlCiAgICA7OyBNYWluOjEgZW5kcyBoZXJlCi0tLQogbGlzcC9vYi10YW5nbGUu ZWwgICAgICAgICAgICAgIHwgNjIgKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQog dGVzdGluZy9saXNwL3Rlc3Qtb2ItdGFuZ2xlLmVsIHwgNTYgKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDg3IGluc2VydGlvbnMoKyksIDMxIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2xpc3Avb2ItdGFuZ2xlLmVsIGIvbGlzcC9vYi10YW5nbGUuZWwK aW5kZXggNGI4ZmFkNmNlLi40ZGIwYWRkYTcgMTAwNjQ0Ci0tLSBhL2xpc3Avb2ItdGFuZ2xlLmVs CisrKyBiL2xpc3Avb2ItdGFuZ2xlLmVsCkBAIC00NjksNiArNDY5LDMzIEBAIGNvZGUgYmxvY2tz IGJ5IHRhcmdldCBmaWxlLiIKICAgICAobWFwY2FyIChsYW1iZGEgKGIpIChjb25zIChjYXIgYikg KG5yZXZlcnNlIChjZHIgYikpKSkKIAkgICAgKG5yZXZlcnNlIGJsb2NrcykpKSkKIAorKGRlZnVu IG9yZy1iYWJlbC10YW5nbGUtLXVuYnJhY2tldGVkLWxpbmsgKHBhcmFtcykKKyAgIkdldCBhIHJh dyBsaW5rIHRvIHRoZSBzcmMgYmxvY2sgYXQgcG9pbnQsIHdpdGhvdXQgYnJhY2tldHMuCisKK1Ro ZSBQQVJBTVMgYXJlIHRoZSAzcmQgZWxlbWVudCBvZiB0aGUgaW5mbyBmb3IgdGhlIHNhbWUgc3Jj IGJsb2NrLiIKKyAgKHVubGVzcyAoc3RyaW5nPSAibm8iIChjZHIgKGFzc3EgOmNvbW1lbnRzIHBh cmFtcykpKQorICAgIChzYXZlLW1hdGNoLWRhdGEKKyAgICAgIChsZXQqICg7OyBUaGUgY3JlYXRl ZCBsaW5rIGlzIHRyYW5zaWVudC4gIFVzaW5nIElEIGlzIG5vdCBuZWNlc3NhcnksCisgICAgICAg ICAgICAgOzsgYnV0IGNvdWxkIGhhdmUgc2lkZS1lZmZlY3RzIGlmIHVzZWQuICBBbiBJRCBwcm9w ZXJ0eSBtYXkKKyAgICAgICAgICAgICA7OyBiZSBhZGRlZCB0byBleGlzdGluZyBlbnRyaWVzIHRo dXMgY3JlYXRpbmcgdW5leHBlY3RlZCBmaWxlCisgICAgICAgICAgICAgOzsgbW9kaWZpY2F0aW9u cy4KKyAgICAgICAgICAgICAob3JnLWlkLWxpbmstdG8tb3JnLXVzZS1pZCBuaWwpCisgICAgICAg ICAgICAgKGwgKG9yZy1uby1wcm9wZXJ0aWVzCisgICAgICAgICAgICAgICAgIChjbC1sZXRmICgo KHN5bWJvbC1mdW5jdGlvbiAnb3JnLXN0b3JlLWxpbmstZnVuY3Rpb25zKQorICAgICAgICAgICAg ICAgICAgICAgICAgICAgIChsYW1iZGEgKCkgbmlsKSkpCisgICAgICAgICAgICAgICAgICAgKG9y Zy1zdG9yZS1saW5rIG5pbCkpKSkKKyAgICAgICAgICAgICAoYmFyZSAoYW5kIChzdHJpbmctbWF0 Y2ggb3JnLWxpbmstYnJhY2tldC1yZSBsKQorICAgICAgICAgICAgICAgICAgICAgICAgKG1hdGNo LXN0cmluZyAxIGwpKSkpCisgICAgICAgICh3aGVuIGJhcmUKKyAgICAgICAgICAoaWYgKGFuZCBv cmctYmFiZWwtdGFuZ2xlLXVzZS1yZWxhdGl2ZS1maWxlLWxpbmtzCisgICAgICAgICAgICAgICAg ICAgKHN0cmluZy1tYXRjaCBvcmctbGluay10eXBlcy1yZSBiYXJlKQorICAgICAgICAgICAgICAg ICAgIChzdHJpbmc9IChtYXRjaC1zdHJpbmcgMSBiYXJlKSAiZmlsZSIpKQorICAgICAgICAgICAg ICAoY29uY2F0ICJmaWxlOiIKKyAgICAgICAgICAgICAgICAgICAgICAoZmlsZS1yZWxhdGl2ZS1u YW1lIChzdWJzdHJpbmcgYmFyZSAobWF0Y2gtZW5kIDApKQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKGZpbGUtbmFtZS1kaXJlY3RvcnkKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoY2RyIChhc3NxIDp0YW5nbGUgcGFyYW1zKSkp KSkKKyAgICAgICAgICAgIGJhcmUpKSkpKSkKKwogKGRlZnVuIG9yZy1iYWJlbC10YW5nbGUtc2lu Z2xlLWJsb2NrIChibG9jay1jb3VudGVyICZvcHRpb25hbCBvbmx5LXRoaXMtYmxvY2spCiAgICJD b2xsZWN0IHRoZSB0YW5nbGVkIHNvdXJjZSBmb3IgY3VycmVudCBibG9jay4KIFJldHVybiB0aGUg bGlzdCBvZiBibG9jayBhdHRyaWJ1dGVzIG5lZWRlZCBieQpAQCAtNDg1LDIwICs1MTIsNyBAQCBu b24tbmlsLCByZXR1cm4gdGhlIGZ1bGwgYXNzb2NpYXRpb24gbGlzdCB0byBiZSB1c2VkIGJ5CiAJ IChleHRyYSAobnRoIDMgaW5mbykpCiAgICAgICAgICAoY29kZXJlZiAobnRoIDYgaW5mbykpCiAJ IChjcmVmLXJlZ2V4cCAob3JnLXNyYy1jb2RlcmVmLXJlZ2V4cCBjb2RlcmVmKSkKLQkgKGxpbmsg KGlmIChzdHJpbmc9ICJubyIgKGNkciAoYXNzcSA6Y29tbWVudHMgcGFyYW1zKSkpICIiCi0gICAg ICAgICAgICAgICAgIChsZXQqICgKLSAgICAgICAgICAgICAgICAgICAgICAgIDs7IFRoZSBjcmVh dGVkIGxpbmsgaXMgdHJhbnNpZW50LiAgVXNpbmcgSUQgaXMKLSAgICAgICAgICAgICAgICAgICAg ICAgIDs7IG5vdCBuZWNlc3NhcnksIGJ1dCBjb3VsZCBoYXZlIHNpZGUtZWZmZWN0cyBpZgotICAg ICAgICAgICAgICAgICAgICAgICAgOzsgdXNlZC4gIEFuIElEIHByb3BlcnR5IG1heSBiZSBhZGRl ZCB0bwotICAgICAgICAgICAgICAgICAgICAgICAgOzsgZXhpc3RpbmcgZW50cmllcyB0aHVzIGNy ZWF0aW5nIHVuZXhwZWN0ZWQKLSAgICAgICAgICAgICAgICAgICAgICAgIDs7IGZpbGUgbW9kaWZp Y2F0aW9ucy4KLSAgICAgICAgICAgICAgICAgICAgICAgIChvcmctaWQtbGluay10by1vcmctdXNl LWlkIG5pbCkKLSAgICAgICAgICAgICAgICAgICAgICAgIChsIChvcmctbm8tcHJvcGVydGllcwot ICAgICAgICAgICAgICAgICAgICAgICAgICAgIChjbC1sZXRmICgoKHN5bWJvbC1mdW5jdGlvbiAn b3JnLXN0b3JlLWxpbmstZnVuY3Rpb25zKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgKGxhbWJkYSAoKSBuaWwpKSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IChvcmctc3RvcmUtbGluayBuaWwpKSkpKQotICAgICAgICAgICAgICAgICAgIChhbmQgKHN0cmlu Zy1tYXRjaCBvcmctbGluay1icmFja2V0LXJlIGwpCi0gICAgICAgICAgICAgICAgICAgICAgICAo bWF0Y2gtc3RyaW5nIDEgbCkpKSkpCisJIChsaW5rIChvcmctYmFiZWwtdGFuZ2xlLS11bmJyYWNr ZXRlZC1saW5rIHBhcmFtcykpCiAJIChzb3VyY2UtbmFtZQogCSAgKG9yIChudGggNCBpbmZvKQog CSAgICAgIChmb3JtYXQgIiVzOiVkIgpAQCAtNTUyLDE1ICs1NjYsNyBAQCBub24tbmlsLCByZXR1 cm4gdGhlIGZ1bGwgYXNzb2NpYXRpb24gbGlzdCB0byBiZSB1c2VkIGJ5CiAJCShpZiBvcmctYmFi ZWwtdGFuZ2xlLXVzZS1yZWxhdGl2ZS1maWxlLWxpbmtzCiAJCSAgICAoZmlsZS1yZWxhdGl2ZS1u YW1lIGZpbGUpCiAJCSAgZmlsZSkKLQkJKGlmIChhbmQgb3JnLWJhYmVsLXRhbmdsZS11c2UtcmVs YXRpdmUtZmlsZS1saW5rcwotCQkJIChzdHJpbmctbWF0Y2ggb3JnLWxpbmstdHlwZXMtcmUgbGlu aykKLQkJCSAoc3RyaW5nPSAobWF0Y2gtc3RyaW5nIDEgbGluaykgImZpbGUiKQotICAgICAgICAg ICAgICAgICAgICAgICAgIChzdHJpbmdwIHNyYy10ZmlsZSkpCi0JCSAgICAoY29uY2F0ICJmaWxl OiIKLQkJCSAgICAoZmlsZS1yZWxhdGl2ZS1uYW1lIChzdWJzdHJpbmcgbGluayAobWF0Y2gtZW5k IDApKQotCQkJCQkJKGZpbGUtbmFtZS1kaXJlY3RvcnkKLQkJCQkJCSBzcmMtdGZpbGUpKSkKLQkJ ICBsaW5rKQorCQlsaW5rCiAJCXNvdXJjZS1uYW1lCiAJCXBhcmFtcwogCQkoaWYgb3JnLXNyYy1w cmVzZXJ2ZS1pbmRlbnRhdGlvbgpAQCAtNTc4LDE4ICs1ODQsMTIgQEAgbm9uLW5pbCwgcmV0dXJu IHRoZSBmdWxsIGFzc29jaWF0aW9uIGxpc3QgdG8gYmUgdXNlZCBieQogSU5GTywgd2hlbiBub24g bmlsLCBpcyB0aGUgc291cmNlIGJsb2NrIGluZm9ybWF0aW9uLCBhcyByZXR1cm5lZAogYnkgYG9y Zy1iYWJlbC1nZXQtc3JjLWJsb2NrLWluZm8nLiIKICAgKGxldCAoKGxpbmstZGF0YSAocGNhc2Ug KG9yIGluZm8gKG9yZy1iYWJlbC1nZXQtc3JjLWJsb2NrLWluZm8gJ2xpZ2h0KSkKLQkJICAgICAo YCgsXyAsXyAsXyAsXyAsbmFtZSAsc3RhcnQgLF8pCisJCSAgICAgKGAoLF8gLF8gLHBhcmFtcyAs XyAsbmFtZSAsc3RhcnQgLF8pCiAJCSAgICAgIGAoKCJzdGFydC1saW5lIiAuICwob3JnLXdpdGgt cG9pbnQtYXQgc3RhcnQKIAkJCQkJICAgKG51bWJlci10by1zdHJpbmcKIAkJCQkJICAgIChsaW5l LW51bWJlci1hdC1wb3MpKSkpCiAJCQkoImZpbGUiIC4gLChidWZmZXItZmlsZS1uYW1lKSkKLQkJ CSgibGluayIgLiAsKGxldCAoOzsgVGhlIGNyZWF0ZWQgbGluayBpcyB0cmFuc2llbnQuICBVc2lu ZyBJRCBpcwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA7OyBub3Qg bmVjZXNzYXJ5LCBidXQgY291bGQgaGF2ZSBzaWRlLWVmZmVjdHMgaWYKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgOzsgdXNlZC4gIEFuIElEIHByb3BlcnR5IG1heSBi ZSBhZGRlZCB0bwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA7OyBl eGlzdGluZyBlbnRyaWVzIHRodXMgY3JlYXRpbiB1bmV4cGVjdGVkIGZpbGUKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOzsgbW9kaWZpY2F0aW9ucy4KLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG9yZy1pZC1saW5rLXRvLW9yZy11c2Ut aWQgbmlsKSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAob3JnLW5vLXBy b3BlcnRpZXMgKG9yZy1zdG9yZS1saW5rIG5pbCkpKSkKKwkJCSgibGluayIgLiAsKG9yZy1iYWJl bC10YW5nbGUtLXVuYnJhY2tldGVkLWxpbmsgcGFyYW1zKSkKIAkJCSgic291cmNlLW5hbWUiIC4g LG5hbWUpKSkpKSkKICAgICAobGlzdCAob3JnLWZpbGwtdGVtcGxhdGUgb3JnLWJhYmVsLXRhbmds ZS1jb21tZW50LWZvcm1hdC1iZWcgbGluay1kYXRhKQogCSAgKG9yZy1maWxsLXRlbXBsYXRlIG9y Zy1iYWJlbC10YW5nbGUtY29tbWVudC1mb3JtYXQtZW5kIGxpbmstZGF0YSkpKSkKZGlmZiAtLWdp dCBhL3Rlc3RpbmcvbGlzcC90ZXN0LW9iLXRhbmdsZS5lbCBiL3Rlc3RpbmcvbGlzcC90ZXN0LW9i LXRhbmdsZS5lbAppbmRleCAyZWQ0YmEwZGEuLjYxOGUxMThlMCAxMDA2NDQKLS0tIGEvdGVzdGlu Zy9saXNwL3Rlc3Qtb2ItdGFuZ2xlLmVsCisrKyBiL3Rlc3RpbmcvbGlzcC90ZXN0LW9iLXRhbmds ZS5lbApAQCAtMTU5LDYgKzE1OSw2MiBAQCBlY2hvIDEKIAkgICAgIChzZWFyY2gtZm9yd2FyZCAo Y29uY2F0ICJbZmlsZToiIGZpbGUpIG5pbCB0KSkpCiAgICAgICAgKGRlbGV0ZS1maWxlICJ0ZXN0 LW9iLXRhbmdsZS5lbCIpKSkpKQogCisoZXJ0LWRlZnRlc3Qgb2ItdGFuZ2xlL2NvbW1lbnQtbm93 ZWItcmVsYXRpdmUgKCkKKyAgIlRlc3QgOmNvbW1lbnRzIG5vd2ViIHRhbmdsaW5nIHdpdGggcmVs YXRpdmUgZmlsZSBwYXRocy4iCisgIChzaG91bGQKKyAgIChvcmctdGVzdC13aXRoLXRlbXAtdGV4 dC1pbi1maWxlCisgICAgICAgIiogSW5uZXIKKyMrbmFtZTogaW5uZXIKKyMrYmVnaW5fc3JjIGVt YWNzLWxpc3AKKzIKKyMrZW5kX3NyYworCisqIE1haW4KKyMraGVhZGVyOiA6dGFuZ2xlIFwidGVz dC1vYi10YW5nbGUuZWxcIiA6Y29tbWVudHMgbm93ZWIgOm5vd2ViIHllcworIytiZWdpbl9zcmMg ZW1hY3MtbGlzcAorMQorPDxpbm5lcj4+CisjK2VuZF9zcmMiCisgICAgICh1bndpbmQtcHJvdGVj dAorCSAobGV0ICgob3JnLWJhYmVsLXRhbmdsZS11c2UtcmVsYXRpdmUtZmlsZS1saW5rcyB0KSkK KyAgICAgICAgICAgKG9yZy1iYWJlbC10YW5nbGUpCisgICAgICAgICAgICh3aXRoLXRlbXAtYnVm ZmVyCisgICAgICAgICAgICAgKGluc2VydC1maWxlLWNvbnRlbnRzICJ0ZXN0LW9iLXRhbmdsZS5l bCIpCisgICAgICAgICAgICAgKGJ1ZmZlci1zdHJpbmcpCisgICAgICAgICAgICAgKGdvdG8tY2hh ciAocG9pbnQtbWluKSkKKyAgICAgICAgICAgICAoYW5kCisgICAgICAgICAgICAgIChzZWFyY2gt Zm9yd2FyZCAoY29uY2F0ICI7OyBbW2ZpbGU6IiAoZmlsZS1uYW1lLW5vbmRpcmVjdG9yeSBmaWxl KSAiOjppbm5lciIpIG5pbCB0KQorICAgICAgICAgICAgICAoc2VhcmNoLWZvcndhcmQgIjs7IGlu bmVyIGVuZHMgaGVyZSIgbmlsIHQpKSkpCisgICAgICAgKGRlbGV0ZS1maWxlICJ0ZXN0LW9iLXRh bmdsZS5lbCIpKSkpKQorCisoZXJ0LWRlZnRlc3Qgb2ItdGFuZ2xlL2NvbW1lbnQtbm93ZWItYWJz b2x1dGUgKCkKKyAgIlRlc3QgOmNvbW1lbnRzIG5vd2ViIHRhbmdsaW5nIHdpdGggYWJzb2x1dGUg ZmlsZSBwYXRoLiIKKyAgKHNob3VsZAorICAgKG9yZy10ZXN0LXdpdGgtdGVtcC10ZXh0LWluLWZp bGUKKyAgICAgICAiKiBJbm5lcgorIytuYW1lOiBpbm5lcgorIytiZWdpbl9zcmMgZW1hY3MtbGlz cAorMgorIytlbmRfc3JjCisKKyogTWFpbgorIytoZWFkZXI6IDp0YW5nbGUgXCJ0ZXN0LW9iLXRh bmdsZS5lbFwiIDpjb21tZW50cyBub3dlYiA6bm93ZWIgeWVzCisjK2JlZ2luX3NyYyBlbWFjcy1s aXNwCisxCis8PGlubmVyPj4KKyMrZW5kX3NyYyIKKyAgICAgKHVud2luZC1wcm90ZWN0CisJIChs ZXQgKChvcmctYmFiZWwtdGFuZ2xlLXVzZS1yZWxhdGl2ZS1maWxlLWxpbmtzIG5pbCkpCisJICAg KG9yZy1iYWJlbC10YW5nbGUpCisJICAgKHdpdGgtdGVtcC1idWZmZXIKKwkgICAgIChpbnNlcnQt ZmlsZS1jb250ZW50cyAidGVzdC1vYi10YW5nbGUuZWwiKQorCSAgICAgKGJ1ZmZlci1zdHJpbmcp CisJICAgICAoZ290by1jaGFyIChwb2ludC1taW4pKQorICAgICAgICAgICAgIChhbmQKKyAgICAg ICAgICAgICAgKHNlYXJjaC1mb3J3YXJkIChjb25jYXQgIjs7IFtbZmlsZToiIGZpbGUgIjo6aW5u ZXIiKSBuaWwgdCkKKyAgICAgICAgICAgICAgKHNlYXJjaC1mb3J3YXJkICI7OyBpbm5lciBlbmRz IGhlcmUiIG5pbCB0KSkpKQorICAgICAgIChkZWxldGUtZmlsZSAidGVzdC1vYi10YW5nbGUuZWwi KSkpKSkKKwogKGVydC1kZWZ0ZXN0IG9iLXRhbmdsZS9qdW1wLXRvLW9yZyAoKQogICAiVGVzdCBg b3JnLWJhYmVsLXRhbmdsZS1qdW1wLXRvLW9yZycgc3BlY2lmaWNhdGlvbnMuIgogICA7OyBTdGFu ZGFyZCB0ZXN0LgotLSAKMi4zNi4xCgo= --b1_HImMluUwxvffIV8wiG0vIjdaoGAwWvflW0UYvSRdx4--