summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-09-12 05:38:10 +0000
committerMike Frysinger <vapier@gentoo.org>2011-09-12 05:38:10 +0000
commit6d7651fa7319e21e34cd27dcb37b4392929ffa60 (patch)
tree92df7b2d868cdb95bff13e1307b222bb00427025
parentVersion bump. (diff)
downloadgentoo-2-6d7651fa7319e21e34cd27dcb37b4392929ffa60.tar.gz
gentoo-2-6d7651fa7319e21e34cd27dcb37b4392929ffa60.tar.bz2
gentoo-2-6d7651fa7319e21e34cd27dcb37b4392929ffa60.zip
Simplify test homedir logic a bit, and fix quoting.
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
-rw-r--r--net-misc/openssh/ChangeLog5
-rw-r--r--net-misc/openssh/openssh-5.9_p1-r1.ebuild10
2 files changed, 8 insertions, 7 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 6cb8f4427d82..847e6ac430d1 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/openssh
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.423 2011/09/07 07:37:45 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.424 2011/09/12 05:38:10 vapier Exp $
+
+ 12 Sep 2011; Mike Frysinger <vapier@gentoo.org> openssh-5.9_p1-r1.ebuild:
+ Simplify test homedir logic a bit, and fix quoting.
*openssh-5.9_p1-r1 (07 Sep 2011)
diff --git a/net-misc/openssh/openssh-5.9_p1-r1.ebuild b/net-misc/openssh/openssh-5.9_p1-r1.ebuild
index 9a987fa42ef6..a258acfce4bc 100644
--- a/net-misc/openssh/openssh-5.9_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-5.9_p1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.9_p1-r1.ebuild,v 1.1 2011/09/07 07:37:45 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.9_p1-r1.ebuild,v 1.2 2011/09/12 05:38:10 vapier Exp $
EAPI="2"
inherit eutils flag-o-matic multilib autotools pam
@@ -219,17 +219,15 @@ src_test() {
tests="${tests} tests"
fi
# It will also attempt to write to the homedir .ssh
- local oldhome=$HOMEDIR
- export HOMEDIR="${T}/homedir"
- mkdir -pv $HOMEDIR/.ssh/
+ local sshhome=${T}/homedir
+ mkdir -p "${sshhome}"/.ssh
for t in ${tests} ; do
# Some tests read from stdin ...
+ HOMEDIR="${sshhome}" \
emake -k -j1 ${t} </dev/null \
&& passed="${passed}${t} " \
|| failed="${failed}${t} "
done
- unset HOMEDIR
- export HOMEDIR="$oldhome"
einfo "Passed tests: ${passed}"
ewarn "Skipped tests: ${skipped}"
if [[ -n ${failed} ]] ; then