cluster: STABLE3 - copyright: allow non-redhat-copyright in fence agents

Fabio M. Di Nitto fabbione@fedoraproject.org
Fri Feb 27 12:03:00 GMT 2009


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=60556137ca47e611601f7777d5f743eceb8b3b52
Commit:        60556137ca47e611601f7777d5f743eceb8b3b52
Parent:        dc39945e601fe9a8b76ecc7f8879f459a3b3790b
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Fri Feb 27 13:00:23 2009 +0100
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Fri Feb 27 13:03:02 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 <fdinitto@redhat.com>
---
 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



More information about the Cluster-cvs mailing list