Repository: ambari Updated Branches: refs/heads/trunk 0329800f2 -> 601b1e058
AMBARI-7633. Ambari Setup fails due to missing python module (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/601b1e05 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/601b1e05 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/601b1e05 Branch: refs/heads/trunk Commit: 601b1e05859f1cea4fcfa2bf30eaa40006fefa6b Parents: 0329800 Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Fri Oct 3 18:34:50 2014 +0300 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Fri Oct 3 18:34:50 2014 +0300 ---------------------------------------------------------------------- ambari-server/pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/601b1e05/ambari-server/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 8eeff3a..96e84c4 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -25,6 +25,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <python.ver>python >= 2.6</python.ver> + <!-- On centos the python xml's are inside python package --> + <python.xml.package>${python.ver}</python.xml.package> <deb.python.ver>python (>= 2.6)</deb.python.ver> <deb.architecture>amd64</deb.architecture> <deb.dependency.list>openssl, postgresql (>= 8.1), ${deb.python.ver}, curl</deb.dependency.list> @@ -220,6 +222,7 @@ <require>postgresql-server >= 8.1</require> <require>openssl</require> <require>${python.ver}</require> + <require>${python.xml.package}</require> </requires> <postinstallScriptlet> <scriptFile>src/main/package/rpm/postinstall.sh</scriptFile> @@ -1150,6 +1153,12 @@ </plugins> </build> </profile> + <profile> + <id>suse11</id> + <properties> + <python.xml.package>python-xml</python.xml.package> + </properties> + </profile> </profiles> <dependencies> <dependency>
