From patchwork Fri Feb 8 19:56:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 1000 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A073C16BDA; Fri, 8 Feb 2019 20:22:04 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5BC9516BD7 for ; Fri, 8 Feb 2019 20:22:04 +0000 (GMT) Received: from localhost ([127.0.0.1]:33600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gsCex-0005Rc-TG for patchwork@mira.cbaines.net; Fri, 08 Feb 2019 15:22:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gsCbd-0002Yh-7H for guix-patches@gnu.org; Fri, 08 Feb 2019 15:18:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gsCbb-0001Jl-1w for guix-patches@gnu.org; Fri, 08 Feb 2019 15:18:36 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40884) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gsCbN-00018q-Ar for guix-patches@gnu.org; Fri, 08 Feb 2019 15:18:25 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gsCGk-00075R-I3 for guix-patches@gnu.org; Fri, 08 Feb 2019 14:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34385] [PATCH v2 1/3] gnu: ruby-build-system: Change extract-gemspec to always return #t. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Feb 2019 19:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34385 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34385@debbugs.gnu.org Received: via spool by 34385-submit@debbugs.gnu.org id=B34385.154965580727204 (code B ref 34385); Fri, 08 Feb 2019 19:57:02 +0000 Received: (at 34385) by debbugs.gnu.org; 8 Feb 2019 19:56:47 +0000 Received: from localhost ([127.0.0.1]:40157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gsCGV-00074c-AR for submit@debbugs.gnu.org; Fri, 08 Feb 2019 14:56:47 -0500 Received: from li622-129.members.linode.com ([212.71.249.129]:39136 helo=mira.cbaines.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gsCGS-000747-HE for 34385@debbugs.gnu.org; Fri, 08 Feb 2019 14:56:45 -0500 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id D5B6B16BD7 for <34385@debbugs.gnu.org>; Fri, 8 Feb 2019 19:56:42 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 971bd1ad for <34385@debbugs.gnu.org>; Fri, 8 Feb 2019 19:56:42 +0000 (UTC) From: Christopher Baines Date: Fri, 8 Feb 2019 19:56:40 +0000 Message-Id: <20190208195642.4057-1-mail@cbaines.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <875ztur313.fsf@cbaines.net> References: <875ztur313.fsf@cbaines.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/build/ruby-build-system.scm (extract-gemspec): Return #t right at the end, rather than returning # when not handling a gem archive. --- guix/build/ruby-build-system.scm | 45 ++++++++++++++++---------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/guix/build/ruby-build-system.scm b/guix/build/ruby-build-system.scm index 3a658e2557..cdabd829e2 100644 --- a/guix/build/ruby-build-system.scm +++ b/guix/build/ruby-build-system.scm @@ -86,28 +86,29 @@ operation is not deterministic, we replace it with `find`." "Remove the original gemspec, if present, and replace it with a new one. This avoids issues with upstream gemspecs requiring tools such as git to generate the files list." - (when (gem-archive? source) - (let ((gemspec (or (false-if-exception (first-gemspec)) - ;; Make new gemspec if one wasn't shipped. - ".gemspec"))) - - (when (file-exists? gemspec) (delete-file gemspec)) - - ;; Extract gemspec from source gem. - (let ((pipe (open-pipe* OPEN_READ "gem" "spec" "--ruby" source))) - (dynamic-wind - (const #t) - (lambda () - (call-with-output-file gemspec - (lambda (out) - ;; 'gem spec' writes to stdout, but 'gem build' only reads - ;; gemspecs from a file, so we redirect the output to a file. - (while (not (eof-object? (peek-char pipe))) - (write-char (read-char pipe) out)))) - #t) - (lambda () - (close-pipe pipe))))) - #t)) + (if (gem-archive? source) + (let ((gemspec (or (false-if-exception (first-gemspec)) + ;; Make new gemspec if one wasn't shipped. + ".gemspec"))) + + (when (file-exists? gemspec) (delete-file gemspec)) + + ;; Extract gemspec from source gem. + (let ((pipe (open-pipe* OPEN_READ "gem" "spec" "--ruby" source))) + (dynamic-wind + (const #t) + (lambda () + (call-with-output-file gemspec + (lambda (out) + ;; 'gem spec' writes to stdout, but 'gem build' only reads + ;; gemspecs from a file, so we redirect the output to a file. + (while (not (eof-object? (peek-char pipe))) + (write-char (read-char pipe) out)))) + #t) + (lambda () + (close-pipe pipe))))) + (display "extract-gemspec: skipping as source is not a gem archive\n")) + #t) (define* (build #:key source #:allow-other-keys) "Build a new gem using the gemspec from the SOURCE gem."