From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4386 invoked by alias); 27 Feb 2009 12:01:49 -0000 Received: (qmail 4275 invoked by alias); 27 Feb 2009 12:01:49 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: fence-agents: master - copyright: allow non-redhat-copyright in fence agents To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: fence-agents.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 463801857a372d4dc10a2e746e7d3b5b022b0bbd X-Git-Newrev: bdd8dae1a32b195552c3b08a59a3113948c93f6f From: "Fabio M. Di Nitto" Message-Id: <20090227120127.778C6120154@lists.fedorahosted.org> Date: Fri, 27 Feb 2009 12:01:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q1/txt/msg00598.txt.bz2 Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commitdiff;h=bdd8dae1a32b195552c3b08a59a3113948c93f6f Commit: bdd8dae1a32b195552c3b08a59a3113948c93f6f Parent: 463801857a372d4dc10a2e746e7d3b5b022b0bbd Author: Fabio M. Di Nitto AuthorDate: Fri Feb 27 13:00:23 2009 +0100 Committer: Fabio M. Di Nitto CommitterDate: Fri Feb 27 13:00:23 2009 +0100 copyright: allow non-redhat-copyright in fence agents The build system was simply stupid. Fix that to allow proper copyright attribution. Signed-off-by: Fabio M. Di Nitto --- scripts/fenceparse | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/scripts/fenceparse b/scripts/fenceparse index 8b00698..c34cb82 100644 --- a/scripts/fenceparse +++ b/scripts/fenceparse @@ -28,8 +28,11 @@ esac awk "{print}(\$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $realinfile echo ${start}RELEASE_VERSION=\"${release}\"${end} -echo ${start}REDHAT_COPYRIGHT=${definedata}${end} echo ${start}BUILD_DATE=\"\(built $(date)\)\"${end} +if awk -v p=0 "(\$1 ~ /#BEGIN_VERSION_GENERATION/){p = 1} (\$1 ~ /#END_VERSION_GENERATION/){p = 0} {if(p==1)print}" $realinfile | \ + grep -q REDHAT_COPYRIGHT; then + echo ${start}REDHAT_COPYRIGHT=${definedata}${end} +fi awk -v p=0 "(\$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $realinfile exit 0