commit: 3d4f9a5d6dd378674a9aae29371fd09746fe00d7 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sat Jul 8 08:48:53 2023 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sat Jul 8 18:05:43 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d4f9a5d
app-portage/mirrorselect: remove unused patch Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/31798 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> ...rselect-2.3.0-main-Fix-all-option-parsing.patch | 48 ---------------------- 1 file changed, 48 deletions(-) diff --git a/app-portage/mirrorselect/files/mirrorselect-2.3.0-main-Fix-all-option-parsing.patch b/app-portage/mirrorselect/files/mirrorselect-2.3.0-main-Fix-all-option-parsing.patch deleted file mode 100644 index 0d0462c64752..000000000000 --- a/app-portage/mirrorselect/files/mirrorselect-2.3.0-main-Fix-all-option-parsing.patch +++ /dev/null @@ -1,48 +0,0 @@ -From e0fbc2fb33762211aa5e64175d525e66f4c257d4 Mon Sep 17 00:00:00 2001 -From: Sam James <[email protected]> -Date: Thu, 6 Jul 2023 09:04:42 +0100 -Subject: [PATCH] main: Fix --all option parsing - -Avoid --all erroring out with "ERROR: Choose at most one of -s or -a". - -Bug: https://bugs.gentoo.org/872218 -Fixes: 7caac017833b01e13028658effc502430c56d770 -Thanks-to: <[email protected]> -Signed-off-by: Sam James <[email protected]> ---- a/mirrorselect/main.py -+++ b/mirrorselect/main.py -@@ -145,6 +145,11 @@ class MirrorSelect(object): - self.output.white(" interactive:"), - " # mirrorselect -i -r", - )) -+ -+ def set_servers(option, opt_str, value, parser): -+ set_servers.user_configured = True -+ setattr(parser.values, option.dest, value) -+ - parser = OptionParser( - formatter=ColoredFormatter(self.output), description=desc, - version='Mirrorselect version: %s' % version) -@@ -236,8 +241,8 @@ class MirrorSelect(object): - "-q", "--quiet", action="store_const", const=0, dest="verbosity", - help="Quiet mode") - group.add_option( -- "-s", "--servers", action="store", type="int", default=1, -- help="Specify Number of servers for Automatic Mode " -+ "-s", "--servers", action="callback", callback=set_servers, -+ type="int", 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 1 is used.") - group.add_option( -@@ -271,7 +276,7 @@ class MirrorSelect(object): - if options.rsync and not (options.interactive or options.all_mirrors): - self.output.print_err('rsync servers can only be selected with -i or -a') - -- if options.servers and options.all_mirrors: -+ if options.all_mirrors and hasattr(set_servers, 'user_configured'): - self.output.print_err('Choose at most one of -s or -a') - - if options.interactive and ( --- -2.41.0 -
