[gentoo-commits] repo/gentoo:master commit in: app-portage/mirrorselect/files/

[gentoo-commits] repo/gentoo:master commit in: app-portage/mirrorselect/files/

[Zac Medico]

commit:     68c8c65b0920e0d166f3c8c887e2a43c1a38f2b1
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Jun  1 16:25:21 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jun  1 17:04:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68c8c65b

app-portage/mirrorselect: remove unused patch(es)

Closes: https://github.com/gentoo/gentoo/pull/12152
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 ...ct-2.2.2-Add-outputmodefunctionassignment.patch | 24 ----------------------
 ...ect-2.2.2-Update-for-ssl-fetch-api-change.patch | 24 ----------------------
 2 files changed, 48 deletions(-)

diff --git a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch b/app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch
deleted file mode 100644
index d170103a465..00000000000
--- a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Add-outputmodefunctionassignment.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e9dea3a98aa5031fecf1c7115de77e948e8d07ca Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Tue, 27 Jan 2015 10:19:05 -0800
-Subject: [PATCH] Add missed output mode function assignment.
-
----
- mirrorselect/extractor.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/mirrorselect/extractor.py b/mirrorselect/extractor.py
-index 59efad1..06dce6c 100644
---- a/mirrorselect/extractor.py
-+++ b/mirrorselect/extractor.py
-@@ -107,6 +107,7 @@ class Extractor(object):
- 		# setup the ssl-fetch ouptut map
- 		connector_output = {
- 			'info':self.output.write,
-+			'debug': self.output.write,
- 			'error': self.output.print_err,
- 			'kwargs-info': {'level': 2},
- 			'kwargs-debug': {'level':2},
--- 
-2.2.2
-

diff --git a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch b/app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch
deleted file mode 100644
index 2e5fd93c09c..00000000000
--- a/app-portage/mirrorselect/files/mirrorselect-2.2.2-Update-for-ssl-fetch-api-change.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9ec1e9649c980d32d23aab40eff3cac5e8f6f555 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Mon, 26 Jan 2015 18:23:05 -0800
-Subject: [PATCH] Update for ssl-fetch api change
-
----
- mirrorselect/extractor.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/mirrorselect/extractor.py b/mirrorselect/extractor.py
-index ec5f299..59efad1 100644
---- a/mirrorselect/extractor.py
-+++ b/mirrorselect/extractor.py
-@@ -109,6 +109,7 @@ class Extractor(object):
- 			'info':self.output.write,
- 			'error': self.output.print_err,
- 			'kwargs-info': {'level': 2},
-+			'kwargs-debug': {'level':2},
- 			'kwargs-error': {'level':0},
- 			}
- 
--- 
-2.2.2
-

[gentoo-commits] repo/gentoo:master commit in: app-portage/mirrorselect/files/

[Conrad Kostecki]

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 <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
-