Repository: cloudstack-cloudmonkey Updated Branches: refs/heads/master e45c1c02b -> 4e654448c
cloudmonkey: in case both -b and -n are passed, block for async api Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/commit/4e654448 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/tree/4e654448 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/diff/4e654448 Branch: refs/heads/master Commit: 4e654448c36e64ff05e2e4cf40c77c94eeea5477 Parents: e45c1c0 Author: Rohit Yadav <[email protected]> Authored: Mon Jan 12 10:38:30 2015 +0530 Committer: Rohit Yadav <[email protected]> Committed: Mon Jan 12 10:38:30 2015 +0530 ---------------------------------------------------------------------- cloudmonkey/cloudmonkey.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/blob/4e654448/cloudmonkey/cloudmonkey.py ---------------------------------------------------------------------- diff --git a/cloudmonkey/cloudmonkey.py b/cloudmonkey/cloudmonkey.py index f1d1355..4144f2d 100644 --- a/cloudmonkey/cloudmonkey.py +++ b/cloudmonkey/cloudmonkey.py @@ -770,12 +770,12 @@ def main(): if args.displayType and args.displayType in displayTypes: shell.set_attr("display", args.displayType) - if args.block_async: - shell.set_attr("asyncblock", "true") - if args.noblock_async: shell.set_attr("asyncblock", "false") + if args.block_async: + shell.set_attr("asyncblock", "true") + if args.serverProfile and args.serverProfile.strip() != '': shell.do_set("profile %s" % args.serverProfile)
