* [gentoo-commits] gentoo-x86 commit in sys-apps/portage: ChangeLog portage-2.1.7.17.ebuild portage-2.1.7.16.ebuild
@ 2010-02-10 0:49 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2010-02-10 0:49 UTC (permalink / raw
To: gentoo-commits
zmedico 10/02/10 00:49:50
Modified: ChangeLog portage-2.1.7.17.ebuild
portage-2.1.7.16.ebuild
Log:
Bug #303211 - Add a ewarn message for people upgrading with PORTAGE_BINHOST set.
(Portage version: 2.2_rc62_p15331/cvs/Linux i686)
Revision Changes Path
1.671 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.671&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.671&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.670&r2=1.671
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.670
retrieving revision 1.671
diff -u -r1.670 -r1.671
--- ChangeLog 7 Feb 2010 02:11:42 -0000 1.670
+++ ChangeLog 10 Feb 2010 00:49:49 -0000 1.671
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.670 2010/02/07 02:11:42 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.671 2010/02/10 00:49:49 zmedico Exp $
+
+ 10 Feb 2010; Zac Medico <zmedico@gentoo.org> portage-2.1.7.16.ebuild,
+ portage-2.1.7.17.ebuild:
+ Bug #303211 - Add a ewarn message for people upgrading with
+ PORTAGE_BINHOST set.
07 Feb 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
portage-2.1.7.17.ebuild, portage-2.2_rc62.ebuild:
1.3 sys-apps/portage/portage-2.1.7.17.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild?rev=1.3&view=markup
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
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild?r1=1.2&r2=1.3
Index: portage-2.1.7.17.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- portage-2.1.7.17.ebuild 7 Feb 2010 02:11:42 -0000 1.2
+++ portage-2.1.7.17.ebuild 10 Feb 2010 00:49:49 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -273,6 +273,8 @@
[[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12"
REPO_LAYOUT_CONF_WARN=$?
+ has_version "<${CATEGORY}/${PN}-2.1.7"
+ UPGRADE_FROM_2_1=$?
}
pkg_postinst() {
@@ -280,6 +282,7 @@
# will be identified and removed in postrm.
python_mod_optimize /usr/$(get_libdir)/portage/pym
+ local warning_shown=0
if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then
ewarn
echo "If you want overlay eclasses to override eclasses from" \
@@ -287,7 +290,23 @@
"for information about the new layout.conf and repos.conf" \
"configuration files." \
| fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
+ fi
+ if [[ $UPGRADE_FROM_2_1 = 0 && -n $PORTAGE_BINHOST ]] ; then
ewarn
+ echo "If you have an old PORTAGE_BINHOST setting in /etc/make.conf" \
+ "then you will encounter bug #303211. Therefore, please ensure" \
+ "that your PORTAGE_BINHOST setting points to a remote directory" \
+ "containing a \$PKGDIR/Packages file which is created by" \
+ ">=portage-2.1.6. If \$PKGDIR/Packages does not exist on" \
+ "the server or it is incomplete, you must run \`emaint" \
+ "--fix binhost\` on the server in order to generate it." \
+ "See \`man make.conf\` for more information about" \
+ "PORTAGE_BINHOST." | \
+ fmt -w 70 | while read -r ; do ewarn "$REPLY" ; done
+ warning_shown=1
+ fi
+ if [ $warning_shown = 1 ] ; then
+ ewarn # for symmetry
fi
einfo
1.7 sys-apps/portage/portage-2.1.7.16.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.7.16.ebuild?rev=1.7&view=markup
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
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.7.16.ebuild?r1=1.6&r2=1.7
Index: portage-2.1.7.16.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.16.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- portage-2.1.7.16.ebuild 26 Jan 2010 16:16:03 -0000 1.6
+++ portage-2.1.7.16.ebuild 10 Feb 2010 00:49:49 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -269,6 +269,8 @@
[[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12"
REPO_LAYOUT_CONF_WARN=$?
+ has_version "<${CATEGORY}/${PN}-2.1.7"
+ UPGRADE_FROM_2_1=$?
}
pkg_postinst() {
@@ -276,6 +278,7 @@
# will be identified and removed in postrm.
python_mod_optimize /usr/$(get_libdir)/portage/pym
+ local warning_shown=0
if [ $REPO_LAYOUT_CONF_WARN = 0 ] ; then
ewarn
echo "If you want overlay eclasses to override eclasses from" \
@@ -283,7 +286,23 @@
"for information about the new layout.conf and repos.conf" \
"configuration files." \
| fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
+ fi
+ if [[ $UPGRADE_FROM_2_1 = 0 && -n $PORTAGE_BINHOST ]] ; then
ewarn
+ echo "If you have an old PORTAGE_BINHOST setting in /etc/make.conf" \
+ "then you will encounter bug #303211. Therefore, please ensure" \
+ "that your PORTAGE_BINHOST setting points to a remote directory" \
+ "containing a \$PKGDIR/Packages file which is created by" \
+ ">=portage-2.1.6. If \$PKGDIR/Packages does not exist on" \
+ "the server or it is incomplete, you must run \`emaint" \
+ "--fix binhost\` on the server in order to generate it." \
+ "See \`man make.conf\` for more information about" \
+ "PORTAGE_BINHOST." | \
+ fmt -w 70 | while read -r ; do ewarn "$REPLY" ; done
+ warning_shown=1
+ fi
+ if [ $warning_shown = 1 ] ; then
+ ewarn # for symmetry
fi
einfo
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-02-10 0:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-10 0:49 [gentoo-commits] gentoo-x86 commit in sys-apps/portage: ChangeLog portage-2.1.7.17.ebuild portage-2.1.7.16.ebuild Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox