From 20217595ab22b2150eccdbb9632d7e4fd248c9c7 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@google.com>
Date: Thu, 12 May 2016 19:10:26 +0200
Subject: [PATCH] tools/maven: avoid using PEX for the mvn script

The PEX wrapper ignores the exit code of the wrapped script, and
always exits with status 1, obscuring the true status of the command.

Since mvn.py doesn't use other libraries, we can just run it directly.

Change-Id: Ie7c3467cb3b8163cff79334a190fc29381dd2f72
---
 tools/maven/BUCK         |  5 -----
 tools/maven/package.defs | 10 ++++++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/tools/maven/BUCK b/tools/maven/BUCK
index fcd77c0d55..322b5a208f 100644
--- a/tools/maven/BUCK
+++ b/tools/maven/BUCK
@@ -31,8 +31,3 @@ maven_package(
   },
   war = {'gerrit-war': '//:release'},
 )
-
-python_binary(
-  name = 'mvn',
-  main = 'mvn.py',
-)
diff --git a/tools/maven/package.defs b/tools/maven/package.defs
index c3e5595aac..e43f59ea1f 100644
--- a/tools/maven/package.defs
+++ b/tools/maven/package.defs
@@ -16,7 +16,7 @@ sh_bang_template = (' && '.join([
   "echo '#!/bin/sh -eu' > $OUT",
   'echo "# this script should run from the root of your workspace." >> $OUT',
   'echo "" >> $OUT',
-  "echo 'if [[ -n \"$${VERBOSE:-}\" ]]; then set -x ; fi' >> $OUT", 
+  "echo 'if [[ -n \"$${VERBOSE:-}\" ]]; then set -x ; fi' >> $OUT",
   'echo "" >> $OUT',
   'echo %s >> $OUT',
   'echo "" >> $OUT',
@@ -36,9 +36,11 @@ def maven_package(
 
   build_cmd = ['buck', 'build']
 
-  mvn_cmd = ['$(exe //tools/maven:mvn)', '-v', version]
+  # This is not using python_binary() to avoid the baggage and bugs
+  # that PEX brings along.
+  mvn_cmd = ['python', 'tools/maven/mvn.py', '-v', version]
   api_cmd = mvn_cmd[:]
-  api_targets = [ '//tools/maven:mvn' ]
+  api_targets = []
   for type,d in [('jar', jar), ('java-source', src), ('javadoc', doc)]:
     for a,t in sorted(d.iteritems()):
       api_cmd.append('-s %s:%s:$(location %s)' % (a,type,t))
@@ -66,7 +68,7 @@ def maven_package(
     )
 
   war_cmd = mvn_cmd[:]
-  war_targets = [ '//tools/maven:mvn' ]
+  war_targets = []
   for a,t in sorted(war.iteritems()):
     war_cmd.append('-s %s:war:$(location %s)' % (a,t))
     war_targets.append(t)