From patchwork Wed Apr 15 15:18:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Maja_K=C4=85dzio=C5=82ka?= X-Patchwork-Id: 21267 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 7DAC127BBE4; Wed, 15 Apr 2020 16:19:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 4001727BBE1 for ; Wed, 15 Apr 2020 16:19:11 +0100 (BST) Received: from localhost ([::1]:51586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOjok-0002T7-O3 for patchwork@mira.cbaines.net; Wed, 15 Apr 2020 11:19:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54573) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOjod-0002Si-Ay for guix-patches@gnu.org; Wed, 15 Apr 2020 11:19:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOjoc-0000x0-4u for guix-patches@gnu.org; Wed, 15 Apr 2020 11:19:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53622) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOjoc-0000ww-2K for guix-patches@gnu.org; Wed, 15 Apr 2020 11:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jOjob-0001e7-Tu for guix-patches@gnu.org; Wed, 15 Apr 2020 11:19:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40643] [PATCH] git-version: Handle invalid arguments gracefully Resent-From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Apr 2020 15:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40643 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40643@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15869639246301 (code B ref -1); Wed, 15 Apr 2020 15:19:01 +0000 Received: (at submit) by debbugs.gnu.org; 15 Apr 2020 15:18:44 +0000 Received: from localhost ([127.0.0.1]:36935 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jOjoJ-0001dZ-Jz for submit@debbugs.gnu.org; Wed, 15 Apr 2020 11:18:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:57140) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jOjoI-0001dR-16 for submit@debbugs.gnu.org; Wed, 15 Apr 2020 11:18:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54536) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOjoG-0002OE-NF for guix-patches@gnu.org; Wed, 15 Apr 2020 11:18:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOjoF-0000pQ-0s for guix-patches@gnu.org; Wed, 15 Apr 2020 11:18:40 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:36144) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1jOjoE-0000nY-Nr for guix-patches@gnu.org; Wed, 15 Apr 2020 11:18:38 -0400 Received: (qmail 1219 invoked by uid 1009); 15 Apr 2020 17:18:29 +0200 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25782. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.022798 secs); 15 Apr 2020 15:18:29 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 15 Apr 2020 17:18:29 +0200 From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Date: Wed, 15 Apr 2020 17:18:23 +0200 Message-Id: <20200415151824.22988-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x 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/git-download.scm (git-version): Add a check for commit ID length. --- If you're curious for the motivation, see [1]. This took a while to debug, so I'm hoping to ease this for the next person who inevitably stumbles upon this. Is a change like this okay? [1]: http://logs.guix.gnu.org/guix/2020-04-14.log#162809 guix/git-download.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/guix/git-download.scm b/guix/git-download.scm index 1eae035fc4..40d81c72b9 100644 --- a/guix/git-download.scm +++ b/guix/git-download.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2017 Mathieu Lirzin ;;; Copyright © 2017 Christopher Baines +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +31,7 @@ #:use-module (ice-9 match) #:use-module (ice-9 vlist) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-35) #:export (git-reference git-reference? git-reference-url @@ -170,6 +172,13 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." (define (git-version version revision commit) "Return the version string for packages using git-download." + ;; git-version is almost exclusively executed while modules are being loaded. + ;; This makes any errors hide their backtrace. Avoid the mysterious error + ;; "Value out of range 0 to N: 7" when the commit ID is too short, which + ;; can happen, for example, when the user swapped the revision and commit + ;; arguments by mistake. + (when (< (string-length commit) 7) + (error "git-version: commit ID unexpectedly short")) (string-append version "-" revision "." (string-take commit 7))) (define (git-file-name name version)