parallel_emerge: fix re-exec support.
This was broken via I527ef6dd, although exactly *why* this statement
failed I'm a bit unsure of. Best guess is that it was due to the
sudo environment not preserving PATH; which implies there may
still be an issue here. Alternative theory is that sudo itself
scrubbed the environment and is inducing it.
Neither of those explain why I527ef6d would've broken it however-
it should've been broke prior, but obviously wasn't since chromiumos-sdk
was reliant on it (just that- the build environment there is subtly
different from a prebuilt sdk which is why only that builder has
been seeing it).
Regardless, absolute pathway should've been used anyways, so use them,
restoring the builder. Investigation can continue in parallel.
BUG=chromiumos:27200
TEST=cbuildbot chromiumos-sdk
Change-Id: I34add9733cddc424eb5f9eb31346e078ce9fc696
Reviewed-on: https://gerrit.chromium.org/gerrit/17224
Reviewed-by: Brian Harring <ferringb@chromium.org>
Tested-by: Brian Harring <ferringb@chromium.org>
diff --git a/scripts/parallel_emerge.py b/scripts/parallel_emerge.py
index b12554a..f748b67 100644
--- a/scripts/parallel_emerge.py
+++ b/scripts/parallel_emerge.py
@@ -1518,7 +1518,7 @@
# again. We preserve SUDO_USER here in case an ebuild depends on it.
if portage_upgrade:
args = ["sudo", "-E", "SUDO_USER=%s" % os.environ.get("SUDO_USER", "")]
- args += ['parallel_emerge'] + parallel_emerge_args
+ args += [os.path.abspath(sys.argv[0])] + parallel_emerge_args
args += ["--exclude=sys-apps/portage"]
os.execvp("sudo", args)