Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-2.2.0_alpha190.ebuild portage-2.1.13.1.ebuild ChangeLog
Date: Mon, 29 Jul 2013 17:53:26
Message-Id: 20130729175318.DAFF52171C@flycatcher.gentoo.org
1 zmedico 13/07/29 17:53:18
2
3 Modified: portage-2.2.0_alpha190.ebuild
4 portage-2.1.13.1.ebuild ChangeLog
5 Log:
6 Adjust DISTDIR permissions last in pkg_postinst, in case the user is
7 tempted to kill it. Also remove obsolete WORLD_MIGRATION_UPGRADE code.
8
9 (Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 0xFDE8EF85AE5719A3)
10
11 Revision Changes Path
12 1.3 sys-apps/portage/portage-2.2.0_alpha190.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha190.ebuild?rev=1.3&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha190.ebuild?rev=1.3&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha190.ebuild?r1=1.2&r2=1.3
17
18 Index: portage-2.2.0_alpha190.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha190.ebuild,v
21 retrieving revision 1.2
22 retrieving revision 1.3
23 diff -u -r1.2 -r1.3
24 --- portage-2.2.0_alpha190.ebuild 28 Jul 2013 09:21:49 -0000 1.2
25 +++ portage-2.2.0_alpha190.ebuild 29 Jul 2013 17:53:18 -0000 1.3
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2013 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha190.ebuild,v 1.2 2013/07/28 09:21:49 mgorny Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha190.ebuild,v 1.3 2013/07/29 17:53:18 zmedico Exp $
31
32 # Require EAPI 2 since we now require at least python-2.6 (for python 3
33 # syntax support) which also requires EAPI 2.
34 @@ -414,9 +414,6 @@
35 chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
36 fi
37
38 - has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
39 - && WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
40 -
41 # If portage-2.1.6 is installed and the preserved_libs_registry exists,
42 # assume that the NEEDED.ELF.2 files have already been generated.
43 has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
44 @@ -473,12 +470,30 @@
45 }
46
47 pkg_postinst() {
48 - if $WORLD_MIGRATION_UPGRADE && \
49 - grep -q "^@" "${EROOT}/var/lib/portage/world"; then
50 - einfo "moving set references from the worldfile into world_sets"
51 - cd "${EROOT}/var/lib/portage/"
52 - grep "^@" world >> world_sets
53 - sed -i -e '/^@/d' world
54 +
55 + if ${REPOS_CONF_UPGRADE} ; then
56 + einfo "Generating repos.conf"
57 + local repo_name=
58 + [[ -f ${PORTDIR}/profiles/repo_name ]] && \
59 + repo_name=$(< "${PORTDIR}/profiles/repo_name")
60 + if [[ -z ${REPOS_CONF_SYNC} ]] ; then
61 + REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT}/usr/share/portage/config/repos.conf")
62 + REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
63 + fi
64 + cat <<-EOF > "${T}/repos.conf"
65 + [DEFAULT]
66 + main-repo = ${repo_name:-gentoo}
67 +
68 + [${repo_name:-gentoo}]
69 + location = ${PORTDIR:-${EPREFIX}/usr/portage}
70 + sync-type = rsync
71 + sync-uri = ${REPOS_CONF_SYNC}
72 + EOF
73 + local dest=${EROOT}/etc/portage/repos.conf
74 + if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
75 + dest=${EROOT}/etc/portage/repos.conf/${repo_name:-gentoo}.conf
76 + fi
77 + mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
78 fi
79
80 if ${NEEDED_REBUILD_UPGRADE} ; then
81 @@ -497,15 +512,6 @@
82 fi
83
84 local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
85 - if ${USERPRIV_UPGRADE} && \
86 - [[ -d ${distdir} && -w ${distdir} ]] ; then
87 - local ownership=$(get_ownership "${distdir}")
88 - if [[ ${ownership#*:} == portage ]] ; then
89 - einfo "Adjusting DISTDIR permissions for userpriv"
90 - find "${distdir}" -maxdepth 1 -type d -uid 0 \
91 - -exec chown -R portage:portage {} +
92 - fi
93 - fi
94
95 if ${USERSYNC_UPGRADE} && \
96 [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
97 @@ -518,28 +524,16 @@
98 fi
99 fi
100
101 - if ${REPOS_CONF_UPGRADE} ; then
102 - einfo "Generating repos.conf"
103 - local repo_name=
104 - [[ -f ${PORTDIR}/profiles/repo_name ]] && \
105 - repo_name=$(< "${PORTDIR}/profiles/repo_name")
106 - if [[ -z ${REPOS_CONF_SYNC} ]] ; then
107 - REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT}/usr/share/portage/config/repos.conf")
108 - REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
109 - fi
110 - cat <<-EOF > "${T}/repos.conf"
111 - [DEFAULT]
112 - main-repo = ${repo_name:-gentoo}
113 -
114 - [${repo_name:-gentoo}]
115 - location = ${PORTDIR:-${EPREFIX}/usr/portage}
116 - sync-type = rsync
117 - sync-uri = ${REPOS_CONF_SYNC}
118 - EOF
119 - local dest=${EROOT}/etc/portage/repos.conf
120 - if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
121 - dest=${EROOT}/etc/portage/repos.conf/${repo_name:-gentoo}.conf
122 + # Do this last, since it could take a long time if there
123 + # are lots of live sources, and the user may be tempted
124 + # to kill emerge while it is running.
125 + if ${USERPRIV_UPGRADE} && \
126 + [[ -d ${distdir} && -w ${distdir} ]] ; then
127 + local ownership=$(get_ownership "${distdir}")
128 + if [[ ${ownership#*:} == portage ]] ; then
129 + einfo "Adjusting DISTDIR permissions for userpriv"
130 + find "${distdir}" -maxdepth 1 -type d -uid 0 \
131 + -exec chown -R portage:portage {} +
132 fi
133 - mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
134 fi
135 }
136
137
138
139 1.3 sys-apps/portage/portage-2.1.13.1.ebuild
140
141 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.13.1.ebuild?rev=1.3&view=markup
142 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.13.1.ebuild?rev=1.3&content-type=text/plain
143 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.13.1.ebuild?r1=1.2&r2=1.3
144
145 Index: portage-2.1.13.1.ebuild
146 ===================================================================
147 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.13.1.ebuild,v
148 retrieving revision 1.2
149 retrieving revision 1.3
150 diff -u -r1.2 -r1.3
151 --- portage-2.1.13.1.ebuild 28 Jul 2013 09:21:49 -0000 1.2
152 +++ portage-2.1.13.1.ebuild 29 Jul 2013 17:53:18 -0000 1.3
153 @@ -1,6 +1,6 @@
154 # Copyright 1999-2013 Gentoo Foundation
155 # Distributed under the terms of the GNU General Public License v2
156 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.13.1.ebuild,v 1.2 2013/07/28 09:21:49 mgorny Exp $
157 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.13.1.ebuild,v 1.3 2013/07/29 17:53:18 zmedico Exp $
158
159 # Require EAPI 2 since we now require at least python-2.6 (for python 3
160 # syntax support) which also requires EAPI 2.
161 @@ -447,6 +447,32 @@
162 }
163
164 pkg_postinst() {
165 +
166 + if ${REPOS_CONF_UPGRADE} ; then
167 + einfo "Generating repos.conf"
168 + local repo_name=
169 + [[ -f ${PORTDIR}/profiles/repo_name ]] && \
170 + repo_name=$(< "${PORTDIR}/profiles/repo_name")
171 + if [[ -z ${REPOS_CONF_SYNC} ]] ; then
172 + REPOS_CONF_SYNC=$(grep "^sync-uri =" "${ROOT}/usr/share/portage/config/repos.conf")
173 + REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
174 + fi
175 + cat <<-EOF > "${T}/repos.conf"
176 + [DEFAULT]
177 + main-repo = ${repo_name:-gentoo}
178 +
179 + [${repo_name:-gentoo}]
180 + location = ${PORTDIR:-/usr/portage}
181 + sync-type = rsync
182 + sync-uri = ${REPOS_CONF_SYNC}
183 + EOF
184 + local dest=${ROOT}/etc/portage/repos.conf
185 + if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
186 + dest=${ROOT}/etc/portage/repos.conf/${repo_name:-gentoo}.conf
187 + fi
188 + mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
189 + fi
190 +
191 if ${NEEDED_REBUILD_UPGRADE} ; then
192 einfo "rebuilding NEEDED.ELF.2 files"
193 local cpv filename line newline
194 @@ -463,15 +489,6 @@
195 fi
196
197 local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
198 - if ${USERPRIV_UPGRADE} && \
199 - [[ -d ${distdir} && -w ${distdir} ]] ; then
200 - local ownership=$(get_ownership "${distdir}")
201 - if [[ ${ownership#*:} == portage ]] ; then
202 - einfo "Adjusting DISTDIR permissions for userpriv"
203 - find "${distdir}" -maxdepth 1 -type d -uid 0 \
204 - -exec chown -R portage:portage {} +
205 - fi
206 - fi
207
208 if ${USERSYNC_UPGRADE} && \
209 [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
210 @@ -484,28 +501,16 @@
211 fi
212 fi
213
214 - if ${REPOS_CONF_UPGRADE} ; then
215 - einfo "Generating repos.conf"
216 - local repo_name=
217 - [[ -f ${PORTDIR}/profiles/repo_name ]] && \
218 - repo_name=$(< "${PORTDIR}/profiles/repo_name")
219 - if [[ -z ${REPOS_CONF_SYNC} ]] ; then
220 - REPOS_CONF_SYNC=$(grep "^sync-uri =" "${ROOT}/usr/share/portage/config/repos.conf")
221 - REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
222 - fi
223 - cat <<-EOF > "${T}/repos.conf"
224 - [DEFAULT]
225 - main-repo = ${repo_name:-gentoo}
226 -
227 - [${repo_name:-gentoo}]
228 - location = ${PORTDIR:-/usr/portage}
229 - sync-type = rsync
230 - sync-uri = ${REPOS_CONF_SYNC}
231 - EOF
232 - local dest=${ROOT}/etc/portage/repos.conf
233 - if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
234 - dest=${ROOT}/etc/portage/repos.conf/${repo_name:-gentoo}.conf
235 + # Do this last, since it could take a long time if there
236 + # are lots of live sources, and the user may be tempted
237 + # to kill emerge while it is running.
238 + if ${USERPRIV_UPGRADE} && \
239 + [[ -d ${distdir} && -w ${distdir} ]] ; then
240 + local ownership=$(get_ownership "${distdir}")
241 + if [[ ${ownership#*:} == portage ]] ; then
242 + einfo "Adjusting DISTDIR permissions for userpriv"
243 + find "${distdir}" -maxdepth 1 -type d -uid 0 \
244 + -exec chown -R portage:portage {} +
245 fi
246 - mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
247 fi
248 }
249
250
251
252 1.1323 sys-apps/portage/ChangeLog
253
254 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1323&view=markup
255 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1323&content-type=text/plain
256 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1322&r2=1.1323
257
258 Index: ChangeLog
259 ===================================================================
260 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
261 retrieving revision 1.1322
262 retrieving revision 1.1323
263 diff -u -r1.1322 -r1.1323
264 --- ChangeLog 28 Jul 2013 09:21:49 -0000 1.1322
265 +++ ChangeLog 29 Jul 2013 17:53:18 -0000 1.1323
266 @@ -1,6 +1,11 @@
267 # ChangeLog for sys-apps/portage
268 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
269 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1322 2013/07/28 09:21:49 mgorny Exp $
270 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1323 2013/07/29 17:53:18 zmedico Exp $
271 +
272 + 29 Jul 2013; Zac Medico <zmedico@g.o> portage-2.1.13.1.ebuild,
273 + portage-2.2.0_alpha190.ebuild:
274 + Adjust DISTDIR permissions last in pkg_postinst, in case the user is tempted
275 + to kill it. Also remove obsolete WORLD_MIGRATION_UPGRADE code.
276
277 28 Jul 2013; Michał Górny <mgorny@g.o> portage-2.1.11.62.ebuild,
278 portage-2.1.12.13.ebuild, portage-2.1.12.2.ebuild, portage-2.1.13.1.ebuild,
Report Message
Find on MARC Find on Google Groups