From 473369a6a6bb865698100bf439c7f951d696f995 Mon Sep 17 00:00:00 2001 From: edison Date: Tue, 12 Oct 2010 21:21:32 -0700 Subject: [PATCH] bug 6535,6536: resovled the cloudvoladm, that can't work with python 2.4 status 6535: resolved fixed status 6536: resolved fixed --- cloud.spec | 3 +-- wscript_build | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cloud.spec b/cloud.spec index 8739fe36c8d..7f6425ab669 100644 --- a/cloud.spec +++ b/cloud.spec @@ -714,9 +714,8 @@ fi %{_bindir}/%{name}voladm %{_sysconfdir}/%{name}/cli/commands.xml %dir %{_prefix}/lib*/python*/site-packages/%{name}tool -%dir %{_prefix}/lib*/python*/site-packages/%{name}apis %{_prefix}/lib*/python*/site-packages/%{name}tool/* -%{_prefix}/lib*/python*/site-packages/%{name}apis/* +%{_prefix}/lib*/python*/site-packages/%{name}apis.py %doc README %doc HACKING %doc debian/copyright diff --git a/wscript_build b/wscript_build index 9720210e7b4..1d4280154dd 100644 --- a/wscript_build +++ b/wscript_build @@ -625,5 +625,5 @@ if buildpremium: bld.process_after(tgen) bld.install_files("${PYTHONDIR}//cloudtool", 'cloudstack-proprietary/cloud-cli/cloudtool/*') - bld.install_files("${PYTHONDIR}/cloudapis", 'cloudstack-proprietary/cloud-cli/cloudapis/*') + bld.install_as("${PYTHONDIR}/cloudapis.py", 'cloudstack-proprietary/cloud-cli/cloudapis/cloud.py')