diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2009-04-10 07:40:57 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2009-04-10 07:40:57 +0000 |
| commit | 5e25e73a3de95b3b45952f5f71ec18250a8be4c9 (patch) | |
| tree | 272e23ba84e7b21abb8d2a9ceeb68c74efc8dea0 /app-backup/amanda | |
| parent | Rename site-init file. (diff) | |
| download | gentoo-2-5e25e73a3de95b3b45952f5f71ec18250a8be4c9.tar.gz gentoo-2-5e25e73a3de95b3b45952f5f71ec18250a8be4c9.tar.bz2 gentoo-2-5e25e73a3de95b3b45952f5f71ec18250a8be4c9.zip | |
Bug #265294: One of the cases of the Amanda env special file broke the upgrade where I had turned a bit off in the previous commit.
(Portage version: 2.2_rc27/cvs/Linux x86_64)
Diffstat (limited to 'app-backup/amanda')
| -rw-r--r-- | app-backup/amanda/ChangeLog | 7 | ||||
| -rw-r--r-- | app-backup/amanda/amanda-2.6.0_p2-r4.ebuild | 13 |
2 files changed, 16 insertions, 4 deletions
diff --git a/app-backup/amanda/ChangeLog b/app-backup/amanda/ChangeLog index 53fb4d7ba9d4..c515ba823651 100644 --- a/app-backup/amanda/ChangeLog +++ b/app-backup/amanda/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-backup/amanda # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.54 2009/04/05 19:59:06 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.55 2009/04/10 07:40:57 robbat2 Exp $ + + 10 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> + amanda-2.6.0_p2-r4.ebuild: + Bug #265294: One of the cases of the Amanda env special file broke the + upgrade where I had turned a bit off in the previous commit. 05 Apr 2009; Markus Meier <maekke@gentoo.org> amanda-2.6.0_p2-r4.ebuild: amd64/x86 stable, bug #264456 diff --git a/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild b/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild index 2ef10ae489a6..fc6d97014e60 100644 --- a/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild +++ b/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild,v 1.8 2009/04/05 19:59:06 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild,v 1.9 2009/04/10 07:40:57 robbat2 Exp $ inherit autotools eutils @@ -320,8 +320,15 @@ src_install() { # Clean up some bits dodoc "${D}"/usr/share/amanda/* rm -rf "${D}"/usr/share/amanda - #mkdir -p "${D}"/${MYINSTTMPDIR} || die - #cp "${TMPENVFILE}" "${D}"/${TMPINSTENVFILE} || die + + # Do not remove these next two lines + # This file is created, and installed, but then removed at the start of + # pkg_postinst. It simply insures that the settings that Amanda is built + # with are used very early in the postinst, and override any prior existing + # settings in the /etc/env.d/97amanda + mkdir -p "${D}"/${MYINSTTMPDIR} || die + cp "${TMPENVFILE}" "${D}"/${TMPINSTENVFILE} || die + # our inetd sample einfo "Installing standard inetd sample" newdoc "${MYFILESDIR}"/amanda-inetd.amanda.sample-2.6.0_p2-r2 amanda-inetd.amanda.sample |