cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [1/2] git commit: failonerror for some marvin targets
Date Tue, 31 Jul 2012 06:50:41 GMT
Updated Branches:
  refs/heads/master 73be77a4c -> 7288eca12


failonerror for some marvin targets


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7288eca1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7288eca1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7288eca1

Branch: refs/heads/master
Commit: 7288eca12977c926ff0e726ef42f334410f8d088
Parents: 9acd1cc
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Tue Jul 31 12:17:33 2012 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Tue Jul 31 12:17:33 2012 +0530

----------------------------------------------------------------------
 build/build-marvin.xml |    4 ++--
 tools/marvin/setup.py  |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7288eca1/build/build-marvin.xml
----------------------------------------------------------------------
diff --git a/build/build-marvin.xml b/build/build-marvin.xml
index daa77b9..6daac03 100644
--- a/build/build-marvin.xml
+++ b/build/build-marvin.xml
@@ -40,7 +40,7 @@
 
     <target name="build-marvin" depends="build-apidocs" description="generates the cloudstackAPIs
for marvin">
         <echo message="Generating Marvin API Classes"/>
-        <exec dir="${marvin.src.dir}" executable="python">
+        <exec dir="${marvin.src.dir}" executable="python" failonerror="true">
             <arg value="codegenerator.py" />
             <arg value="-s" />
             <arg value="${dist.dir}/commands.xml" />
@@ -50,7 +50,7 @@
 
     <target name="package-marvin" depends="build-marvin" description="create a distributable
tarball of Marvin">
         <echo message="Packaging Marvin"/>
-        <exec dir="${marvin.dir}" executable="python">
+        <exec dir="${marvin.dir}" executable="python" failonerror="true">
             <arg value="setup.py" />
             <arg value="sdist" />
         </exec>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7288eca1/tools/marvin/setup.py
----------------------------------------------------------------------
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index c0e4af4..96981ee 100644
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@ -18,10 +18,11 @@
 
 from distutils.core import setup
 from sys import version
+import sys
 
 if version < "2.7":
     print "Marvin needs at least python 2.7, found : \n%s"%version
-    raise
+    sys.exit(1)
 
 setup(name="Marvin",
       version="0.1.0",


Mime
View raw message