From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 12 May 2013 20:52:06 +0000 (-0700)
Subject: dohtml: restore cwd for __helpers_die
X-Git-Tag: v2.2.0_alpha175~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2ffea0a3b302642eeacae38059b06181006d2573;p=portage.git

dohtml: restore cwd for __helpers_die
---

diff --git a/bin/ebuild-helpers/dohtml b/bin/ebuild-helpers/dohtml
index 4be9bc2eb..fd9efd267 100755
--- a/bin/ebuild-helpers/dohtml
+++ b/bin/ebuild-helpers/dohtml
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2009-2010 Gentoo Foundation
+# Copyright 2009-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
@@ -13,5 +13,7 @@ PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \
 	"${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH/dohtml.py" "$@"
 
 ret=$?
+# Restore cwd for display by __helpers_die
+cd "${__PORTAGE_HELPER_CWD}"
 [[ $ret -ne 0 ]] && __helpers_die "${0##*/} failed"
 exit $ret