From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 IK0sOHob9GKIaAEAbAwnHQ (envelope-from ) for ; Wed, 10 Aug 2022 22:56:26 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id AOFAOHob9GLV4QAA9RJhRA (envelope-from ) for ; Wed, 10 Aug 2022 22:56:26 +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 82FDC128E5 for ; Wed, 10 Aug 2022 22:56:25 +0200 (CEST) Received: from localhost ([::1]:51314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLska-000735-9v for larch@yhetil.org; Wed, 10 Aug 2022 16:56:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLsjb-00072s-JQ for emacs-orgmode@gnu.org; Wed, 10 Aug 2022 16:55:26 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:33207) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLsjX-0002U3-T3 for emacs-orgmode@gnu.org; Wed, 10 Aug 2022 16:55:23 -0400 Date: Wed, 10 Aug 2022 20:54:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=0brg.net; s=protonmail3; t=1660164912; x=1660424112; bh=nl8M/hWVZa+NqWTn3D+71z7yadCkyRqcMJvEAA/OCVs=; 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=VOPqLvKaIMMeNVxltqEflLNtv0WV4Dw1dKK1t9VlkTOsuZ/OocBn1qEdcRLMxekef FDRTWLsaqprLegw4l1mRKxeBvMWl8dWKGtA36Z7m0VBuEMZ4S1K7cNnFGQZLmka/Vw yfjj8liYWgKYNxlloClLkj26V7GXDxIKQNxQ/6a/q/5Dh9/pARGuvkWeZYk4mj/30n 8XfAoIue1bt0mjFpG7OodtFTAzXNzrZJ2n3XqPpdxE/aZ0DgY5AH8myKx2MP+q46yB T6gejxNntgBTG54ToIKG7Jz1wYaAW/g1Db3HX0W55nZEx1du5L8+a0dTnyARPKaN2C uh6bGRK2CPv+A== 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: References: <01070182484e44f3-f0fd271a-def3-4c86-961f-9a4bb63949d5-000000@eu-central-1.amazonses.com> <87wnbvtcz9.fsf@localhost> Feedback-ID: 10755604:user:proton MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_QfyGPPZep9WjdyrbgCmRZ7HqLTRPTluayEVAHmaPW3U" Received-SPF: pass client-ip=185.70.43.17; envelope-from=hraban@0brg.net; helo=mail-4317.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, RCVD_IN_MSPIKE_H2=-0.001, 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=1660164985; 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=nl8M/hWVZa+NqWTn3D+71z7yadCkyRqcMJvEAA/OCVs=; b=KM5iaEVDaa7rtlZ/z1tr4L9R6lSa5yZtsDYek+yODtGPjpXp0/R53fL+O0w4QmVAmWlRMl NwBPCV9fKn6Tc/kiDi+fRlGiZ5r3zh7BhM+xHzCBJT/RPlLCWmua8knmbanuubRS7CTbSd Mx2r3+EuKmnIAtHBNBGGx9KnHJDuA+COP5JEmiuzBn8PYwz82isFY+9Io50wDuDFsBxvTi ZRHluVfR4hlVsGIb5Au/4sDkpot7KnzgHf8BFC4LgbeSwMKRwqEcKLrcuSOm2X5uiOc4ZX hYlcGz4RBh1L4yGRAf7PCV5cXJq939Lpe/zbnKa8IQ0noTAltPyMksxTpfwzxA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1660164985; a=rsa-sha256; cv=none; b=uMXktAPMcsa09IM5+AxjYw7yFCAIQ+xebRnbfBIjoHeA0WoG+GHSssP2gImfh5i4WBNWz4 t/psum/riYZgKS3R8kZyUi2FP1Lje5UnlkGS8ALQZFxybn55LMgtxcAMMQhL79PeTjx/OA ADZut9mO+U30xeBicmgt0w7VSY8BzTxEmN/ULHM7hV+goaHDb4lodmMNkaWkYb+xHhqxhU eiyWL2Sz0p9fgn0HonRQwC0+znN5QsyHOuAKYsQGasIysPUU4yn0DOssZWIUzE31JkuU25 O30BwpzmB482xOFUWsHTmIT2rSG05Izy01g9tD+UEwdQeQrBXa4lzuADRMWlrQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=0brg.net header.s=protonmail3 header.b=VOPqLvKa; 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: -2.28 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=0brg.net header.s=protonmail3 header.b=VOPqLvKa; 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: 82FDC128E5 X-Spam-Score: -2.28 X-Migadu-Scanner: scn0.migadu.com X-TUID: JYSHbi+1ciOm This is a multi-part message in MIME format. --b1_QfyGPPZep9WjdyrbgCmRZ7HqLTRPTluayEVAHmaPW3U Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 8/3/22 11:55 AM, Max Nikulin wrote: >> + (when bare >> + (if (and org-babel-tangle-use-relative-file-links >> + (string-match org-link-types-re bare) >> + (string=3D (match-string 1 bare) "file")) >> + (concat "file:" >> + (file-relative-name (substring bare (match-end 0)) >> + (file-name-directory >> + (cdr (assq :tangle params))))) > > 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. >> + bare))))) > > I have not read the patch care carefully, so I may miss something. It > seems that (when bare (if (and other...) (action) bare)) may be > simplified to > > (and bare other... (action)) > > Do you mean to rewrite (when bare (if x y bare)) to this? (and bare x y) If that's what you meant, I think it would evaluate differently if bare =3D truthy and x =3D falsy, right? Form 1 evaluates to `bare', form 2 evaluates to x (i.e. NIL). Or did I misunderstand the suggestion? @Ihor: I have rebased the patch and attached it. --b1_QfyGPPZep9WjdyrbgCmRZ7HqLTRPTluayEVAHmaPW3U 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 RnJvbSA3Nzg1NThhNWIwZDM4ZWU3OWQ0N2IwMDY4ZjY4Yzc2MTMyNmU1ZTYxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIcmFiYW4gTHV5YXQgPGhyYWJhbkAwYnJnLm5ldD4KRGF0ZTog VGh1LCAyOCBKdWwgMjAyMiAyMjozMjowOCAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdID0/VVRGLTg/ cT9vYi10YW5nbGUuZWw6PTIwZml4PTIwPUUyPTgwPTk4OmNvbW1lbnRzPTIwbm93ZT89CiA9P1VU Ri04P3E/Yj1FMj04MD05OT0yMGRvdWJsZT0yMGxpbmtpbmc/PQpNSU1FLVZlcnNpb246IDEuMApD b250ZW50LVR5cGU6IHRleHQvcGxhaW47IGNoYXJzZXQ9VVRGLTgKQ29udGVudC1UcmFuc2Zlci1F bmNvZGluZzogOGJpdAoKKiBsaXNwL29iLXRhbmdsZS5lbDogUmVmYWN0b3IgdGhlIGRvdWJsZSBp bXBsZW1lbnRhdGlvbiB0byBhIHNpbmdsZQpoZWxwZXIgZnVuY3Rpb24uICBUaGlzIGF2b2lkcyB0 aGUgZG91YmxlIGxpbmsgd3JhcHBpbmcuCgoqIHRlc3RpbmcvbGlzcC90ZXN0LW9iLXRhbmdsZS5l bDogQWRkIHVuaXQgdGVzdHMuCgpCYWJlbCB0YW5nbGUgYWxsb3dzIGluc2VydGluZyBjb21tZW50 cyBhdCB0aGUgdGFuZ2xlZCBzaXRlIHdoaWNoIGxpbmsKYmFjayB0byB0aGUgc291cmNlIGluIHRo ZSBvcmcgZmlsZS4gIFRoaXMgbGlua2luZyB3YXMgaW1wbGVtZW50ZWQKdHdpY2UsIHRvIGhhbmRs ZSBzZXBhcmF0ZSBjYXNlcywgYnV0IHdoZW4gdXNpbmcg4oCYOmNvbW1lbnRzIG5vd2Vi4oCZIGl0 CmVuZGVkIHVwIGdvaW5nIHRocm91Z2ggYm90aCBjb2RlcGF0aHMuICBUaGlzIHJlc3VsdGVkIGlu IGRvdWJseQp3cmFwcGVkIGxpbmtzLgoKQnkgcmVmYWN0b3JpbmcgYWxsIGxpbmsgZ2VuZXJhdGlv biBpbnRvIGEgc2luZ2xlIGZ1bmN0aW9uLCB0aGlzIGRvdWJsZQp3cmFwcGluZyBpcyBhdm9pZGVk LgoKRXhhbXBsZSBmaWxlLCAvdG1wL3Rlc3Qub3JnOgoKICAgICogSW5uZXIKICAgICMrbmFtZTog aW5uZXIKICAgICMrYmVnaW5fc3JjIGVtYWNzLWxpc3AKICAgIDIKICAgICMrZW5kX3NyYwoKICAg ICogTWFpbgogICAgIytoZWFkZXI6IDp0YW5nbGUgdGVzdC5lbCA6Y29tbWVudHMgbm93ZWIgOm5v d2ViIHllcwogICAgIytiZWdpbl9zcmMgZW1hY3MtbGlzcAogICAgMQogICAgPDxpbm5lcj4+CiAg ICAjK2VuZF9zcmMKCkJlZm9yZToKCiAgICA7OyBbW2ZpbGU6dGVzdC5vcmc6OipNYWluXVtNYWlu OjFdXQogICAgMQogICAgOzsgW1tbW2ZpbGU6L3RtcC90ZXN0Lm9yZzo6aW5uZXJdW2lubmVyXV1d W2lubmVyXV0KICAgIDIKICAgIDs7IGlubmVyIGVuZHMgaGVyZQogICAgOzsgTWFpbjoxIGVuZHMg aGVyZQoKQWZ0ZXI6CgogICAgOzsgW1tmaWxlOnRlc3Qub3JnOjoqTWFpbl1bTWFpbjoxXV0KICAg IDEKICAgIDs7IFtbZmlsZTp0ZXN0Lm9yZzo6aW5uZXJdW2lubmVyXV0KICAgIDIKICAgIDs7IGlu bmVyIGVuZHMgaGVyZQogICAgOzsgTWFpbjoxIGVuZHMgaGVyZQotLS0KIGxpc3Avb2ItdGFuZ2xl LmVsICAgICAgICAgICAgICB8IDU0ICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tCiB0 ZXN0aW5nL2xpc3AvdGVzdC1vYi10YW5nbGUuZWwgfCA1NiArKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDgzIGluc2VydGlvbnMoKyksIDI3IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3Avb2ItdGFuZ2xlLmVsIGIvbGlzcC9vYi10YW5nbGUu ZWwKaW5kZXggZmRiYTcyMjc4Li5mODVmMDdlNzAgMTAwNjQ0Ci0tLSBhL2xpc3Avb2ItdGFuZ2xl LmVsCisrKyBiL2xpc3Avb2ItdGFuZ2xlLmVsCkBAIC00NjksNiArNDY5LDI5IEBAIGNvZGUgYmxv Y2tzIGJ5IHRhcmdldCBmaWxlLiIKICAgICAobWFwY2FyIChsYW1iZGEgKGIpIChjb25zIChjYXIg YikgKG5yZXZlcnNlIChjZHIgYikpKSkKIAkgICAgKG5yZXZlcnNlIGJsb2NrcykpKSkKIAorKGRl ZnVuIG9yZy1iYWJlbC10YW5nbGUtLXVuYnJhY2tldGVkLWxpbmsgKHBhcmFtcykKKyAgIkdldCBh IHJhdyBsaW5rIHRvIHRoZSBzcmMgYmxvY2sgYXQgcG9pbnQsIHdpdGhvdXQgYnJhY2tldHMuCisK K1RoZSBQQVJBTVMgYXJlIHRoZSAzcmQgZWxlbWVudCBvZiB0aGUgaW5mbyBmb3IgdGhlIHNhbWUg c3JjIGJsb2NrLiIKKyAgKHNhdmUtbWF0Y2gtZGF0YQorICAgIChsZXQqICg7OyBUaGUgY3JlYXRl ZCBsaW5rIGlzIHRyYW5zaWVudC4gIFVzaW5nIElEIGlzIG5vdCBuZWNlc3NhcnksCisgICAgICAg ICAgIDs7IGJ1dCBjb3VsZCBoYXZlIHNpZGUtZWZmZWN0cyBpZiB1c2VkLiAgQW4gSUQgcHJvcGVy dHkgbWF5CisgICAgICAgICAgIDs7IGJlIGFkZGVkIHRvIGV4aXN0aW5nIGVudHJpZXMgdGh1cyBj cmVhdGluZyB1bmV4cGVjdGVkIGZpbGUKKyAgICAgICAgICAgOzsgbW9kaWZpY2F0aW9ucy4KKyAg ICAgICAgICAgKG9yZy1pZC1saW5rLXRvLW9yZy11c2UtaWQgbmlsKQorICAgICAgICAgICAobCAo b3JnLW5vLXByb3BlcnRpZXMgKG9yZy1zdG9yZS1saW5rIG5pbCkpKQorICAgICAgICAgICAoYmFy ZSAoYW5kIChzdHJpbmctbWF0Y2ggb3JnLWxpbmstYnJhY2tldC1yZSBsKQorICAgICAgICAgICAg ICAgICAgICAgIChtYXRjaC1zdHJpbmcgMSBsKSkpKQorICAgICAgKHdoZW4gYmFyZQorICAgICAg ICAoaWYgKGFuZCBvcmctYmFiZWwtdGFuZ2xlLXVzZS1yZWxhdGl2ZS1maWxlLWxpbmtzCisgICAg ICAgICAgICAgICAgIChzdHJpbmctbWF0Y2ggb3JnLWxpbmstdHlwZXMtcmUgYmFyZSkKKyAgICAg ICAgICAgICAgICAgKHN0cmluZz0gKG1hdGNoLXN0cmluZyAxIGJhcmUpICJmaWxlIikpCisgICAg ICAgICAgICAoY29uY2F0ICJmaWxlOiIKKyAgICAgICAgICAgICAgICAgICAgKGZpbGUtcmVsYXRp dmUtbmFtZSAoc3Vic3RyaW5nIGJhcmUgKG1hdGNoLWVuZCAwKSkKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAoZmlsZS1uYW1lLWRpcmVjdG9yeQorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoY2RyIChhc3NxIDp0YW5nbGUgcGFyYW1zKSkp KSkKKyAgICAgICAgICBiYXJlKSkpKSkKKwogKGRlZnVuIG9yZy1iYWJlbC10YW5nbGUtc2luZ2xl LWJsb2NrIChibG9jay1jb3VudGVyICZvcHRpb25hbCBvbmx5LXRoaXMtYmxvY2spCiAgICJDb2xs ZWN0IHRoZSB0YW5nbGVkIHNvdXJjZSBmb3IgY3VycmVudCBibG9jay4KIFJldHVybiB0aGUgbGlz dCBvZiBibG9jayBhdHRyaWJ1dGVzIG5lZWRlZCBieQpAQCAtNDg1LDE2ICs1MDgsNyBAQCBub24t bmlsLCByZXR1cm4gdGhlIGZ1bGwgYXNzb2NpYXRpb24gbGlzdCB0byBiZSB1c2VkIGJ5CiAJIChl eHRyYSAobnRoIDMgaW5mbykpCiAgICAgICAgICAoY29kZXJlZiAobnRoIDYgaW5mbykpCiAJIChj cmVmLXJlZ2V4cCAob3JnLXNyYy1jb2RlcmVmLXJlZ2V4cCBjb2RlcmVmKSkKLQkgKGxpbmsgKGxl dCogKAotICAgICAgICAgICAgICAgICAgICAgIDs7IFRoZSBjcmVhdGVkIGxpbmsgaXMgdHJhbnNp ZW50LiAgVXNpbmcgSUQgaXMKLSAgICAgICAgICAgICAgICAgICAgICA7OyBub3QgbmVjZXNzYXJ5 LCBidXQgY291bGQgaGF2ZSBzaWRlLWVmZmVjdHMgaWYKLSAgICAgICAgICAgICAgICAgICAgICA7 OyB1c2VkLiAgQW4gSUQgcHJvcGVydHkgbWF5IGJlIGFkZGVkIHRvCi0gICAgICAgICAgICAgICAg ICAgICAgOzsgZXhpc3RpbmcgZW50cmllcyB0aHVzIGNyZWF0aW4gdW5leHBlY3RlZCBmaWxlCi0g ICAgICAgICAgICAgICAgICAgICAgOzsgbW9kaWZpY2F0aW9ucy4KLSAgICAgICAgICAgICAgICAg ICAgICAob3JnLWlkLWxpbmstdG8tb3JnLXVzZS1pZCBuaWwpCi0gICAgICAgICAgICAgICAgICAg ICAgKGwgKG9yZy1uby1wcm9wZXJ0aWVzIChvcmctc3RvcmUtbGluayBuaWwpKSkpCi0gICAgICAg ICAgICAgICAgIChhbmQgKHN0cmluZy1tYXRjaCBvcmctbGluay1icmFja2V0LXJlIGwpCi0gICAg ICAgICAgICAgICAgICAgICAgKG1hdGNoLXN0cmluZyAxIGwpKSkpCisJIChsaW5rIChvcmctYmFi ZWwtdGFuZ2xlLS11bmJyYWNrZXRlZC1saW5rIHBhcmFtcykpCiAJIChzb3VyY2UtbmFtZQogCSAg KG9yIChudGggNCBpbmZvKQogCSAgICAgIChmb3JtYXQgIiVzOiVkIgpAQCAtNTQ4LDE1ICs1NjIs NyBAQCBub24tbmlsLCByZXR1cm4gdGhlIGZ1bGwgYXNzb2NpYXRpb24gbGlzdCB0byBiZSB1c2Vk IGJ5CiAJCShpZiBvcmctYmFiZWwtdGFuZ2xlLXVzZS1yZWxhdGl2ZS1maWxlLWxpbmtzCiAJCSAg ICAoZmlsZS1yZWxhdGl2ZS1uYW1lIGZpbGUpCiAJCSAgZmlsZSkKLQkJKGlmIChhbmQgb3JnLWJh YmVsLXRhbmdsZS11c2UtcmVsYXRpdmUtZmlsZS1saW5rcwotCQkJIChzdHJpbmctbWF0Y2ggb3Jn LWxpbmstdHlwZXMtcmUgbGluaykKLQkJCSAoc3RyaW5nPSAobWF0Y2gtc3RyaW5nIDEgbGluaykg ImZpbGUiKQotICAgICAgICAgICAgICAgICAgICAgICAgIChzdHJpbmdwIHNyYy10ZmlsZSkpCi0J CSAgICAoY29uY2F0ICJmaWxlOiIKLQkJCSAgICAoZmlsZS1yZWxhdGl2ZS1uYW1lIChzdWJzdHJp bmcgbGluayAobWF0Y2gtZW5kIDApKQotCQkJCQkJKGZpbGUtbmFtZS1kaXJlY3RvcnkKLQkJCQkJ CSBzcmMtdGZpbGUpKSkKLQkJICBsaW5rKQorCQlsaW5rCiAJCXNvdXJjZS1uYW1lCiAJCXBhcmFt cwogCQkoaWYgb3JnLXNyYy1wcmVzZXJ2ZS1pbmRlbnRhdGlvbgpAQCAtNTc0LDE4ICs1ODAsMTIg QEAgbm9uLW5pbCwgcmV0dXJuIHRoZSBmdWxsIGFzc29jaWF0aW9uIGxpc3QgdG8gYmUgdXNlZCBi eQogSU5GTywgd2hlbiBub24gbmlsLCBpcyB0aGUgc291cmNlIGJsb2NrIGluZm9ybWF0aW9uLCBh cyByZXR1cm5lZAogYnkgYG9yZy1iYWJlbC1nZXQtc3JjLWJsb2NrLWluZm8nLiIKICAgKGxldCAo KGxpbmstZGF0YSAocGNhc2UgKG9yIGluZm8gKG9yZy1iYWJlbC1nZXQtc3JjLWJsb2NrLWluZm8g J2xpZ2h0KSkKLQkJICAgICAoYCgsXyAsXyAsXyAsXyAsbmFtZSAsc3RhcnQgLF8pCisJCSAgICAg KGAoLF8gLF8gLHBhcmFtcyAsXyAsbmFtZSAsc3RhcnQgLF8pCiAJCSAgICAgIGAoKCJzdGFydC1s aW5lIiAuICwob3JnLXdpdGgtcG9pbnQtYXQgc3RhcnQKIAkJCQkJICAgKG51bWJlci10by1zdHJp bmcKIAkJCQkJICAgIChsaW5lLW51bWJlci1hdC1wb3MpKSkpCiAJCQkoImZpbGUiIC4gLChidWZm ZXItZmlsZS1uYW1lKSkKLQkJCSgibGluayIgLiAsKGxldCAoOzsgVGhlIGNyZWF0ZWQgbGluayBp cyB0cmFuc2llbnQuICBVc2luZyBJRCBpcwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICA7OyBub3QgbmVjZXNzYXJ5LCBidXQgY291bGQgaGF2ZSBzaWRlLWVmZmVjdHMg aWYKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOzsgdXNlZC4gIEFu IElEIHByb3BlcnR5IG1heSBiZSBhZGRlZCB0bwotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICA7OyBleGlzdGluZyBlbnRyaWVzIHRodXMgY3JlYXRpbiB1bmV4cGVjdGVk IGZpbGUKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOzsgbW9kaWZp Y2F0aW9ucy4KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG9yZy1p ZC1saW5rLXRvLW9yZy11c2UtaWQgbmlsKSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAob3JnLW5vLXByb3BlcnRpZXMgKG9yZy1zdG9yZS1saW5rIG5pbCkpKSkKKwkJCSgi bGluayIgLiAsKG9yZy1iYWJlbC10YW5nbGUtLXVuYnJhY2tldGVkLWxpbmsgcGFyYW1zKSkKIAkJ CSgic291cmNlLW5hbWUiIC4gLG5hbWUpKSkpKSkKICAgICAobGlzdCAob3JnLWZpbGwtdGVtcGxh dGUgb3JnLWJhYmVsLXRhbmdsZS1jb21tZW50LWZvcm1hdC1iZWcgbGluay1kYXRhKQogCSAgKG9y Zy1maWxsLXRlbXBsYXRlIG9yZy1iYWJlbC10YW5nbGUtY29tbWVudC1mb3JtYXQtZW5kIGxpbmst ZGF0YSkpKSkKZGlmZiAtLWdpdCBhL3Rlc3RpbmcvbGlzcC90ZXN0LW9iLXRhbmdsZS5lbCBiL3Rl c3RpbmcvbGlzcC90ZXN0LW9iLXRhbmdsZS5lbAppbmRleCAyZWQ0YmEwZGEuLjYxOGUxMThlMCAx MDA2NDQKLS0tIGEvdGVzdGluZy9saXNwL3Rlc3Qtb2ItdGFuZ2xlLmVsCisrKyBiL3Rlc3Rpbmcv bGlzcC90ZXN0LW9iLXRhbmdsZS5lbApAQCAtMTU5LDYgKzE1OSw2MiBAQCBlY2hvIDEKIAkgICAg IChzZWFyY2gtZm9yd2FyZCAoY29uY2F0ICJbZmlsZToiIGZpbGUpIG5pbCB0KSkpCiAgICAgICAg KGRlbGV0ZS1maWxlICJ0ZXN0LW9iLXRhbmdsZS5lbCIpKSkpKQogCisoZXJ0LWRlZnRlc3Qgb2It dGFuZ2xlL2NvbW1lbnQtbm93ZWItcmVsYXRpdmUgKCkKKyAgIlRlc3QgOmNvbW1lbnRzIG5vd2Vi IHRhbmdsaW5nIHdpdGggcmVsYXRpdmUgZmlsZSBwYXRocy4iCisgIChzaG91bGQKKyAgIChvcmct dGVzdC13aXRoLXRlbXAtdGV4dC1pbi1maWxlCisgICAgICAgIiogSW5uZXIKKyMrbmFtZTogaW5u ZXIKKyMrYmVnaW5fc3JjIGVtYWNzLWxpc3AKKzIKKyMrZW5kX3NyYworCisqIE1haW4KKyMraGVh ZGVyOiA6dGFuZ2xlIFwidGVzdC1vYi10YW5nbGUuZWxcIiA6Y29tbWVudHMgbm93ZWIgOm5vd2Vi IHllcworIytiZWdpbl9zcmMgZW1hY3MtbGlzcAorMQorPDxpbm5lcj4+CisjK2VuZF9zcmMiCisg ICAgICh1bndpbmQtcHJvdGVjdAorCSAobGV0ICgob3JnLWJhYmVsLXRhbmdsZS11c2UtcmVsYXRp dmUtZmlsZS1saW5rcyB0KSkKKyAgICAgICAgICAgKG9yZy1iYWJlbC10YW5nbGUpCisgICAgICAg ICAgICh3aXRoLXRlbXAtYnVmZmVyCisgICAgICAgICAgICAgKGluc2VydC1maWxlLWNvbnRlbnRz ICJ0ZXN0LW9iLXRhbmdsZS5lbCIpCisgICAgICAgICAgICAgKGJ1ZmZlci1zdHJpbmcpCisgICAg ICAgICAgICAgKGdvdG8tY2hhciAocG9pbnQtbWluKSkKKyAgICAgICAgICAgICAoYW5kCisgICAg ICAgICAgICAgIChzZWFyY2gtZm9yd2FyZCAoY29uY2F0ICI7OyBbW2ZpbGU6IiAoZmlsZS1uYW1l LW5vbmRpcmVjdG9yeSBmaWxlKSAiOjppbm5lciIpIG5pbCB0KQorICAgICAgICAgICAgICAoc2Vh cmNoLWZvcndhcmQgIjs7IGlubmVyIGVuZHMgaGVyZSIgbmlsIHQpKSkpCisgICAgICAgKGRlbGV0 ZS1maWxlICJ0ZXN0LW9iLXRhbmdsZS5lbCIpKSkpKQorCisoZXJ0LWRlZnRlc3Qgb2ItdGFuZ2xl L2NvbW1lbnQtbm93ZWItYWJzb2x1dGUgKCkKKyAgIlRlc3QgOmNvbW1lbnRzIG5vd2ViIHRhbmds aW5nIHdpdGggYWJzb2x1dGUgZmlsZSBwYXRoLiIKKyAgKHNob3VsZAorICAgKG9yZy10ZXN0LXdp dGgtdGVtcC10ZXh0LWluLWZpbGUKKyAgICAgICAiKiBJbm5lcgorIytuYW1lOiBpbm5lcgorIyti ZWdpbl9zcmMgZW1hY3MtbGlzcAorMgorIytlbmRfc3JjCisKKyogTWFpbgorIytoZWFkZXI6IDp0 YW5nbGUgXCJ0ZXN0LW9iLXRhbmdsZS5lbFwiIDpjb21tZW50cyBub3dlYiA6bm93ZWIgeWVzCisj K2JlZ2luX3NyYyBlbWFjcy1saXNwCisxCis8PGlubmVyPj4KKyMrZW5kX3NyYyIKKyAgICAgKHVu d2luZC1wcm90ZWN0CisJIChsZXQgKChvcmctYmFiZWwtdGFuZ2xlLXVzZS1yZWxhdGl2ZS1maWxl LWxpbmtzIG5pbCkpCisJICAgKG9yZy1iYWJlbC10YW5nbGUpCisJICAgKHdpdGgtdGVtcC1idWZm ZXIKKwkgICAgIChpbnNlcnQtZmlsZS1jb250ZW50cyAidGVzdC1vYi10YW5nbGUuZWwiKQorCSAg ICAgKGJ1ZmZlci1zdHJpbmcpCisJICAgICAoZ290by1jaGFyIChwb2ludC1taW4pKQorICAgICAg ICAgICAgIChhbmQKKyAgICAgICAgICAgICAgKHNlYXJjaC1mb3J3YXJkIChjb25jYXQgIjs7IFtb ZmlsZToiIGZpbGUgIjo6aW5uZXIiKSBuaWwgdCkKKyAgICAgICAgICAgICAgKHNlYXJjaC1mb3J3 YXJkICI7OyBpbm5lciBlbmRzIGhlcmUiIG5pbCB0KSkpKQorICAgICAgIChkZWxldGUtZmlsZSAi dGVzdC1vYi10YW5nbGUuZWwiKSkpKSkKKwogKGVydC1kZWZ0ZXN0IG9iLXRhbmdsZS9qdW1wLXRv LW9yZyAoKQogICAiVGVzdCBgb3JnLWJhYmVsLXRhbmdsZS1qdW1wLXRvLW9yZycgc3BlY2lmaWNh dGlvbnMuIgogICA7OyBTdGFuZGFyZCB0ZXN0LgotLSAKMi4zNi4xCgo= --b1_QfyGPPZep9WjdyrbgCmRZ7HqLTRPTluayEVAHmaPW3U--