Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f4f... Commit: f4fc5eb9e0b848a11c5e06a32ea97d51e1beca5d Parent: 49d3da55baca52545da914d5682a64f8ffa44ed1 Author: Marek 'marx' Grac mgrac@redhat.com AuthorDate: Fri Jun 18 09:23:31 2010 +0200 Committer: Marek 'marx' Grac mgrac@redhat.com CommitterDate: 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 --- fence/agents/vmware/Makefile | 6 +++--- fence/agents/vmware/fence_vmware_helper.pl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
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="";
cluster-commits@lists.fedorahosted.org