| 1 |
zmedico 13/07/30 07:01:10 |
| 2 |
|
| 3 |
Modified: portage-2.1.13.2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Tweak repos.conf logic for bug #478726. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha191/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 sys-apps/portage/portage-2.1.13.2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.13.2.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.13.2.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.13.2.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: portage-2.1.13.2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.13.2.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- portage-2.1.13.2.ebuild 30 Jul 2013 06:53:05 -0000 1.1 |
| 23 |
+++ portage-2.1.13.2.ebuild 30 Jul 2013 07:01:10 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.13.2.ebuild,v 1.1 2013/07/30 06:53:05 zmedico Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.13.2.ebuild,v 1.2 2013/07/30 07:01:10 zmedico Exp $ |
| 29 |
|
| 30 |
# Require EAPI 2 since we now require at least python-2.6 (for python 3 |
| 31 |
# syntax support) which also requires EAPI 2. |
| 32 |
@@ -470,9 +470,10 @@ |
| 33 |
if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then |
| 34 |
dest=${ROOT}/etc/portage/repos.conf/${repo_name:-gentoo}.conf |
| 35 |
fi |
| 36 |
- # Don't install the config update if the file exists, since |
| 37 |
- # users may accept it blindly (bug #478726). |
| 38 |
- [[ -e ${dest} ]] || \ |
| 39 |
+ # Don't install the config update if the desired repos.conf directory |
| 40 |
+ # and config file exist, since users may accept it blindly and break |
| 41 |
+ # their config (bug #478726). |
| 42 |
+ [[ -e ${ROOT}/etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \ |
| 43 |
mv "${T}/repos.conf" "$(new_config_protect "${dest}")" |
| 44 |
fi |
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
|
| 49 |
1.1325 sys-apps/portage/ChangeLog |
| 50 |
|
| 51 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1325&view=markup |
| 52 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.1325&content-type=text/plain |
| 53 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.1324&r2=1.1325 |
| 54 |
|
| 55 |
Index: ChangeLog |
| 56 |
=================================================================== |
| 57 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v |
| 58 |
retrieving revision 1.1324 |
| 59 |
retrieving revision 1.1325 |
| 60 |
diff -u -r1.1324 -r1.1325 |
| 61 |
--- ChangeLog 30 Jul 2013 06:53:05 -0000 1.1324 |
| 62 |
+++ ChangeLog 30 Jul 2013 07:01:10 -0000 1.1325 |
| 63 |
@@ -1,6 +1,9 @@ |
| 64 |
# ChangeLog for sys-apps/portage |
| 65 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 66 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1324 2013/07/30 06:53:05 zmedico Exp $ |
| 67 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1325 2013/07/30 07:01:10 zmedico Exp $ |
| 68 |
+ |
| 69 |
+ 30 Jul 2013; Zac Medico <zmedico@g.o> portage-2.1.13.2.ebuild: |
| 70 |
+ Tweak repos.conf logic for bug #478726. |
| 71 |
|
| 72 |
*portage-2.1.13.2 (30 Jul 2013) |
Archives