Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > 24e278e14a25367b8cb2fce8af484abd > files > 94

cman-2.0.115-96.el5_8.3.src.rpm

commit f4fc5eb9e0b848a11c5e06a32ea97d51e1beca5d
Author: Marek 'marx' Grac <mgrac@redhat.com>
Date:   Fri Jun 18 09:23:31 2010 +0200

    fence: Build problem in fence_vmware_helper
    
    My changes to Makefiles makes a wrong assumption that both scripts for
    vmware are python based what leads to improper version filling.
    
    Patch proposed by Honza
    
    Resolves: rhbz#590304

diff --git a/fence/agents/vmware/Makefile b/fence/agents/vmware/Makefile
index f0259b8..1795e63 100644
--- a/fence/agents/vmware/Makefile
+++ b/fence/agents/vmware/Makefile
@@ -34,9 +34,9 @@ $(TARGET): $(SOURCE)
 $(TARGET2): $(SOURCE2)
 	: > $(TARGET2)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE2) >> $(TARGET2)
-	echo "FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET2)
-	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh REDHAT_COPYRIGHT >> $(TARGET2)
-	echo "BUILD_DATE=\"(built `date`)\";" >> $(TARGET2)
+	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET2)
+	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET2)
+	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET2)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE2) >> $(TARGET2)
 	chmod +x $(TARGET2)
 
diff --git a/fence/agents/vmware/fence_vmware_helper.pl b/fence/agents/vmware/fence_vmware_helper.pl
index a0b5cea..b2ace50 100644
--- a/fence/agents/vmware/fence_vmware_helper.pl
+++ b/fence/agents/vmware/fence_vmware_helper.pl
@@ -12,7 +12,7 @@ END {
   $? ||= 1;
 }
 
-my ($RELEASE_VERSION, $REDHAT_COPYRIGHT, $BUILD_DATE);
+my ($FENCE_RELEASE_NAME, $REDHAT_COPYRIGHT, $BUILD_DATE);
 
 #BEGIN_VERSION_GENERATION
 $RELEASE_VERSION="";