From: Fabian Groffen <grobian@gentoo.org>
Date: Fri, 26 Nov 2010 08:11:30 +0000 (+0100)
Subject: Merge remote branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=88c6e161aeac32397c291fc236db5797f01ab673;p=portage.git

Merge remote branch 'overlays-gentoo-org/master' into prefix
---

88c6e161aeac32397c291fc236db5797f01ab673
diff --cc runtests.sh
index f1cd01c39,dc3343fe9..31910d65d
--- a/runtests.sh
+++ b/runtests.sh
@@@ -15,11 -15,18 +15,18 @@@ case "${NOCOLOR:-false}" i
  		;;
  esac
  
+ interrupted() {
+ 	echo "interrupted." >&2
+ 	exit 1
+ }
+ 
+ trap interrupted SIGINT
+ 
  exit_status="0"
  for version in ${PYTHON_VERSIONS}; do
 -	if [[ -x /usr/bin/python${version} ]]; then
 +	if [[ -x @PORTAGE_PYTHON@${version} ]]; then
  		echo -e "${GOOD}Testing with Python ${version}...${NORMAL}"
 -		if ! /usr/bin/python${version} pym/portage/tests/runTests; then
 +		if ! @PORTAGE_PYTHON@${version} pym/portage/tests/runTests; then
  			echo -e "${BAD}Testing with Python ${version} failed${NORMAL}"
  			exit_status="1"
  		fi