zmedico 09/07/02 08:20:11
Modified: ChangeLog portage-2.1.6.13.ebuild
Log:
02 Jul 2009; Zac Medico <zmedico@g.o> portage-2.1.6.13.ebuild:
Bug #275442 - Refer to make.conf.example in the message about FETCHCOMMAND
and RESUMECOMMAND. Also, only show this message when a relevant setting
is found in make.conf.
(Portage version: 2.2_rc33_p13754/cvs/Linux i686)
Revision Changes Path
1.616 sys-apps/portage/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.616&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.616&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.615&r2=1.616
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.615
retrieving revision 1.616
diff -u -r1.615 -r1.616
--- ChangeLog 19 Jun 2009 21:57:25 -0000 1.615
+++ ChangeLog 2 Jul 2009 08:20:10 -0000 1.616
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.615 2009/06/19 21:57:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.616 2009/07/02 08:20:10 zmedico Exp $
+
+ 02 Jul 2009; Zac Medico <zmedico@g.o> portage-2.1.6.13.ebuild:
+ Bug #275442 - Refer to make.conf.example in the message about FETCHCOMMAND
+ and RESUMECOMMAND. Also, only show this message when a relevant setting
+ is found in make.conf.
19 Jun 2009; Robin H. Johnson <robbat2@g.o> Manifest:
Redigest for missing pass.
1.9 sys-apps/portage/portage-2.1.6.13.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.6.13.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.6.13.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.6.13.ebuild?r1=1.8&r2=1.9
Index: portage-2.1.6.13.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.13.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- portage-2.1.6.13.ebuild 19 Jun 2009 21:12:56 -0000 1.8
+++ portage-2.1.6.13.ebuild 2 Jul 2009 08:20:11 -0000 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.13.ebuild,v 1.8 2009/06/19 21:12:56 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.13.ebuild,v 1.9 2009/07/02 08:20:11 zmedico Exp $
inherit eutils multilib python
@@ -286,13 +286,18 @@
"disable collision protection completely (not recommended), then" \
"you need to ensure that neither protect-owned nor collision-protect" \
"are enabled." | fmt -w 70 | while read -r ; do ewarn "$REPLY" ; done
- ewarn
- echo "If you have overridden FETCHCOMMAND or RESUMECOMMAND variables," \
- "for compatibility with EAPI 2, you must ensure that these variables" \
- "are written such that the downloaded file will be placed at" \
- "\\\"\\\${DISTDIR}/\\\${FILE}\\\". Refer to make.conf(5) for" \
- "information about FETCHCOMMAND and RESUMECOMMAND." | \
- fmt -w 70 | while read -r ; do ewarn "$REPLY" ; done
+ if [ -n "$(egrep '^(FETCH|RESUME)COMMAND=' "$ROOT"etc/make.conf | \
+ grep -v '${FILE}')" ] ; then
+ ewarn
+ echo "If you have overridden FETCHCOMMAND or RESUMECOMMAND" \
+ "variables, for compatibility with EAPI 2, you must ensure" \
+ "that these variables are written such that the downloaded" \
+ "file will be placed at \\\"\\\${DISTDIR}/\\\${FILE}\\\"." \
+ "See the examples in /usr/share/portage/config/make.conf.example" \
+ "and refer to make.conf(5) for more information about" \
+ "FETCHCOMMAND and RESUMECOMMAND." | \
+ fmt -w 70 | while read -r ; do ewarn "$REPLY" ; done
+ fi
warning_shown=1
fi
if [ $warning_shown = 1 ] ; then
|
