Fix rsync mirror selection, bug 312753, thanks to Donald Wallace Rouse II <gentoo...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-portage/mirrorselect/ChangeLog b/app-portage/mirrorselect/ChangeLog
index 7bd1fdee7c116a9ebbdd3bd6bdd8772f756a654b..26dab9986723dc09febaf16aa96d965b72bfa28e 100644 (file)
--- a/app-portage/mirrorselect/ChangeLog
+++ b/app-portage/mirrorselect/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-portage/mirrorselect
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/ChangeLog,v 1.88 2009/12/08 04:53:44 idl0r Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/ChangeLog,v 1.89 2010/04/02 14:57:43 idl0r Exp $
+
+*mirrorselect-2.1.0-r1 (02 Apr 2010)
+
+  02 Apr 2010; Christian Ruppert <idl0r@gentoo.org>
+  +files/0001-Fix-rsync-mirror-selectection.patch,
+  -mirrorselect-2.1.0.ebuild, +mirrorselect-2.1.0-r1.ebuild:
+  Fix rsync mirror selection, bug 312753, thanks to Donald Wallace Rouse II
+  <gentoo-user-0d329vjsd8@dwr2.org>
 
 *mirrorselect-2.1.0 (08 Dec 2009)
 

diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index 7c83c65884a77a6617dcee1b775fd90403c2ffc8..6ccb9b1a957bc15934fa261506106e9044cc228f 100644 (file)
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0001-Fix-rsync-mirror-selectection.patch 927 RMD160 8a8fc496a9d8cf3e8f2682559418946669def7e0 SHA1 d0a4f0b6e999b31aa25f71bb2074905c1dd3abd8 SHA256 e49678f6a94698959b3739e44b8dd83146964a6b52b1451b8776bc7c52dd963a
 DIST mirrorselect-2.0.0.tar.bz2 9857 RMD160 ee12bcac73524e1c23ec9b29f05c4bf0a000c478 SHA1 bdbf283ca3b5671b1f0eb6e3538443ccbd55cc29 SHA256 2fae88db999d6e3cf596e784dbf49f88383a7c25173087a7e4b4130e90e30914
 DIST mirrorselect-2.1.0.tar.bz2 9282 RMD160 801c6e587c5a7de2df11485605ee97d149d80382 SHA1 4605059abe84fb02229c6e975bc7188b9649190d SHA256 cbff801e561aa1466feaf27a6182f90012afba9590fb91d87289629d54207816
 EBUILD mirrorselect-2.0.0.ebuild 913 RMD160 b723ac32bdc2648f0c8105254a2044fbe220eb96 SHA1 125797acd0cbd104dc66cfd9f6eebd5f0a3c9368 SHA256 809457f7e05fbfc7dedec79c58a4fb60d5edbcf5714e45c7bb223d4930174b81
