commit: c22df0b2b350dc2732e61b4436696e689af40f51 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Mar 11 04:02:20 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Mar 11 04:02:20 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c22df0b2
app-portage/mirrorselect: backport --mirrors fix to stable We don't want to hurry stabling >=2.6.0 so just backport the fix instead. Bug: https://bugs.gentoo.org/970947 Signed-off-by: Sam James <sam <AT> gentoo.org> ...01-Revert-main-default-servers-to-3-not-1.patch | 55 ++++++++++++++++++++++ ...t-2.5.4.ebuild => mirrorselect-2.5.4-r1.ebuild} | 4 ++ 2 files changed, 59 insertions(+) diff --git a/app-portage/mirrorselect/files/0001-Revert-main-default-servers-to-3-not-1.patch b/app-portage/mirrorselect/files/0001-Revert-main-default-servers-to-3-not-1.patch new file mode 100644 index 000000000000..95268565140b --- /dev/null +++ b/app-portage/mirrorselect/files/0001-Revert-main-default-servers-to-3-not-1.patch @@ -0,0 +1,55 @@ +From 242b8cc772422bb6970cfe6fed613a94696dd40b Mon Sep 17 00:00:00 2001 +Message-ID: <242b8cc772422bb6970cfe6fed613a94696dd40b.1773201665.git....@gentoo.org> +From: Sam James <[email protected]> +Date: Wed, 11 Mar 2026 03:52:42 +0000 +Subject: [PATCH] Revert "main: default --servers to 3, not 1" + +This reverts commit b6625dd5b417bd7a04693e5592f87cbb81d6ddf4. + +I didn't adjust an if statement which checks to see if the value +of servers is 1 (as a proxy for default). Just revert it now to +unbreak things. + +I've filed bug #971076 for implementing this again properly. + +Bug: https://bugs.gentoo.org/971076 +Closes: https://bugs.gentoo.org/970947 +Signed-off-by: Sam James <[email protected]> +--- + mirrorselect.8 | 2 +- + mirrorselect/main.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mirrorselect.8 b/mirrorselect.8 +index 3c5af33..49caadd 100644 +--- a/mirrorselect.8 ++++ b/mirrorselect.8 +@@ -95,7 +95,7 @@ Quiet mode. + .TP + .BI \-s " SERVERS " "\fR,\fP \-servers" " SERVERS " + Specify Number of servers for Automatic Mode to select. this is only valid for +-download mirrors. If this is not specified, a default of 3 is used. ++download mirrors. If this is not specified, a default of 1 is used. + .TP + .BI \-t " TIMEOUT " "\fR,\fP \-timeout" " TIMEOUT " + Timeout for deep mode. Defaults to 10 seconds. +diff --git a/mirrorselect/main.py b/mirrorselect/main.py +index 3a418a7..b6186a0 100755 +--- a/mirrorselect/main.py ++++ b/mirrorselect/main.py +@@ -310,10 +310,10 @@ class MirrorSelect: + action="callback", + callback=set_servers, + type="int", +- default=3, ++ default=1, + help="Specify Number of servers for Automatic Mode " + "to select. this is only valid for download mirrors. " +- "If this is not specified, a default of 3 is used.", ++ "If this is not specified, a default of 1 is used.", + ) + group.add_option( + "-t", +-- +2.53.0 + diff --git a/app-portage/mirrorselect/mirrorselect-2.5.4.ebuild b/app-portage/mirrorselect/mirrorselect-2.5.4-r1.ebuild similarity index 94% rename from app-portage/mirrorselect/mirrorselect-2.5.4.ebuild rename to app-portage/mirrorselect/mirrorselect-2.5.4-r1.ebuild index 14dbdacdfa38..b5ac8f3a0617 100644 --- a/app-portage/mirrorselect/mirrorselect-2.5.4.ebuild +++ b/app-portage/mirrorselect/mirrorselect-2.5.4-r1.ebuild @@ -35,6 +35,10 @@ RDEPEND=" dev-python/requests[${PYTHON_USEDEP}] " +PATCHES=( + "${FILESDIR}"/0001-Revert-main-default-servers-to-3-not-1.patch +) + distutils_enable_tests unittest python_prepare_all() {
