From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37933)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1dAJIx-0006vz-Qq
	for guix-patches@gnu.org; Mon, 15 May 2017 12:57:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1dAJIs-0007ra-V3
	for guix-patches@gnu.org; Mon, 15 May 2017 12:57:07 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:44134)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1dAJIs-0007rR-Qr
	for guix-patches@gnu.org; Mon, 15 May 2017 12:57:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1dAJIs-0002x5-HA
	for guix-patches@gnu.org; Mon, 15 May 2017 12:57:02 -0400
Subject: bug#26924: [PATCH 05/12] gnu: calibre: Unbundle python2-markdown
Resent-Message-ID: <handler.26924.B26924.149486739611312@debbugs.gnu.org>
From: Marius Bakke <mbakke@fastmail.com>
In-Reply-To: <c254e0e1-b1d0-5fb7-eab7-c8bc88bb2b72@openmailbox.org>
References: <a474bf3a-2be1-5d4a-28d8-0ef3267e29ce@openmailbox.org>
	<c254e0e1-b1d0-5fb7-eab7-c8bc88bb2b72@openmailbox.org>
Date: Mon, 15 May 2017 18:56:31 +0200
Message-ID: <8760h2f48w.fsf@fastmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
	micalg=pgp-sha512; protocol="application/pgp-signature"
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Brendan Tildesley <brendan.tildesley@openmailbox.org>, 26924@debbugs.gnu.org

--=-=-=
Content-Type: text/plain

Brendan Tildesley <brendan.tildesley@openmailbox.org> writes:

> From 9202987ba9aed6e7c503aca877110e0e27e3dbc0 Mon Sep 17 00:00:00 2001
> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
> Date: Sat, 13 May 2017 23:24:06 +1000
> Subject: [PATCH 05/12] gnu: calibre: Unbundle python2-markdown
>
> * gnu/packages/ebook.scm (calibre):
> [snippet]: Replace python references to bundled markdown with packaged. Remove
> markdown from source.
> [inputs]: Add python2-markdown as a dependency.

Nice!

> @@ -78,8 +78,11 @@
>          (modules '((guix build utils)))
>          (snippet
>            '(begin
> +            (delete-file-recursively "src/calibre/ebooks/markdown")
>              (delete-file-recursively "src/unrar")
> -            (delete-file "src/odf/thumbnail.py")))
> +            (delete-file "src/odf/thumbnail.py")
> +            (substitute* (find-files "." "\\.py")
> +              (("calibre\\.ebooks\\.markdown") "markdown"))))

Can you add a #t after this substitution, since its return value is
unspecified?

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkZ3b8ACgkQoqBt8qM6
VPp/qggAnSBy1mYvwPwmqheM22Ns7o7cGHntYCfsIc7rWwhJHrIxnW4/H+Bb2tFb
kAe4rMy0ISZNqHFMD8dMjeTucDvDk7FzuWeYzR5xzHPQzeVvatmeng+V24iimHVb
YfigPIBooYZGwHwVYhfZlUOzpuVXFXwKDy2IjeWtMMQVDFV8amh+fJ3FKzRkTODC
idQ5sGcqpWzcjP0QEjqdvoWiXe67R9TKfnOU9vPOGMZvN1ccQQyKb4h/nc7UTs36
Rs62dRwm6wq37JtJM6oUia6cluu8hqPADxX/GL6R9pUuDsrK7re3svrgyyisIWwz
N3uky+J8R+ECROFne2wrPVyDGCvPNg==
=3tu5
-----END PGP SIGNATURE-----
--=-=-=--