From patchwork Thu Jan 30 12:24:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Fleischer X-Patchwork-Id: 1477 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 9B30E16BBA09E for ; Thu, 30 Jan 2020 12:25:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.3 (2019-12-06) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, LOCAL_FAKEBUSINESS=0.5,MAILING_LIST_MULTI=-1, RCVD_IN_DNSWL_NONE=-0.0001,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01 autolearn=ham autolearn_force=no version=3.4.3 X-Spam-BL-Results: [127.0.9.0] Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Thu, 30 Jan 2020 12:25:05 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 1109D1884C35D3; Thu, 30 Jan 2020 12:24:52 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: luna) by orion.archlinux.org (Postfix) with ESMTPSA id 6ABE31884C35C9; Thu, 30 Jan 2020 12:24:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1580387091; bh=TVfiIiQMiZJsxXhxE4AegpY6Epk3pUg6cvivTO5aWsQ=; h=From:To:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe; b=A3d0qlsr1uBQvJ0x9xN8wlk8gvHPIjtMtOjROSVRuyfes8BHG475Vp1uG/7vLdr7y 8zETD2jntyVhTOceOI+SVtl+NdhAqRM6abwuipajrYZolfIZjPsbyzH3xKUVj+SLZh USSNSDc3hjafarbLIfhR/9F8VerCEh0H8CFCO7QC7AVlKWB7CgSaEd5JbMkKjiAoJg 0iIjnVLwYeXkr0Lj8zX3B8zVi4jRvpYPKlb+zPN0FPMVZziKaafrMNRtdtmnJRav3v j4AOahFZ+juUiFngKvSUv07ZpwKQb1W4EVagZ65R0/y+ALSeqILu/NgtA1+huXGU5L C+MEDdNZTx7d25QpNYt9NidlyyNGo0bP9lVX8LDbQpTdSVCnfyDBw+xYX1pCxriOrI NN8vPi0ANg6XX9UosDjER1XAasLVHanEaaDWOMy68KGJjHNPy0zxan43rm+y9N/RT3 akenTMhp3xKXZcHGnxL2qz/8JisaIqweBvqVItiE9bqhc1esulSLobvcDYqXgtfmap YOsV+A6WtyOEFKI3xHiK9OlSU/bau+jDETmiHiWisKX5XG6Dy5jQAv8iq+DNEijaJS BhkncrrdHvA+Q3c2nCS7rHVV2+x6YT070GmFWQTtHlrn3VSmsOZSwYJJJGFFdI9ZTx uKxRz7ORghXDwEnh55XFXVFo= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 5B4742BE50; Thu, 30 Jan 2020 12:24:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1580387091; bh=TVfiIiQMiZJsxXhxE4AegpY6Epk3pUg6cvivTO5aWsQ=; h=From:To:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe; b=N7wY5JKedhYKaOWUU9rLDPlTmvl488qi76Y+xsaxBwyVL3DwgHdTuFjhf60VjWvlz O34FUGV0cVdFX3fXf/CQ9A4oHLyHQiiJAY0EnWHIOIVjneZ0uWtdAVWM5Tuvu89WSs 6ltEmGCpBqh2JtzXzkEK8Dpf8jfH4D6CXWoupK0QLBJrjP/VLOyDugKLQOkWeer6eO VsetmoOkEqi+G0iesDfEf7RyXknZHPysKfW0lQPbWlFjmLl17nqZe4bYCCdwybwuwp 2wp7PV5T4Sxx3GlD6vdeMiq+0JPjiWETx9DyiGyDs7PNNsZdnh4e6bHdFHr/OG0AL9 rvAcJ7Mfj/ZMdeFeXIm6uh/TcdJJ8gEeJOqPlYZWn2Yknzn4MjjP6RQLw5lJkgmOgM tKXgAMoTr6xMNtePohjbKgp2YN9BOFeb35UBnxlVJP0ZgEtK2F6IgTIusv1hXEzhoZ oguit9mIJeXaYDD+DF3O+w5M633PLFm8Osv7dw3NYCQ1Commbwogh6LyHCn2NdC11C F78RYgXsOtFzYP5UBIqxZODYaWDQRX5TDgNOsd5EZSWFxd/4cpU4PIou0q7yO1bVkD 6wk+36V1eGni32D4RKp3pqcy7xbRGLlL83ZHDdRdlrelqWNNh2phyWjhBFUGfXmrfd BS50dah/a/72Qhz1tir32Xlw= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 12C2E2BE4F for ; Thu, 30 Jan 2020 12:24:49 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by luna.archlinux.org (Postfix) with ESMTPS for ; Thu, 30 Jan 2020 12:24:49 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id CA7F31884C35AD for ; Thu, 30 Jan 2020 12:24:44 +0000 (UTC) Received: from localhost (unknown [IPv6:2a02:8070:24e4:b800:b66b:fcff:fe3e:6273]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: lfleischer) by orion.archlinux.org (Postfix) with ESMTPSA id A46C61884C35AC for ; Thu, 30 Jan 2020 12:24:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1580387084; bh=TVfiIiQMiZJsxXhxE4AegpY6Epk3pUg6cvivTO5aWsQ=; h=From:To:Subject:Date; b=HJjso0EN80zkRlrMYtlKgVTPcSSIQ3CQAN3gAXaxWgYDMMlT5ItKRpuo9/tkn+8QH UKMKHU/YwbJLLj6DDlvgRiUEyD0doNxX/ay26iDTP7dLa9E64cczZH5aKFhUP5wJlf 5cWvbu4tSSeHbbB63MPWzgb43j4HhM8QRny1CF/QkiQKcei97GYWeYGrsLwkkkuUhK R6lrrX6/ZS1W1qB+ZxBTZ+oayONE0kk1U2MSmWcwaATxMKsoJKCBczjweHx2mYCcqW 4yNdJGCQtq+4XWL00w11pVfi4a7+EmmcGRLF3MsJ1FnMTCLHTFBt7G7qVul76w8vjJ 2aZPj1qTSIDyMKXehszxKWGjtrpsntwTlWGFr6vhZJnGHD4FyEAep+Eoz9QbOH4MM2 nrn8y9j8Z84Fg8yW9HZ142dRR3dCrISBKEdZ4vPuIX3sDooSTeYwYPz0BecBq1Y3Md J7kvbwsdgyP5BTD08ExBGDX4WATVwSprUzsQdlQjkIn5oYZaJWlhoNiGGsf8qS6lDz IN+qxmYV36EuAD5nIUKkJMK1ymP4GV+OKpW8sYojJYvKQlg5dfnRyWEeBjJdkCiuKV HIVPe4280ktjdDeQysEiPgaQ1njK9t1D3wI2BYSLhsVvS5C90ySTtYEyGonnlMrIdh zWf9CBS0SNrAh08SitgLwsQE= From: Lukas Fleischer To: aur-dev@archlinux.org Subject: [PATCH 1/2] Keep signature delimiters intact in notifications Date: Thu, 30 Jan 2020 13:24:52 +0100 Message-Id: <20200130122453.28262-1-lfleischer@archlinux.org> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-BeenThere: aur-dev@archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Arch User Repository \(AUR\) Development" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: aur-dev-bounces@archlinux.org Sender: "aur-dev" Since commit eeaa1c3 (Separate text from footer in notification emails, 2020-01-04), information about unsubscribing from notifications is added in a signature block. However, the code to format the email body trimmed the RFC 3676 signature delimiter, replacing "-- " by "--". Fix this by adding a special case for signature delimiters. Signed-off-by: Lukas Fleischer --- aurweb/scripts/notify.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py index 6c3be22..f2767fd 100755 --- a/aurweb/scripts/notify.py +++ b/aurweb/scripts/notify.py @@ -54,6 +54,9 @@ class Notification: def get_body_fmt(self, lang): body = '' for line in self.get_body(lang).splitlines(): + if line == '-- ': + body += '-- \n' + continue body += textwrap.fill(line, break_long_words=False) + '\n' for i, ref in enumerate(self.get_refs()): body += '\n' + '[%d] %s' % (i + 1, ref) From patchwork Thu Jan 30 12:24:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Fleischer X-Patchwork-Id: 1476 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id E73E416BBA087 for ; Thu, 30 Jan 2020 12:24:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.3 (2019-12-06) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01 autolearn=ham autolearn_force=no version=3.4.3 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Thu, 30 Jan 2020 12:24:58 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id D271B1884C35B9; Thu, 30 Jan 2020 12:24:49 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: luna) by orion.archlinux.org (Postfix) with ESMTPSA id 60AFE1884C35B4; Thu, 30 Jan 2020 12:24:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1580387089; bh=ExUpbmVOPpBCI+vyWq1LwKOkxIramdlBb4gg8WJf+wI=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe; b=hKOnPVg9stZH+zm4gMxwqb2om+IL4LIWtx8XWzkl/QOEEme+i6azR6AP8vouo5tK7 gcGB4wDjvZpqJoftBFqOhkj+J8wkL/JV5pvoj9KkUW9qsJGxzUmT/fNyvwboYZ7JX1 AWGOd1iqApBk3RNXS6G4dD/EfhuHIAEtKajOCswug1LRbJZbD65MIZWcD4+ftymWBw GchohEX5xp6rZoOC7ywn1Ay478sUKVHLvLmvW/kG8qfUbcd0oiVdf+Lvi0ORxfVUZE 7O09XySoMjIc7FO+68PvsAmRa+82orWkpuJr0bk2pRXd0wnz0+jUlnyL9z31m2CxBf ocfmrC8gpOYYIJrF8HXS4DfXYCB7UfqqAMhPK1/PnWm4Hf4eW+PYY9TvZ98kRJs2r6 RqCwyA5ESaNrPif2T3op1A930sZmgkXulE/7qUpyyp96uUhY+x2BfF8qzdgZHz4tNf ZZCG+JcslMfH1E5q1h5pdEBDchAI450YJiSTpbl5Mc6/POcm+HVp+CwAj0+ncXcpOB fbxB0pcFaIIXIsbvzqn4KcJbssu5azFElYLsta3sSIPBAC0o/GdZu4ZYIdROyBKL3N FE5cE8/t7/h4b6bleWwhWSs4ID2C7Aarz5PYt+GsJudZL+HrWzSalSNokneqYAJOPg w7RYelOPDwDYxP2gfdq5iY1w= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 230192BE51; Thu, 30 Jan 2020 12:24:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1580387089; bh=ExUpbmVOPpBCI+vyWq1LwKOkxIramdlBb4gg8WJf+wI=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe; b=H3UfdDP9IiWDx4KFaQUACJQpx512p+djxyzwPIV5Z7EOJoTkkfbL6RSEM7rJpc33Y iMfX3IGgxdLJ3DcWMYSWFsRW6gSri+2jyHthgGYjvJhkbH44cH1R/6wjFNc2mvWEnH 3GbmTFk9xROyZieRsCMdWH2SXLfIsbXOhYzSC7bFXOxufjSoYHBZy4y17I/1lCpUoW Q91xaXHdMkkMW/uXRn7CFWr+fqmIAlxU8aQum4sMj5weR2I4jtZMeoaGWJBn8E8J4V iTfXxZj3B7ng5LUldDoWE2EzL+ZZzI9kHB82aq3Hu+BzJbICCBSQ7cS8fK2uvrmt6A rKol/4lQrIlbCFOtPvCOOo4GeZ6Vlfjqn7lLPILUyyiRELJ27hrJ1anxxIShMukYat wQOi2OaSk/mHqVLRUi9tR+Pl8Yox22a67+sYGu60OyCnPJbOazDVVrrAF5wSM0ZFMZ RgW4clooEsXs8UsSIDN38bVdPSLUd5Enww+GZ9qh99ZUjUhBzmyKUez8fBSX+784lj ZMS6DM8tXPYKpy8eBMDC289qtkn0pnUqkRbNtOYCqefPBg6WGniptWePW7cLGl6JSj a8i2UsxedExF3eRfX9ykWcQntPFyG8JxUVGpeJIhpe9jy3R6lf1jxOzpoc+vtf1QX+ IyUD6hoNYgUbh0YZ6pkiZIlQ= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id B063B2BE4F for ; Thu, 30 Jan 2020 12:24:46 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by luna.archlinux.org (Postfix) with ESMTPS for ; Thu, 30 Jan 2020 12:24:46 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 6306D1884C35AF for ; Thu, 30 Jan 2020 12:24:45 +0000 (UTC) Received: from localhost (unknown [IPv6:2a02:8070:24e4:b800:b66b:fcff:fe3e:6273]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: lfleischer) by orion.archlinux.org (Postfix) with ESMTPSA id 393731884C35AE for ; Thu, 30 Jan 2020 12:24:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1580387085; bh=ExUpbmVOPpBCI+vyWq1LwKOkxIramdlBb4gg8WJf+wI=; h=From:To:Subject:Date:In-Reply-To:References; b=bA3yqHkYNquHXHHnz4ef7Za7e4LK74ELT5/zlnefqIRGyyBDsPmy/ZnNfOluKWbDG NXCELjjkCgFIT9TJ919fOGy3154lD1bR0kgfoj0V3MovjC7V3588/hHPnGvy3+AvoL wPb+jOaUfmX/TZgqFF4VCLnj5K9tGh5yoXi9dn6igp43Detocj6xjTQb908nXE2E1l +AxyXEu/rUk012GSA8lGeffM9RjYdq4RQRfMvTCDcBlxjXR1sqqqz8yCPpblix4UD+ rdZN2S20T5bVy4hMDIrY1Zl5OLD31a37Vt3FsjBdtqea2rNeFwPj05uq9/GaCwwuWS ZLqpwTwEBx6UNpW19drPGVk3sksnOXtr3u3aOpFUORm2OBdPOeWn6H+VlQxiUv3Fl4 FJuAYRlMVSwUE0683XgYs1E1k0h8BPoSZ5y49tXi06b53OODm9Otc2t7FIXBkMDHoW QpS0u24+79KEXXps5+h+vkxdwHj+rk3g7wAwk/c7N1tdWW3jR5eui/ChD3WsWHXisK Bsq4foLwd6NnJ0Hf2WpYjDZ32YSLMBbsXAkBGnGbX5hrJAVfFDQXRUM8zx5XmbgTqG LKuk98Waujp08tjQtXuZfnVCp/M7sVLIlIhKyonckYa8HBQj7bHdyRiFHo34D6I3RL uq9V9hWzLG99DDj8vMA/tTZ0= From: Lukas Fleischer To: aur-dev@archlinux.org Subject: [PATCH 2/2] t2500: fix test cases Date: Thu, 30 Jan 2020 13:24:53 +0100 Message-Id: <20200130122453.28262-2-lfleischer@archlinux.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200130122453.28262-1-lfleischer@archlinux.org> References: <20200130122453.28262-1-lfleischer@archlinux.org> MIME-Version: 1.0 X-BeenThere: aur-dev@archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Arch User Repository \(AUR\) Development" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: aur-dev-bounces@archlinux.org Sender: "aur-dev" Since commit eeaa1c3 (Separate text from footer in notification emails, 2020-01-04), information about unsubscribing from notifications is added in a signature block. Fix the test cases accordingly. Signed-off-by: Lukas Fleischer --- test/t2500-notify.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/t2500-notify.sh b/test/t2500-notify.sh index 3080dc2..380e65b 100755 --- a/test/t2500-notify.sh +++ b/test/t2500-notify.sh @@ -101,6 +101,7 @@ test_expect_success 'Test subject and body of comment notifications.' ' This is a test comment. + -- If you no longer wish to receive notifications about this package, please go to the package page [2] and select "Disable notifications". @@ -126,6 +127,7 @@ test_expect_success 'Test subject and body of update notifications.' ' cat <<-EOD >expected && user [1] pushed a new commit to foobar [2]. + -- If you no longer wish to receive notifications about this package, please go to the package page [2] and select "Disable notifications". @@ -264,6 +266,7 @@ test_expect_success 'Test subject and body of merge notifications.' ' cat <<-EOD >expected && user [1] merged foobar [2] into foobar2 [3]. + -- If you no longer wish receive notifications about the new package, please go to [3] and click "Disable notifications".