e3c68b
From fbc7f0e5ac8c292b865a8e02ceed2efa101d145c Mon Sep 17 00:00:00 2001
e3c68b
From: Atin Mukherjee <amukherj@redhat.com>
e3c68b
Date: Mon, 12 Mar 2018 19:47:11 +0530
e3c68b
Subject: [PATCH 21/52] cli/glusterfsd: remove copyright information
e3c68b
e3c68b
There's no point of dumping upstream copyright information in --version.
e3c68b
e3c68b
Label: DOWNSTREAM ONLY
e3c68b
e3c68b
Change-Id: I3a10e30878698e1d53082936bbf22bca560a3896
e3c68b
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
e3c68b
Reviewed-on: https://code.engineering.redhat.com/gerrit/132445
e3c68b
Tested-by: RHGS Build Bot <nigelb@redhat.com>
e3c68b
Reviewed-by: Milind Changire <mchangir@redhat.com>
e3c68b
---
e3c68b
 cli/src/cli.c               | 11 +----------
e3c68b
 glusterfsd/src/glusterfsd.c | 11 +----------
e3c68b
 2 files changed, 2 insertions(+), 20 deletions(-)
e3c68b
e3c68b
diff --git a/cli/src/cli.c b/cli/src/cli.c
e3c68b
index 84ce0f4..08f117e 100644
e3c68b
--- a/cli/src/cli.c
e3c68b
+++ b/cli/src/cli.c
e3c68b
@@ -65,16 +65,7 @@ extern int connected;
e3c68b
 /* using argp for command line parsing */
e3c68b
 
e3c68b
 const char *argp_program_version =
e3c68b
-    "" PACKAGE_NAME " " PACKAGE_VERSION
e3c68b
-    "\nRepository revision: " GLUSTERFS_REPOSITORY_REVISION
e3c68b
-    "\n"
e3c68b
-    "Copyright (c) 2006-2016 Red Hat, Inc. "
e3c68b
-    "<https://www.gluster.org/>\n"
e3c68b
-    "GlusterFS comes with ABSOLUTELY NO WARRANTY.\n"
e3c68b
-    "It is licensed to you under your choice of the GNU Lesser\n"
e3c68b
-    "General Public License, version 3 or any later version (LGPLv3\n"
e3c68b
-    "or later), or the GNU General Public License, version 2 (GPLv2),\n"
e3c68b
-    "in all cases as published by the Free Software Foundation.";
e3c68b
+    PACKAGE_NAME" "PACKAGE_VERSION;
e3c68b
 const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">";
e3c68b
 
e3c68b
 struct rpc_clnt *global_quotad_rpc;
e3c68b
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c
e3c68b
index 5d46b3d..c983882 100644
e3c68b
--- a/glusterfsd/src/glusterfsd.c
e3c68b
+++ b/glusterfsd/src/glusterfsd.c
e3c68b
@@ -86,16 +86,7 @@ static char argp_doc[] =
e3c68b
     "--volfile-server=SERVER [MOUNT-POINT]\n"
e3c68b
     "--volfile=VOLFILE [MOUNT-POINT]";
e3c68b
 const char *argp_program_version =
e3c68b
-    "" PACKAGE_NAME " " PACKAGE_VERSION
e3c68b
-    "\nRepository revision: " GLUSTERFS_REPOSITORY_REVISION
e3c68b
-    "\n"
e3c68b
-    "Copyright (c) 2006-2016 Red Hat, Inc. "
e3c68b
-    "<https://www.gluster.org/>\n"
e3c68b
-    "GlusterFS comes with ABSOLUTELY NO WARRANTY.\n"
e3c68b
-    "It is licensed to you under your choice of the GNU Lesser\n"
e3c68b
-    "General Public License, version 3 or any later version (LGPLv3\n"
e3c68b
-    "or later), or the GNU General Public License, version 2 (GPLv2),\n"
e3c68b
-    "in all cases as published by the Free Software Foundation.";
e3c68b
+    PACKAGE_NAME" "PACKAGE_VERSION;
e3c68b
 const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">";
e3c68b
 
e3c68b
 static error_t
e3c68b
-- 
e3c68b
1.8.3.1
e3c68b