diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-07-08 22:23:22 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-07-08 22:23:22 +0100 |
| commit | 99b2c44c1425c7b2925846d4c44b2bf2f78dc786 (patch) | |
| tree | 9bf7a2d385aace0ea5f3f8d3e3657168b758fdaa /app-portage/mirrorselect | |
| parent | 39bccce90513402ec93bb0fde30678f16b07a9cc (diff) | |
gentoo auto-resync : 08:07:2023 - 22:23:22
Diffstat (limited to 'app-portage/mirrorselect')
| -rw-r--r-- | app-portage/mirrorselect/Manifest | 1 | ||||
| -rw-r--r-- | app-portage/mirrorselect/files/mirrorselect-2.3.0-main-Fix-all-option-parsing.patch | 48 |
2 files changed, 0 insertions, 49 deletions
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest index 7af272d6d1d0..96407e42755d 100644 --- a/app-portage/mirrorselect/Manifest +++ b/app-portage/mirrorselect/Manifest @@ -1,4 +1,3 @@ -AUX mirrorselect-2.3.0-main-Fix-all-option-parsing.patch 1869 BLAKE2B 795e1c8dda749b2df32913e27cb3eb97eeb670873a6e7a63f145726e20d5614031ec4ce1c25a467eb1f8fd58e8cbeb39edc338904239a129b7396ba56bcc413f SHA512 3375d2c2f931dc4d72ee532a1112f567b87463002ea85c1b07b77fc069f3ca05e6a0b5652219ed69256c5a10f1541e3cb89b0aa7ad4243abdc28a43dec4df05f AUX mirrorselect-2.3.0-setup.py.patch 2000 BLAKE2B b5881e7b03c12f4107216286702657824efc2d6864443874d05890cd9880193baee8a00522c13274cc04717e6e10d1ac162e77247b41f43ad8f7fec59ec871a0 SHA512 d8ff2a9969ade6574457d316a145e822160edcd6f1cc928e4cd4c5cb53bff9ccd87f5985cbfb179c2b7ad6a8e4007c54a9bd3a770c723bf14730e437c72d49b8 DIST mirrorselect-2.2.6.tar.gz 16727 BLAKE2B 8875bf61e26ac474338d81a602297fa4fdf3fab3dbd478b02129dbe71f2d09445efa9b82792e3e654725c5e87a4ca00d37a3d924f8bd6f2decdf74148d1069c8 SHA512 ff2b88bf568f79182275e2c85cafbeee7cbeb0226225a7c3289f0a1d7a8b5eae9d41c69b099bb7e0cc9b0300b23afea43c3ac1baa13f37c696159bb1b3ac05f8 DIST mirrorselect-2.3.0.tar.gz 18039 BLAKE2B eebc4a02257b734c3dfd05cee541369689b92548b5421e977dd451442e8c83e426a03845a46e92eaa01507e0cba2b3679c97db2c00f012619cf9f551cfa1e1af SHA512 fc040bf6a9cc79f781157c7b65c6366c86dd54d583b4286845e3d037a2709c376e9132889e9dbe2cd40846cd7bd138aae7111d1a442a421101db756cc259b535 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 <sam@gentoo.org> -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: <xpenev@gmail.com> -Signed-off-by: Sam James <sam@gentoo.org> ---- 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 - |