etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-9452: add python-argparse dependency on el6,7 rpms 

The patchviasocket script was rewritten in Python from PR #1533 and made
assumptions that Python 2.7 would be available. In case of CentOS, python 2.7
may not be available or installed. This change ensures that python-argparse
is installed which is used by this script.

Expose cmd error in the logs when patch command fails.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2016-08-10 14:13:40 +05:30
parent bdc409c7a2
commit 7b8ba24c64
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packaging/centos63/cloud.spec
View File

@ -96,6 +96,7 @@ management, and intelligence in CloudStack.
%package common %package common
Summary: Apache CloudStack common files and scripts Summary: Apache CloudStack common files and scripts
Requires: python Requires: python
Requires: python-argparse
Obsoletes: cloud-test < 4.1.0 Obsoletes: cloud-test < 4.1.0
Obsoletes: cloud-scripts < 4.1.0 Obsoletes: cloud-scripts < 4.1.0
Obsoletes: cloud-utils < 4.1.0 Obsoletes: cloud-utils < 4.1.0

1
packaging/centos7/cloud.spec
View File

@ -91,6 +91,7 @@ management, and intelligence in CloudStack.
%package common %package common
Summary: Apache CloudStack common files and scripts Summary: Apache CloudStack common files and scripts
Requires: python Requires: python
Requires: python-argparse
Group: System Environment/Libraries Group: System Environment/Libraries
%description common %description common
The Apache CloudStack files shared between agent and management server The Apache CloudStack files shared between agent and management server

2
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
View File

@ -1239,7 +1239,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
command.add("-p", cmdLine.replaceAll(" ", "%")); command.add("-p", cmdLine.replaceAll(" ", "%"));
result = command.execute(); result = command.execute();
if (result != null) { if (result != null) {
s_logger.debug("passcmd failed:" + result); s_logger.error("passcmd failed:" + result);
return false; return false;
} }
return true; return true;