From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Vong Subject: [PATCH 2/2] guix-register: Fix '--version'. Date: Wed, 24 Aug 2016 09:35:48 +0800 Message-ID: <87bn0jx823.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/x-diff; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54082) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcN7f-0006tB-Bj for guix-devel@gnu.org; Tue, 23 Aug 2016 21:36:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bcN7b-0003xk-71 for guix-devel@gnu.org; Tue, 23 Aug 2016 21:36:54 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34619) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcN7b-0003xZ-0u for guix-devel@gnu.org; Tue, 23 Aug 2016 21:36:51 -0400 Received: by mail-pf0-f193.google.com with SMTP id g202so165836pfb.1 for ; Tue, 23 Aug 2016 18:36:50 -0700 (PDT) Content-Disposition: inline; filename=0002-guix-register-Fix-version.patch List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org >From 66b7781dd5b88bfff465660e9ae02d86a1f4843f Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Wed, 24 Aug 2016 09:25:04 +0800 Subject: [PATCH 2/2] guix-register: Fix '--version'. * nix/guix-register/guix-register.cc (argp_program_version): Assigning instead of declaring. (argp_program_bug_address): Likewise. --- nix/guix-register/guix-register.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/guix-register/guix-register.cc b/nix/guix-register/guix-re= gister.cc index 16dae62..849e640 100644 --- a/nix/guix-register/guix-register.cc +++ b/nix/guix-register/guix-register.cc @@ -2,6 +2,7 @@ Copyright (C) 2013, 2014, 2015 Ludovic Court=C3=A8s Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Eelco Dolstra + Copyright (C) 2016 Alex Vong =20 This file is part of GNU Guix. =20 @@ -44,10 +45,6 @@ static std::istream *input =3D &std::cin; /* Command-line options. */ =20 -const char *argp_program_version =3D - "guix-register (" PACKAGE_NAME ") " PACKAGE_VERSION; -const char *argp_program_bug_address =3D PACKAGE_BUGREPORT; - static char doc[] =3D "guix-register -- register a closure as valid in a store\ \v\ @@ -230,6 +227,9 @@ main (int argc, char *argv[]) =20 try { + argp_program_version =3D + "guix-register (" PACKAGE_NAME ") " PACKAGE_VERSION; + argp_program_bug_address =3D PACKAGE_BUGREPORT; argp_parse (&argp, argc, argv, 0, 0, 0); =20 /* Instantiate the store. This creates any missing directories among --=20 2.9.3