Repository: brooklyn-server Updated Branches: refs/heads/0.9.0 718aea7d2 -> d520fde68
Fixed command for installing python via apt-get and yum by using sudo Cherry-picked Jongyoul Leeâs commit (a0341a4, PR #105), but conflicts due to server-cli/src/main/resources/catalog.bom not existing. Therefore fixing conflict manually and committing. Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d520fde6 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d520fde6 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d520fde6 Branch: refs/heads/0.9.0 Commit: d520fde682dfb597487943ec62ffb752d0f6ef17 Parents: 718aea7 Author: Aled Sage <aled.s...@gmail.com> Authored: Thu Apr 7 20:59:13 2016 +0100 Committer: Aled Sage <aled.s...@gmail.com> Committed: Thu Apr 7 20:59:13 2016 +0100 ---------------------------------------------------------------------- server-cli/src/main/resources/brooklyn/default.catalog.bom | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d520fde6/server-cli/src/main/resources/brooklyn/default.catalog.bom ---------------------------------------------------------------------- diff --git a/server-cli/src/main/resources/brooklyn/default.catalog.bom b/server-cli/src/main/resources/brooklyn/default.catalog.bom index deca965..c1f0456 100644 --- a/server-cli/src/main/resources/brooklyn/default.catalog.bom +++ b/server-cli/src/main/resources/brooklyn/default.catalog.bom @@ -97,8 +97,8 @@ brooklyn.catalog: install.command: | # install python if not present which python || \ - { apt-get update && apt-get install python ; } || \ - { yum update && yum install python ; } || \ + { sudo apt-get update && sudo apt-get install python ; } || \ + { sudo yum update && sudo yum install python ; } || \ { echo WARNING: cannot install python && exit 1 ; } customize.command: |