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: ChangeLog portage-2.1.7.17.ebuild portage-2.1.7.16.ebuild
Date: Wed, 10 Feb 2010 00:49:52
Message-Id: E1Nf0m6-0008PO-3E@stork.gentoo.org
1 zmedico 10/02/10 00:49:50
2
3 Modified: ChangeLog portage-2.1.7.17.ebuild
4 portage-2.1.7.16.ebuild
5 Log:
6 Bug #303211 - Add a ewarn message for people upgrading with PORTAGE_BINHOST set.
7 (Portage version: 2.2_rc62_p15331/cvs/Linux i686)
8
9 Revision Changes Path
10 1.671 sys-apps/portage/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.671&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.671&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.670&r2=1.671
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
19 retrieving revision 1.670
20 retrieving revision 1.671
21 diff -u -r1.670 -r1.671
22 --- ChangeLog 7 Feb 2010 02:11:42 -0000 1.670
23 +++ ChangeLog 10 Feb 2010 00:49:49 -0000 1.671
24 @@ -1,6 +1,11 @@
25 # ChangeLog for sys-apps/portage
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.670 2010/02/07 02:11:42 arfrever Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.671 2010/02/10 00:49:49 zmedico Exp $
29 +
30 + 10 Feb 2010; Zac Medico <zmedico@g.o> portage-2.1.7.16.ebuild,
31 + portage-2.1.7.17.ebuild:
32 + Bug #303211 - Add a ewarn message for people upgrading with
33 + PORTAGE_BINHOST set.
34
35 07 Feb 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
36 portage-2.1.7.17.ebuild, portage-2.2_rc62.ebuild:
37
38
39
40 1.3 sys-apps/portage/portage-2.1.7.17.ebuild
41
42 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild?rev=1.3&view=markup
43 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild?rev=1.3&content-type=text/plain
44 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild?r1=1.2&r2=1.3
45
46 Index: portage-2.1.7.17.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild,v
49 retrieving revision 1.2
50 retrieving revision 1.3
51 diff -u -r1.2 -r1.3
52 --- portage-2.1.7.17.ebuild 7 Feb 2010 02:11:42 -0000 1.2
53 +++ portage-2.1.7.17.ebuild 10 Feb 2010 00:49:49 -0000 1.3
54 @@ -1,6 +1,6 @@
55 # Copyright 1999-2010 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild,v 1.2 2010/02/07 02:11:42 arfrever Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild,v 1.3 2010/02/10 00:49:49 zmedico Exp $
59
60 # Require EAPI 2 since we now require at least python-2.6 (for python 3
61 # syntax support) which also requires EAPI 2.
62 @@ -273,6 +273,8 @@
63
64 [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12"
65 REPO_LAYOUT_CONF_WARN=$?
66 + has_version "<${CATEGORY}/${PN}-2.1.7"
67 + UPGRADE_FROM_2_1=$?
68 }
69
70 pkg_postinst() {
71 @@ -280,6 +282,7 @@
72 # will be identified and removed in postrm.
73 python_mod_optimize /usr/$(get_libdir)/portage/pym
74
75 + local warning_shown=0
76 if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then
77 ewarn
78 echo "If you want overlay eclasses to override eclasses from" \
79 @@ -287,7 +290,23 @@
80 "for information about the new layout.conf and repos.conf" \
81 "configuration files." \
82 | fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
83 + fi
84 + if [[ $UPGRADE_FROM_2_1 = 0 && -n $PORTAGE_BINHOST ]] ; then
85 ewarn
86 + echo "If you have an old PORTAGE_BINHOST setting in /etc/make.conf" \
87 + "then you will encounter bug #303211. Therefore, please ensure" \
88 + "that your PORTAGE_BINHOST setting points to a remote directory" \
89 + "containing a \$PKGDIR/Packages file which is created by" \
90 + ">=portage-2.1.6. If \$PKGDIR/Packages does not exist on" \
91 + "the server or it is incomplete, you must run \`emaint" \
92 + "--fix binhost\` on the server in order to generate it." \
93 + "See \`man make.conf\` for more information about" \
94 + "PORTAGE_BINHOST." | \
95 + fmt -w 70 | while read -r ; do ewarn "$REPLY" ; done
96 + warning_shown=1
97 + fi
98 + if [ $warning_shown = 1 ] ; then
99 + ewarn # for symmetry
100 fi
101
102 einfo
103
104
105
106 1.7 sys-apps/portage/portage-2.1.7.16.ebuild
107
108 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.7.16.ebuild?rev=1.7&view=markup
109 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.7.16.ebuild?rev=1.7&content-type=text/plain
110 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.7.16.ebuild?r1=1.6&r2=1.7
111
112 Index: portage-2.1.7.16.ebuild
113 ===================================================================
114 RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.16.ebuild,v
115 retrieving revision 1.6
116 retrieving revision 1.7
117 diff -u -r1.6 -r1.7
118 --- portage-2.1.7.16.ebuild 26 Jan 2010 16:16:03 -0000 1.6
119 +++ portage-2.1.7.16.ebuild 10 Feb 2010 00:49:49 -0000 1.7
120 @@ -1,6 +1,6 @@
121 # Copyright 1999-2010 Gentoo Foundation
122 # Distributed under the terms of the GNU General Public License v2
123 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.16.ebuild,v 1.6 2010/01/26 16:16:03 darkside Exp $
124 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.16.ebuild,v 1.7 2010/02/10 00:49:49 zmedico Exp $
125
126 # Require EAPI 2 since we now require at least python-2.6 (for python 3
127 # syntax support) which also requires EAPI 2.
128 @@ -269,6 +269,8 @@
129
130 [[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12"
131 REPO_LAYOUT_CONF_WARN=$?
132 + has_version "<${CATEGORY}/${PN}-2.1.7"
133 + UPGRADE_FROM_2_1=$?
134 }
135
136 pkg_postinst() {
137 @@ -276,6 +278,7 @@
138 # will be identified and removed in postrm.
139 python_mod_optimize /usr/$(get_libdir)/portage/pym
140
141 + local warning_shown=0
142 if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then
143 ewarn
144 echo "If you want overlay eclasses to override eclasses from" \
145 @@ -283,7 +286,23 @@
146 "for information about the new layout.conf and repos.conf" \
147 "configuration files." \
148 | fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
149 + fi
150 + if [[ $UPGRADE_FROM_2_1 = 0 && -n $PORTAGE_BINHOST ]] ; then
151 ewarn
152 + echo "If you have an old PORTAGE_BINHOST setting in /etc/make.conf" \
153 + "then you will encounter bug #303211. Therefore, please ensure" \
154 + "that your PORTAGE_BINHOST setting points to a remote directory" \
155 + "containing a \$PKGDIR/Packages file which is created by" \
156 + ">=portage-2.1.6. If \$PKGDIR/Packages does not exist on" \
157 + "the server or it is incomplete, you must run \`emaint" \
158 + "--fix binhost\` on the server in order to generate it." \
159 + "See \`man make.conf\` for more information about" \
160 + "PORTAGE_BINHOST." | \
161 + fmt -w 70 | while read -r ; do ewarn "$REPLY" ; done
162 + warning_shown=1
163 + fi
164 + if [ $warning_shown = 1 ] ; then
165 + ewarn # for symmetry
166 fi
167
168 einfo
Report Message
Find on MARC Find on Google Groups