-EBUILD mirrorselect-2.1.0.ebuild 923 RMD160 ce6d4c49c0a568b24bfdabb40f3ac53ea1e4fdd9 SHA1 be412110c87bf46b251c7ceb7296aa39553ae37c SHA256 e236b8cc1992b63f7b7be04e74a68ad8bd115e78849097d28468369aa0a5142d
-MISC ChangeLog 16373 RMD160 b60a5a2789408fdf3b63a02595f0c47bad0120e9 SHA1 ecbdacb772ada2d4be8606b0072b9adf296bea52 SHA256 5717e38d66176048de7de8c91f2121fc409a9889fff14d81c455c4f8b7567405
+EBUILD mirrorselect-2.1.0-r1.ebuild 1029 RMD160 145134d2f782e4017e6f3efe2e190e59e57f0fcb SHA1 1d259ff5eb767e83a4ecb61ecd6984619b063469 SHA256 769282e7498ebdb128bfbbd801b16ac9523aa2a7e38292828ca73de41cff0f03
+MISC ChangeLog 16688 RMD160 4e5c46754a5dd6190575788c6dae844241a3c0d9 SHA1 3dceb4e918474c68961a8fd06fa498a4ec4a17a1 SHA256 c1cce0ce96f36d22b414da8a2c00dc809ed9ff4954a132fb6f9e15bb0234b065
 MISC metadata.xml 371 RMD160 7686cf209900b1199d4a7d6990443d1b0c7396be SHA1 144d37ab108893578ef1a3f41159bc6842412fe8 SHA256 17394aa4850b9c997c49e9f18969992d65f5ec1a03e47a743230395fbc2a2595
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAksd2+QACgkQixe2jn+ufTjIdwCfdZA0rMliAB/ODjR8ocH4huLB
-hOoAmQGKkInV6vM3lzBqGYlQDeHOdK20
-=kRg8
+iEYEARECAAYFAku2BfIACgkQixe2jn+ufTh3XwCfd9O4w1HItnuWXQnQk1FEdCl3
+ctQAn3Thb+lSRlTrzp231UP+bZrBvQ5L
+=gi/+
 -----END PGP SIGNATURE-----

diff --git a/app-portage/mirrorselect/files/0001-Fix-rsync-mirror-selectection.patch b/app-portage/mirrorselect/files/0001-Fix-rsync-mirror-selectection.patch
new file mode 100644 (file)
index 0000000..a612ffe
--- /dev/null
+++ b/app-portage/mirrorselect/files/0001-Fix-rsync-mirror-selectection.patch
@@ -0,0 +1,27 @@
+From daad8a5e5ea2dac503513f6ab114184dd427db01 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Fri, 2 Apr 2010 16:44:14 +0200
+Subject: [PATCH] Fix rsync mirror selectection
+
+Append /gentoo-portage to the rsync mirror url if necessary, bug 312753,
+          thanks to Donald Wallace Rouse II <gentoo-user-0d329vjsd8@dwr2.org>
+---
+ main.py |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/main.py b/main.py
+index 367e8d4..dd3386e 100755
+--- a/main.py
++++ b/main.py
+@@ -608,6 +608,8 @@ class Interactive(object):
+ 
+               for (url, args) in sorted(hosts, key = lambda x: (x[1]['country'].lower(), x[1]['name'].lower()) ):
+                       marker = ""
++                      if options.rsync and not url.endswith("/gentoo-portage"):
++                              url+="/gentoo-portage"
+                       if (not options.ipv6 and not options.ipv4) and args['ipv6'] == 'y':
+                               marker = "* "
+                       if options.ipv6 and ( args['ipv6'] == 'n' ): continue
+-- 
+1.7.0.4
+

diff --git a/app-portage/mirrorselect/mirrorselect-2.1.0.ebuild b/app-portage/mirrorselect/mirrorselect-2.1.0-r1.ebuild
similarity index 78%
rename from app-portage/mirrorselect/mirrorselect-2.1.0.ebuild
rename to app-portage/mirrorselect/mirrorselect-2.1.0-r1.ebuild
index f23e3547f51d85d52aa1156c8cbec21ff37975a2..77d5d27c36fc925108053d00a386b07211668d3d 100644 (file)
--- a/app-portage/mirrorselect/mirrorselect-2.1.0.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.1.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-2.1.0.ebuild,v 1.1 2009/12/08 04:53:44 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-2.1.0-r1.ebuild,v 1.1 2010/04/02 14:57:43 idl0r Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
 
-inherit python
+inherit eutils python
 
 DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
 HOMEPAGE="http://www.gentoo.org/"
@@ -22,6 +22,11 @@ RDEPEND="dev-lang/python[xml]
 
 RESTRICT_PYTHON_ABIS="3*"
 
+src_prepare() {
+       # bug 312753
+       epatch "${FILESDIR}/0001-Fix-rsync-mirror-selectection.patch"
+}
+
 src_install() {
        newsbin main.py ${PN} || die