summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2010-01-17 04:28:13 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2010-01-17 04:28:13 +0000
commit168b3a44a465583c0feccee24ed8318a43cd8e38 (patch)
tree6fcec5355fde6b8f00e90fe7a3b28f86e1d08c95 /app-backup
parentBetter version of the logic for bug #286292. (diff)
downloadgentoo-2-168b3a44a465583c0feccee24ed8318a43cd8e38.tar.gz
gentoo-2-168b3a44a465583c0feccee24ed8318a43cd8e38.tar.bz2
gentoo-2-168b3a44a465583c0feccee24ed8318a43cd8e38.zip
If installing from a binpkg, then ${T} does not exist, so look at the just-installed copy of the env.d file.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'app-backup')
-rw-r--r--app-backup/amanda/ChangeLog8
-rw-r--r--app-backup/amanda/amanda-2.6.1_p2.ebuild6
2 files changed, 10 insertions, 4 deletions
diff --git a/app-backup/amanda/ChangeLog b/app-backup/amanda/ChangeLog
index 5060de2dd5b2..b15f354fc3ae 100644
--- a/app-backup/amanda/ChangeLog
+++ b/app-backup/amanda/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-backup/amanda
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.62 2009/11/22 10:05:40 robbat2 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.63 2010/01/17 04:28:13 robbat2 Exp $
+
+ 17 Jan 2010; Robin H. Johnson <robbat2@gentoo.org> amanda-2.6.1_p2.ebuild:
+ If installing from a binpkg, then ${T} does not exist, so look at the
+ just-installed copy of the env.d file.
22 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> -amanda-2.4.5.ebuild,
-amanda-2.4.5_p1.ebuild, -files/amanda-2.4.5-4tb-holding-disk.patch,
diff --git a/app-backup/amanda/amanda-2.6.1_p2.ebuild b/app-backup/amanda/amanda-2.6.1_p2.ebuild
index 1307ce1e8263..cddb15977397 100644
--- a/app-backup/amanda/amanda-2.6.1_p2.ebuild
+++ b/app-backup/amanda/amanda-2.6.1_p2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.6.1_p2.ebuild,v 1.2 2009/11/22 09:54:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.6.1_p2.ebuild,v 1.3 2010/01/17 04:28:13 robbat2 Exp $
inherit autotools eutils
@@ -345,6 +345,8 @@ src_install() {
}
pkg_postinst() {
+ [ ! -f "${TMPENVFILE}" -a "$EMERGE_FROM" == "binary" ] && \
+ TMPENVFILE="${ROOT}${ENVDIR}${ENVDFILE}"
[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
source "${TMPENVFILE}"