From patchwork Tue Nov 27 18:02:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tim Gesthuizen X-Patchwork-Id: 333 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 3494116834; Tue, 27 Nov 2018 18:03:16 +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=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 4AE9316826 for ; Tue, 27 Nov 2018 18:03:15 +0000 (GMT) Received: from localhost ([::1]:43841 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gRhha-00080H-2K for patchwork@mira.cbaines.net; Tue, 27 Nov 2018 13:03:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gRhhU-000809-Fk for guix-patches@gnu.org; Tue, 27 Nov 2018 13:03:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gRhhQ-0004Qd-4o for guix-patches@gnu.org; Tue, 27 Nov 2018 13:03:08 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:48240) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gRhhQ-0004QX-1W for guix-patches@gnu.org; Tue, 27 Nov 2018 13:03:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gRhhO-0001fI-G7 for guix-patches@gnu.org; Tue, 27 Nov 2018 13:03:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33527] Wrong executable name in guix hashs version and help messages Resent-From: Tim Gesthuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Nov 2018 18:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33527 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 33527@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15433417516358 (code B ref -1); Tue, 27 Nov 2018 18:03:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Nov 2018 18:02:31 +0000 Received: from localhost ([127.0.0.1]:52498 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gRhgt-0001eU-DO for submit@debbugs.gnu.org; Tue, 27 Nov 2018 13:02:31 -0500 Received: from eggs.gnu.org ([208.118.235.92]:58293) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gRhgr-0001eJ-Jy for submit@debbugs.gnu.org; Tue, 27 Nov 2018 13:02:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gRhgl-0002ro-G6 for submit@debbugs.gnu.org; Tue, 27 Nov 2018 13:02:24 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:42730) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gRhgl-0002rj-CQ for submit@debbugs.gnu.org; Tue, 27 Nov 2018 13:02:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gRhgk-0006nc-Fm for guix-patches@gnu.org; Tue, 27 Nov 2018 13:02:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gRhgg-0002p0-BB for guix-patches@gnu.org; Tue, 27 Nov 2018 13:02:22 -0500 Received: from sonic310-13.consmr.mail.ir2.yahoo.com ([77.238.177.34]:34431) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gRhgg-0002nn-32 for guix-patches@gnu.org; Tue, 27 Nov 2018 13:02:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s2048; t=1543341734; bh=Kukvli4gCzQ9xYTsElwtSxjE0VdJ1wlci6Sr8kQcvOw=; h=To:From:Subject:Date:From:Subject; b=QOIWZxKelE1qbqmGWX0KZ3Nkj948xEG4H+X+l0cdxi8DizxnEJVMrDWjJiG4qACjArjRygtFVgeRTVn3XkOP6yt6eqBOQaoC2KnfjmnK+0HwOSiS8x7HhP4IegTtWxJZLjiLsfutv+MTeNr01NlueZrz839UjOXeXcfLdbzbjKGu9NUFjqzIoBR958Ad+ywGCVwZ6K/zKcN5wJRLFXbhJM1R0db9aQLPr2EVpewwJtB2vfl5j0e7ocEiVqTxW9fgzJTKlfHhMHQrAQs6im5IPRL+DPo2nir8jP+ab5IA+QCBtu4RgVMzsUMHkekqZLob2N3nkYDCu1O/ghrRA1N/Fg== X-YMail-OSG: WEIwrAMVM1mp2ODBdgSCVoAeTLBvjaRqtR32l_1y8gvmD2Vc9JwVXPxHfCwn0ZW .O_NYrvsVUBXtrJAgU5koO_48Ac8gu4fYpIGXyWEuSARWpApmeukAhrX0hJ_CsdWTNB_q3HWxtla fyIB9mo8x1p1bnpa8cnShvt645ZbRkpVMevYkjtDlJgPMSHrSsoEn8Zj_.jyggcWgRBZ0bKj2pZQ 6D8mnLNAXIdd4jlfLRAS94FxI2aRMs9.CqGo4pXCvV1vvpGfc6cOyJICaf7SSY7JWRgLllAXu4uR hGPu7RYpiXt_EgYKm5pDg7iJGYSSWGXUS7xGWfHHZjvbk2AlurpW0oIFEKDVRuG2KSORfW6hkHbb .lzcQB7SSqhzaMJ.r5cho1uF58crcWFIeQ9csBsQmX5_z064nS8o5RM54vgdtf7Bsv_vl7B93ltG p6UJar5ChY3kJSvARRX.bVT.sNX9mt6pDgyqAnzRqBJwKmMvQVVKlu4tUdPfI1MuWDMDLWSeky.g jWWdSwWrZzWFJHruyT7VAU0eOrbkvvgBnYV76AlbCoN_cVrS46HabaZWaT4qZi5fFuFpiw0q32xj eYdeT4kZAH2NmcC6R1OfzDoa08SZ3XIYZ4Bud0dQGrpiudr1b9h8e5R7wTdiIxLzhNw9mPIOE8ZX NsG8zyHeC_d7uDCnNSIHwOdKJWglP4ArhDjqa6yGgDkX64N2Oq4E9fB.gs3e__UzhuJ1Io8G9gqm jkDGgIxNjsf1sEx9ZOyqU_riPjGPmjJRXHZCDeMZd3YliE2zwrkmTy.zUon0lYneRfDrip82OfZ. q0NPS8JpW27Aup3e9ZpUL8ka1z6jwL6n83T1Dy40aNYEhbvBfhIj3b9kz216aW_pNJrI8YDMftgr 81uMbX6w71hspqQj.BU355lqierjxgQ37mEnOU3sVMrse7bIO1iSbad8f5p7zej7DzpbDuxADWmM zrLeN5DcXme37YGCqR33OhlX3q6GeNjnSebrIyaxndLsvgXoKCs1CaQmHuDdyGwrGigXPZWGMHlh Yob5HcS7mc3i7KWu_wzS_vJxgCqG2N7JbWE3HaAH8Ui.K8OS6hmbZJZPN_Ai.C40kNLFZni0UGSi 16lzoWqYIapg- Received: from sonic.gate.mail.ne1.yahoo.com by sonic310.consmr.mail.ir2.yahoo.com with HTTP; Tue, 27 Nov 2018 18:02:14 +0000 Received: from p5B2214EC.dip0.t-ipconnect.de (EHLO [192.168.178.27]) ([91.34.20.236]) by smtp432.mail.ir2.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID b8b3029f991d23a9aded6a0879bb8810 for ; Tue, 27 Nov 2018 18:02:14 +0000 (UTC) From: Tim Gesthuizen Message-ID: <2e47e410-e306-256f-0003-6ac416cc1ebf@yahoo.de> Date: Tue, 27 Nov 2018 19:02:12 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.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: 208.118.235.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 Hi, guix hash reports that its executable name is gcrypt hash when using --version or --help. I don't know whether this is intended and there is a gcrypt binary that I do not know about but it seems to have sneaked in by a query replace. If this is the case you find a patch attached. Tim. From e3ef89ff845e2abd8f20fbbc3ab9939131ebb954 Mon Sep 17 00:00:00 2001 From: Tim Gesthuizen Date: Tue, 27 Nov 2018 18:43:45 +0100 Subject: [PATCH] guix hash: Fix version and help messages ca719424455465fca4b872c371daf2a46de88b33 changes the name of the executable to be displayed by the --version and --help commands of `guix hash` to "gcrypt hash". This is reverted by this commit. * guix/scripts/hash.scm (show-help): Change string literals --- guix/scripts/hash.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/guix/scripts/hash.scm b/guix/scripts/hash.scm index 2bd2ac4a0..b8b215819 100644 --- a/guix/scripts/hash.scm +++ b/guix/scripts/hash.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2016, 2017 Ludovic Courtès ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2016 Jan Nieuwenhuizen +;;; Copyright © 2018 Tim Gesthuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -44,7 +45,7 @@ `((format . ,bytevector->nix-base32-string))) (define (show-help) - (display (G_ "Usage: gcrypt hash [OPTION] FILE + (display (G_ "Usage: guix hash [OPTION] FILE Return the cryptographic hash of FILE. Supported formats: 'nix-base32' (default), 'base32', and 'base16' ('hex' @@ -93,7 +94,7 @@ and 'hexadecimal' can be used as well).\n")) (exit 0))) (option '(#\V "version") #f #f (lambda args - (show-version-and-exit "gcrypt hash"))))) + (show-version-and-exit "guix hash"))))) -- 2.19.2