From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0P4mGS9AMmGyRgEAgWs5BA (envelope-from ) for ; Fri, 03 Sep 2021 17:33:03 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 6GrZFC9AMmHcBAAAbx9fmQ (envelope-from ) for ; Fri, 03 Sep 2021 15:33:03 +0000 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 BFDA9244E9 for ; Fri, 3 Sep 2021 17:33:02 +0200 (CEST) Received: from localhost ([::1]:55366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMBBd-0006Si-Pt for larch@yhetil.org; Fri, 03 Sep 2021 11:33:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51192) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMBAi-0005AK-1f for guix-patches@gnu.org; Fri, 03 Sep 2021 11:32:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34223) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mMBAg-0005AI-KJ for guix-patches@gnu.org; Fri, 03 Sep 2021 11:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mMBAg-0007V7-Hq for guix-patches@gnu.org; Fri, 03 Sep 2021 11:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50358] [PATCH core-updates-frozen 1/8] guix: packages: Fix repacking of plain tarballs. References: <20210903152903.22385-1-maxim.cournoyer@gmail.com> In-Reply-To: <20210903152903.22385-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Sep 2021 15:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50358 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50358@debbugs.gnu.org Cc: Mathieu Othacehe , Maxim Cournoyer Received: via spool by 50358-submit@debbugs.gnu.org id=B50358.163068310628751 (code B ref 50358); Fri, 03 Sep 2021 15:32:02 +0000 Received: (at 50358) by debbugs.gnu.org; 3 Sep 2021 15:31:46 +0000 Received: from localhost ([127.0.0.1]:45755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMBAP-0007Tf-Rh for submit@debbugs.gnu.org; Fri, 03 Sep 2021 11:31:46 -0400 Received: from mail-qk1-f181.google.com ([209.85.222.181]:42810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMBAM-0007TQ-SB for 50358@debbugs.gnu.org; Fri, 03 Sep 2021 11:31:44 -0400 Received: by mail-qk1-f181.google.com with SMTP id t4so6149537qkb.9 for <50358@debbugs.gnu.org>; Fri, 03 Sep 2021 08:31:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JwshbKnU1r/1gJ92SRWg+KbQEjGErmLMThAeWi/O1oM=; b=fvdZifRpMqRmRXkssyl5M69yMLh4liqOq7O6/6s4PIH8vc3J1fDRc++xF5ipsdiFbn 9y5vXJ/TZmmQTAc+3LCqsinFSdurrVf97lT2/6iidulBX+wZ0az4QSK6ivZahIlsYu8F +9XIsM5+VZrHuUU73fadOGEEjyIp9yjwQzQ3/9A3PWvQA+/TZlO42fsuZb5IP3iVZaal TOxersPrcqvAb6kyLtgA6xuwosuapKs26I/qSgyby8q2s/piwO7n2jr93sEMRs+QXGe3 ioJzdeGmHYSJHqzz5hJ9Ifg592h1lLJn8s22XECiwgdJVp3lQPmUPqjr+ChRIWszWn/4 30AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JwshbKnU1r/1gJ92SRWg+KbQEjGErmLMThAeWi/O1oM=; b=FQVg2QctdYtl+QSOYsmQMOVTgjZpyP6cUOoSire0iy9SBnpOrarS7FHJe9Tqxw8xLq RGnHkXW8NfGYpwUK5+ycOq4BYygXKPYFxFyl+RRMHPbRarXozwLvb3p7Q24k6DmZqKfR SdTQRiJp2jzrSwPORyYyn/Ubym5oVFXqJWHxk9NtiGr2DGTj0F36UbPwD8zdJZOlcGL0 mt2U5GCM2iIRuSmVqsWxStK8JnEPE1hFYroqAie98iAprD8D99s7CZL3qUmwOXyC2O4s bT49ne8TU/b0rFGmCqopmPGod7r8OWLImiZdqtwQ3ivcpGf8oi0BGTZa9N5MbXVKVTmf DzHg== X-Gm-Message-State: AOAM5300vTqntpjPayXByThRmLHHw/itwQInwQM656f1rh2il7DMVD+D J6IrFq9CYXRJh6nw3hCdi1siZ6ndiBE= X-Google-Smtp-Source: ABdhPJw7+/pLYGjKA9VJFdYhCyfR20ITDEHVZ71z1TtCBFXjNYT80XNnBygPaveuhhKq969XxRM5rg== X-Received: by 2002:a05:620a:191d:: with SMTP id bj29mr3979687qkb.362.1630683097064; Fri, 03 Sep 2021 08:31:37 -0700 (PDT) Received: from localhost.localdomain ([207.35.94.150]) by smtp.gmail.com with ESMTPSA id b25sm3973128qka.23.2021.09.03.08.31.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 08:31:36 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 3 Sep 2021 11:31:09 -0400 Message-Id: <20210903153116.22517-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1630683182; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=JwshbKnU1r/1gJ92SRWg+KbQEjGErmLMThAeWi/O1oM=; b=V31CaYU97CyElzaEaMJc5SwKSxWJ7Ima9FAArlv3AMXvymi7Dn6aex/qCe6LwLjik98HAK cKcHEE/tpghn8BmnsHI8oxWResAsDVPqqDB0yADuRBcjJjA8uTEzqhAMZgaKdaACje0g94 j8yn93DtZn73gIlE7l1eE42rvn1hmMLrdqchFPxT/uMBliih9SfRbyjMGJc1/RQ6bQV/+E yWJRzdqgD4Ljr849fBhxUx3jH5xWdmDxIui5mHgGUUjoOyDk8Vmp0ExCn9CSVnLbL0Xqv8 /hhZjPCmBoK41vnsGTYcrHHiiY/5ZP0zvKLnWPztvBuZKVIvRqMxQjvJgC3WcA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1630683182; a=rsa-sha256; cv=none; b=ibOmVRjTxwRFJFUeKIWhAwQCUrMDJRZ7/i9ZL3VIy61EgdSguPc2jkswU2nCjyrFzz0hI+ 1n2U8cfmssOS+tjpEqALm/RbDF5pwZ+XPnpfr27Xwvby++lMMymP/5gudb86l+E1mwh8+M um1EbPpUONbWYBCYiSa0wK1MzCxBGG/830MqRL/0wPxlWkZZmSjdhYG/nguwIlmGYZ645/ 9w8b1rAzDsbS3osUjEtOM10FPGLJx4UhtgVhSi3pZK4ViXKUT6JdqqZILeXie1oe1v7Qv3 7v/l4P7brqA74CM6mtOF8SJgmVkS9P48crzRff8+1o3NVJ2iEC98EnU0oP/HOg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=fvdZifRp; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 2.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=fvdZifRp; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: BFDA9244E9 X-Spam-Score: 2.68 X-Migadu-Scanner: scn1.migadu.com X-TUID: venXUPZknF8M Fixes . * guix/packages.scm (patch-and-repack): Test for a tarball using tarball? and move the plain file copy to the else clause. Reported-by: Mathieu Othacehe --- guix/packages.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index 2349bb4340..f0dd1d43d2 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -836,10 +836,10 @@ specifies modules in scope when evaluating SNIPPET." ((file-is-directory? #+source) (copy-recursively directory #$output #:log (%make-void-port "w"))) - ((not #+comp) - (copy-file file #$output)) - (else - (repack directory #$output))))))) + ((or #+comp (tarball? #+source)) + (repack directory #$output)) + (else ;single uncompressed file + (copy-file file #$output))))))) (let ((name (if (or (checkout? original-file-name) (not (compressor original-file-name))) -- 2.33.0