From 81c3f620992ba4137b2235596d318aa40a9b5e9f Mon Sep 17 00:00:00 2001
From: Prasanna Santhanam <tsp@apache.org>
Date: Tue, 31 Jul 2012 12:17:33 +0530
Subject: [PATCH] failonerror for some marvin targets

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

diff --git a/build/build-marvin.xml b/build/build-marvin.xml
index e2d478ea775..ebf8dab4ccc 100644
--- a/build/build-marvin.xml
+++ b/build/build-marvin.xml
@@ -26,7 +26,7 @@ file except in compliance with the License. Citrix Systems, Inc. -->
 
     <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" />
@@ -36,7 +36,7 @@ file except in compliance with the License. Citrix Systems, Inc. -->
 
     <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>
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index 9706e32a7cf..53132670c93 100644
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@ -5,10 +5,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",