| 1 |
zmedico 09/07/02 08:20:11 |
| 2 |
|
| 3 |
Modified: ChangeLog portage-2.1.6.13.ebuild |
| 4 |
Log: |
| 5 |
02 Jul 2009; Zac Medico <zmedico@g.o> portage-2.1.6.13.ebuild: |
| 6 |
Bug #275442 - Refer to make.conf.example in the message about FETCHCOMMAND |
| 7 |
and RESUMECOMMAND. Also, only show this message when a relevant setting |
| 8 |
is found in make.conf. |
| 9 |
(Portage version: 2.2_rc33_p13754/cvs/Linux i686) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.616 sys-apps/portage/ChangeLog |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.616&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.616&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.615&r2=1.616 |
| 17 |
|
| 18 |
Index: ChangeLog |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v |
| 21 |
retrieving revision 1.615 |
| 22 |
retrieving revision 1.616 |
| 23 |
diff -u -r1.615 -r1.616 |
| 24 |
--- ChangeLog 19 Jun 2009 21:57:25 -0000 1.615 |
| 25 |
+++ ChangeLog 2 Jul 2009 08:20:10 -0000 1.616 |
| 26 |
@@ -1,6 +1,11 @@ |
| 27 |
# ChangeLog for sys-apps/portage |
| 28 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.615 2009/06/19 21:57:25 robbat2 Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.616 2009/07/02 08:20:10 zmedico Exp $ |
| 31 |
+ |
| 32 |
+ 02 Jul 2009; Zac Medico <zmedico@g.o> portage-2.1.6.13.ebuild: |
| 33 |
+ Bug #275442 - Refer to make.conf.example in the message about FETCHCOMMAND |
| 34 |
+ and RESUMECOMMAND. Also, only show this message when a relevant setting |
| 35 |
+ is found in make.conf. |
| 36 |
|
| 37 |
19 Jun 2009; Robin H. Johnson <robbat2@g.o> Manifest: |
| 38 |
Redigest for missing pass. |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.9 sys-apps/portage/portage-2.1.6.13.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.6.13.ebuild?rev=1.9&view=markup |
| 45 |
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 |
| 46 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.6.13.ebuild?r1=1.8&r2=1.9 |
| 47 |
|
| 48 |
Index: portage-2.1.6.13.ebuild |
| 49 |
=================================================================== |
| 50 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.13.ebuild,v |
| 51 |
retrieving revision 1.8 |
| 52 |
retrieving revision 1.9 |
| 53 |
diff -u -r1.8 -r1.9 |
| 54 |
--- portage-2.1.6.13.ebuild 19 Jun 2009 21:12:56 -0000 1.8 |
| 55 |
+++ portage-2.1.6.13.ebuild 2 Jul 2009 08:20:11 -0000 1.9 |
| 56 |
@@ -1,6 +1,6 @@ |
| 57 |
# Copyright 1999-2009 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
-# $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 $ |
| 60 |
+# $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 $ |
| 61 |
|
| 62 |
inherit eutils multilib python |
| 63 |
|
| 64 |
@@ -286,13 +286,18 @@ |
| 65 |
"disable collision protection completely (not recommended), then" \ |
| 66 |
"you need to ensure that neither protect-owned nor collision-protect" \ |
| 67 |
"are enabled." | fmt -w 70 | while read -r ; do ewarn "$REPLY" ; done |
| 68 |
- ewarn |
| 69 |
- echo "If you have overridden FETCHCOMMAND or RESUMECOMMAND variables," \ |
| 70 |
- "for compatibility with EAPI 2, you must ensure that these variables" \ |
| 71 |
- "are written such that the downloaded file will be placed at" \ |
| 72 |
- "\\\"\\\${DISTDIR}/\\\${FILE}\\\". Refer to make.conf(5) for" \ |
| 73 |
- "information about FETCHCOMMAND and RESUMECOMMAND." | \ |
| 74 |
- fmt -w 70 | while read -r ; do ewarn "$REPLY" ; done |
| 75 |
+ if [ -n "$(egrep '^(FETCH|RESUME)COMMAND=' "$ROOT"etc/make.conf | \ |
| 76 |
+ grep -v '${FILE}')" ] ; then |
| 77 |
+ ewarn |
| 78 |
+ echo "If you have overridden FETCHCOMMAND or RESUMECOMMAND" \ |
| 79 |
+ "variables, for compatibility with EAPI 2, you must ensure" \ |
| 80 |
+ "that these variables are written such that the downloaded" \ |
| 81 |
+ "file will be placed at \\\"\\\${DISTDIR}/\\\${FILE}\\\"." \ |
| 82 |
+ "See the examples in /usr/share/portage/config/make.conf.example" \ |
| 83 |
+ "and refer to make.conf(5) for more information about" \ |
| 84 |
+ "FETCHCOMMAND and RESUMECOMMAND." | \ |
| 85 |
+ fmt -w 70 | while read -r ; do ewarn "$REPLY" ; done |
| 86 |
+ fi |
| 87 |
warning_shown=1 |
| 88 |
fi |
| 89 |
if [ $warning_shown = 1 ] ; then |
Archives