From fbacee20d49cd57672600d9b01d277d3ec73690b Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Sat, 16 Nov 2013 13:39:08 +0900
Subject: [PATCH] Bug 938428 - Always return an int from the cl.py main
 function, so that sys.exit crazyness doesn't bite. r=gps

---
 python/mozbuild/mozbuild/action/cl.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/python/mozbuild/mozbuild/action/cl.py b/python/mozbuild/mozbuild/action/cl.py
index 0d7cc55d8b5..7329dd15658 100644
--- a/python/mozbuild/mozbuild/action/cl.py
+++ b/python/mozbuild/mozbuild/action/cl.py
@@ -96,7 +96,9 @@ def InvokeClWithDependencyGeneration(cmdline):
     ret = p.wait()
 
     if ret != 0 or target == "":
-        return ret
+        # p.wait() returns a long. Somehow sys.exit(long(0)) is like
+        # sys.exit(1). Don't ask why.
+        return int(ret)
 
     depsdir = os.path.normpath(os.path.join(os.curdir, ".deps"))
     depstarget = os.path.join(depsdir, depstarget)