From patchwork Fri Jan 17 18:14:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 19858 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 2989D17865; Fri, 17 Jan 2020 18:15:15 +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,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED 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 6AF841785F for ; Fri, 17 Jan 2020 18:15:11 +0000 (GMT) Received: from localhost ([::1]:33158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isW9G-0000lO-Fb for patchwork@mira.cbaines.net; Fri, 17 Jan 2020 13:15:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60040) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isW99-0000lC-Lg for guix-patches@gnu.org; Fri, 17 Jan 2020 13:15:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isW98-0004dc-Eg for guix-patches@gnu.org; Fri, 17 Jan 2020 13:15:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34155) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1isW98-0004dY-B3 for guix-patches@gnu.org; Fri, 17 Jan 2020 13:15:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1isW98-0000Yl-7E for guix-patches@gnu.org; Fri, 17 Jan 2020 13:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38678] Command line option in addition to GUIX_PACKAGE_PATH - Reason? Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Jan 2020 18:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38678 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Pierre Neidhardt Cc: 38678@debbugs.gnu.org Received: via spool by 38678-submit@debbugs.gnu.org id=B38678.15792848732101 (code B ref 38678); Fri, 17 Jan 2020 18:15:02 +0000 Received: (at 38678) by debbugs.gnu.org; 17 Jan 2020 18:14:33 +0000 Received: from localhost ([127.0.0.1]:40128 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1isW8f-0000Xp-Gb for submit@debbugs.gnu.org; Fri, 17 Jan 2020 13:14:33 -0500 Received: from mail-qk1-f181.google.com ([209.85.222.181]:34108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1isW8d-0000Xc-W0 for 38678@debbugs.gnu.org; Fri, 17 Jan 2020 13:14:32 -0500 Received: by mail-qk1-f181.google.com with SMTP id j9so23601817qkk.1 for <38678@debbugs.gnu.org>; Fri, 17 Jan 2020 10:14:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=0Fo0SgDK1Tt7k3XdXtdHR2KUHQi6crjWM9NdRmcyHmI=; b=UIMcFpgiYjgr6teejvZgEte0Ejk8mO3MOUvqDLepDTzTDqJjygb6jiQUslyYuJnSly Mxbzo75nQW1Nx89VHHu6DA8gUrGZKF1jXn1hHU/CVBgdzqmNKKxH9rx+z78wihPrmp9i xnbzH3oDA1L2LmgId4sPFlXSMbdzVaC6y7DCD2ue/4fMmRwy6Z4aVzduOvUgSRl3czdd jhCaAYSfMDnfVnEVirzsyagppiAgP9B5xfEKanji1aPv0n0+OCCVgPoqEfLiEupOKZvZ UNkSTdEP+5/aXmCSD94XKEYF6uAayCwRYCeMWIfdXJkhNbT/LbIPTVt6uQxOG2EWvNW4 HdYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=0Fo0SgDK1Tt7k3XdXtdHR2KUHQi6crjWM9NdRmcyHmI=; b=BXjkH9G+CNKotuX8p/yVyOGcz/rhBIbcXU5gNhLeEX7ST6zDSUWzetOI4VsD0eyfv/ K2Mgzn5TPX5QT408emVYTea5zyVS2BXpzGuotyJ979xg4K1kqwoI57/krXrB9FQ6Ow7y +h7LBomNg0JyfeRHbZUncfjh/3gOv9YDbJkIxdnLfWGIv4tbt0H/GcZ4DGp2RI68ObRf 3Spy+cZ1KWvJRayFoTpI2rDqZmsjW/+BUAOA/DF4uR1jeMMMTXbJLOUJlE7PyJSFFrjL bqptqIbEH/UxMCWxgmqFrr+uw/WfiliiNkM5vpFeT2UckJsK24A2vgxnzAr2o0wTmqWW sMYA== X-Gm-Message-State: APjAAAW3cK9g1dRdZ3sRk2aCTgYwyC6aFapvgaWVi1sShoFCIY4kvVpR OeoyiQTyecj1cRUv6r9WDyDNFmuAE3OS+J8MABJ/Ihhz X-Google-Smtp-Source: APXvYqzZs81XTpRqjQ65GmxPQwhHt72QxfTaxMgZ0lBRCp/9qW5pQCURkkMWGcBJl/ajWy0BJcvmnw3C8YgqQPNTmO0= X-Received: by 2002:a05:620a:1592:: with SMTP id d18mr39754398qkk.80.1579284866426; Fri, 17 Jan 2020 10:14:26 -0800 (PST) MIME-Version: 1.0 References: <87pnglj2ka.fsf@ambrevar.xyz> <87sglgsiey.fsf@lassieur.org> <878sn8inru.fsf@ambrevar.xyz> <87o8w4mewg.fsf@gnu.org> <87tv5wfdrm.fsf@ambrevar.xyz> <87lfr8fd9u.fsf@ambrevar.xyz> <20191226213108.753f8ab7@scratchpost.org> <87blr3eao0.fsf@ambrevar.xyz> <87ftge13h5.fsf@ambrevar.xyz> <87y2u6yqat.fsf@ambrevar.xyz> In-Reply-To: <87y2u6yqat.fsf@ambrevar.xyz> From: zimoun Date: Fri, 17 Jan 2020 19:14:15 +0100 Message-ID: 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 What mess did you do Pierre? :-) Why are you the author of ee9a735bc8 [1]? Why there are lines modified in guix.texi 21f4fbdd84 [2] which are not in the original patch [3]? [1] https://git.savannah.gnu.org/cgit/guix.git/commit/?id=ee9a735bc8f544cf8eedc6c6a7e4ed2962663013 [2] https://git.savannah.gnu.org/cgit/guix.git/commit/?id=21f4fbdd8453e489fb89825c4226a0a0bda2bc17 [3] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=38678#65 Or why I have missed? Attached the change fix your early push of the 'refresh' patch. :-) Cheers, simon From 8dfcf205f023b609117f3da9007e830df406357b Mon Sep 17 00:00:00 2001 From: zimoun Date: Fri, 17 Jan 2020 18:30:00 +0100 Subject: [PATCH 1/1] refresh: Fix internal variable name. * guix/scripts/refresh.scm (%option): Fix internal variable name. --- guix/scripts/refresh.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm index bc8e906054..efada1df5a 100644 --- a/guix/scripts/refresh.scm +++ b/guix/scripts/refresh.scm @@ -120,16 +120,16 @@ ;; The short option -L is already used by --list-updaters, therefore ;; it needs to be removed from %standard-build-options. - (let ((%load-path-option (find (lambda (option) + (let ((load-path-option (find (lambda (option) (member "load-path" (option-names option))) %standard-build-options))) (option (filter (lambda (name) (not (equal? #\L name))) - (option-names %load-path-option)) - (option-required-arg? %load-path-option) - (option-optional-arg? %load-path-option) - (option-processor %load-path-option))) + (option-names load-path-option)) + (option-required-arg? load-path-option) + (option-optional-arg? load-path-option) + (option-processor load-path-option))) (option '(#\h "help") #f #f (lambda args -- 2.23.0