Bug 238017, refix the migration of amandates. Sorry to the ~arch users. You will need to fix it up yourself from the snafu location if you did rm at the old location.

(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc6-00521-gcdbf87e x86_64)

3 files changed, 19 insertions, 11 deletions

diff --git a/app-backup/amanda/ChangeLog b/app-backup/amanda/ChangeLog
index 18575b25c652..93dbdf0c0b6d 100644
--- a/app-backup/amanda/ChangeLog
+++ b/app-backup/amanda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-backup/amanda
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.45 2008/09/23 06:18:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.46 2008/09/24 09:20:49 robbat2 Exp $
+
+  24 Sep 2008; Robin H. Johnson <robbat2@gentoo.org>
+  amanda-2.6.0_p2-r2.ebuild, amanda-2.6.0_p2-r3.ebuild:
+  Bug 238017, refix the migration of amandates. Sorry to the ~arch users.
+  You will need to fix it up yourself from the snafu location if you did rm
+  at the old location.
 
   23 Sep 2008; Robin H. Johnson <robbat2@gentoo.org>
   files/amanda-2.5.2p1-amcrypt-ossl-asym-race-fix.patch,
diff --git a/app-backup/amanda/amanda-2.6.0_p2-r2.ebuild b/app-backup/amanda/amanda-2.6.0_p2-r2.ebuild
index 8d89bdbaa919..730a8a372cac 100644
--- a/app-backup/amanda/amanda-2.6.0_p2-r2.ebuild
+++ b/app-backup/amanda/amanda-2.6.0_p2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r2.ebuild,v 1.1 2008/09/19 19:34:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.6.0_p2-r2.ebuild,v 1.2 2008/09/24 09:20:49 robbat2 Exp $
 
 inherit autotools eutils
 
@@ -412,18 +412,19 @@ pkg_postinst() {
 
 	# Migration of amandates from /etc to $localstatedir/amanda
 	if [ -f "${ROOT}/etc/amandates" -a \
-		! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amandates" ]; then
-		einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}"
+		! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
+		einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
 		einfo "A backup is also placed at /etc/amandates.orig"
 		cp -f "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig"
-		cp -f "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amandates"
+		mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/"
+		cp -f "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates"
 	fi
 	if [ -f "${ROOT}/etc/amandates" ]; then
 		einfo "If you have migrated safely, please delete /etc/amandates"
 	fi
 	# Do setups
 	do_initial /etc dumpdates
-	do_initial "${AMANDA_USER_HOMEDIR}" amandates
+	do_initial "${AMANDA_USER_HOMEDIR}/amanda" amandates
 
 	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
 	# another host than HOSTNAME.
diff --git a/app-backup/amanda/amanda-2.6.0_p2-r3.ebuild b/app-backup/amanda/amanda-2.6.0_p2-r3.ebuild
index 84eea04b1894..5e1f6595f2e9 100644
--- a/app-backup/amanda/amanda-2.6.0_p2-r3.ebuild
+++ b/app-backup/amanda/amanda-2.6.0_p2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r3.ebuild,v 1.1 2008/09/23 02:32:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.6.0_p2-r3.ebuild,v 1.2 2008/09/24 09:20:49 robbat2 Exp $
 
 inherit autotools eutils
 
@@ -422,18 +422,19 @@ pkg_postinst() {
 
 	# Migration of amandates from /etc to $localstatedir/amanda
 	if [ -f "${ROOT}/etc/amandates" -a \
-		! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amandates" ]; then
-		einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}"
+		! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
+		einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
 		einfo "A backup is also placed at /etc/amandates.orig"
 		cp -f "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig"
-		cp -f "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amandates"
+		mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/"
+		cp -f "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates"
 	fi
 	if [ -f "${ROOT}/etc/amandates" ]; then
 		einfo "If you have migrated safely, please delete /etc/amandates"
 	fi
 	# Do setups
 	do_initial /etc dumpdates
-	do_initial "${AMANDA_USER_HOMEDIR}" amandates
+	do_initial "${AMANDA_USER_HOMEDIR}/amanda" amandates
 
 	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
 	# another host than HOSTNAME.