1 |
robbat2 08/09/24 09:20:50 |
2 |
|
3 |
Modified: amanda-2.6.0_p2-r2.ebuild ChangeLog |
4 |
amanda-2.6.0_p2-r3.ebuild |
5 |
Log: |
6 |
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. |
7 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc6-00521-gcdbf87e x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 app-backup/amanda/amanda-2.6.0_p2-r2.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/amanda/amanda-2.6.0_p2-r2.ebuild?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/amanda/amanda-2.6.0_p2-r2.ebuild?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/amanda/amanda-2.6.0_p2-r2.ebuild?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: amanda-2.6.0_p2-r2.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.6.0_p2-r2.ebuild,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -p -w -b -B -u -u -r1.1 -r1.2 |
22 |
--- amanda-2.6.0_p2-r2.ebuild 19 Sep 2008 19:34:30 -0000 1.1 |
23 |
+++ amanda-2.6.0_p2-r2.ebuild 24 Sep 2008 09:20:49 -0000 1.2 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2008 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $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 $ |
28 |
+# $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 $ |
29 |
|
30 |
inherit autotools eutils |
31 |
|
32 |
@@ -412,18 +412,19 @@ pkg_postinst() { |
33 |
|
34 |
# Migration of amandates from /etc to $localstatedir/amanda |
35 |
if [ -f "${ROOT}/etc/amandates" -a \ |
36 |
- ! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amandates" ]; then |
37 |
- einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}" |
38 |
+ ! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then |
39 |
+ einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda" |
40 |
einfo "A backup is also placed at /etc/amandates.orig" |
41 |
cp -f "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig" |
42 |
- cp -f "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amandates" |
43 |
+ mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/" |
44 |
+ cp -f "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" |
45 |
fi |
46 |
if [ -f "${ROOT}/etc/amandates" ]; then |
47 |
einfo "If you have migrated safely, please delete /etc/amandates" |
48 |
fi |
49 |
# Do setups |
50 |
do_initial /etc dumpdates |
51 |
- do_initial "${AMANDA_USER_HOMEDIR}" amandates |
52 |
+ do_initial "${AMANDA_USER_HOMEDIR}/amanda" amandates |
53 |
|
54 |
# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to |
55 |
# another host than HOSTNAME. |
56 |
|
57 |
|
58 |
|
59 |
1.46 app-backup/amanda/ChangeLog |
60 |
|
61 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.46&view=markup |
62 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/amanda/ChangeLog?rev=1.46&content-type=text/plain |
63 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/amanda/ChangeLog?r1=1.45&r2=1.46 |
64 |
|
65 |
Index: ChangeLog |
66 |
=================================================================== |
67 |
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v |
68 |
retrieving revision 1.45 |
69 |
retrieving revision 1.46 |
70 |
diff -p -w -b -B -u -u -r1.45 -r1.46 |
71 |
--- ChangeLog 23 Sep 2008 06:18:07 -0000 1.45 |
72 |
+++ ChangeLog 24 Sep 2008 09:20:49 -0000 1.46 |
73 |
@@ -1,6 +1,12 @@ |
74 |
# ChangeLog for app-backup/amanda |
75 |
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 |
76 |
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.45 2008/09/23 06:18:07 robbat2 Exp $ |
77 |
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.46 2008/09/24 09:20:49 robbat2 Exp $ |
78 |
+ |
79 |
+ 24 Sep 2008; Robin H. Johnson <robbat2@g.o> |
80 |
+ amanda-2.6.0_p2-r2.ebuild, amanda-2.6.0_p2-r3.ebuild: |
81 |
+ Bug 238017, refix the migration of amandates. Sorry to the ~arch users. |
82 |
+ You will need to fix it up yourself from the snafu location if you did rm |
83 |
+ at the old location. |
84 |
|
85 |
23 Sep 2008; Robin H. Johnson <robbat2@g.o> |
86 |
files/amanda-2.5.2p1-amcrypt-ossl-asym-race-fix.patch, |
87 |
|
88 |
|
89 |
|
90 |
1.2 app-backup/amanda/amanda-2.6.0_p2-r3.ebuild |
91 |
|
92 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/amanda/amanda-2.6.0_p2-r3.ebuild?rev=1.2&view=markup |
93 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/amanda/amanda-2.6.0_p2-r3.ebuild?rev=1.2&content-type=text/plain |
94 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/amanda/amanda-2.6.0_p2-r3.ebuild?r1=1.1&r2=1.2 |
95 |
|
96 |
Index: amanda-2.6.0_p2-r3.ebuild |
97 |
=================================================================== |
98 |
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.6.0_p2-r3.ebuild,v |
99 |
retrieving revision 1.1 |
100 |
retrieving revision 1.2 |
101 |
diff -p -w -b -B -u -u -r1.1 -r1.2 |
102 |
--- amanda-2.6.0_p2-r3.ebuild 23 Sep 2008 02:32:25 -0000 1.1 |
103 |
+++ amanda-2.6.0_p2-r3.ebuild 24 Sep 2008 09:20:49 -0000 1.2 |
104 |
@@ -1,6 +1,6 @@ |
105 |
# Copyright 1999-2008 Gentoo Foundation |
106 |
# Distributed under the terms of the GNU General Public License v2 |
107 |
-# $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 $ |
108 |
+# $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 $ |
109 |
|
110 |
inherit autotools eutils |
111 |
|
112 |
@@ -422,18 +422,19 @@ pkg_postinst() { |
113 |
|
114 |
# Migration of amandates from /etc to $localstatedir/amanda |
115 |
if [ -f "${ROOT}/etc/amandates" -a \ |
116 |
- ! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amandates" ]; then |
117 |
- einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}" |
118 |
+ ! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then |
119 |
+ einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda" |
120 |
einfo "A backup is also placed at /etc/amandates.orig" |
121 |
cp -f "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig" |
122 |
- cp -f "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amandates" |
123 |
+ mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/" |
124 |
+ cp -f "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" |
125 |
fi |
126 |
if [ -f "${ROOT}/etc/amandates" ]; then |
127 |
einfo "If you have migrated safely, please delete /etc/amandates" |
128 |
fi |
129 |
# Do setups |
130 |
do_initial /etc dumpdates |
131 |
- do_initial "${AMANDA_USER_HOMEDIR}" amandates |
132 |
+ do_initial "${AMANDA_USER_HOMEDIR}/amanda" amandates |
133 |
|
134 |
# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to |
135 |
# another host than HOSTNAME. |