commit: eb9a6203b721d7247f79cb8c991ef835f1b9e1f7
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 23:01:21 2022 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon May 30 23:11:33 2022 +0000
URL: https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=eb9a6203
Apply bug 730994 https filtering patch
Author: Peter Levine
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>
mirrorselect.8 | 3 +++
mirrorselect/extractor.py | 2 +-
mirrorselect/main.py | 7 +++++--
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/mirrorselect.8 b/mirrorselect.8
index 8f0f56e..49caadd 100644
--- a/mirrorselect.8
+++ b/mirrorselect.8
@@ -44,6 +44,9 @@ ftp only mode. Will not consider hosts of other types.
.B \-H, \-\-http
http only mode. Will not consider hosts of other types.
.TP
+.B \-S, \-\-https
+https only mode. Will not consider hosts of other types.
+.TP
.B \-r, \-\-rsync
rsync mode. Allows you to interactively select your rsync mirror.
Requires -i to be used.
diff --git a/mirrorselect/extractor.py b/mirrorselect/extractor.py
index dca8302..19dc059 100644
--- a/mirrorselect/extractor.py
+++ b/mirrorselect/extractor.py
@@ -50,7 +50,7 @@ class Extractor(object):
filters[opt] = value
self.output.print_info('Limiting test to
"%s=%s" hosts. \n'
%(opt, value))
- for opt in ["ftp", "http"]:
+ for opt in ["ftp", "http", "https"]:
if getattr(options, opt):
filters["proto"] = opt
self.output.print_info('Limiting test to %s
hosts. \n' % opt )
diff --git a/mirrorselect/main.py b/mirrorselect/main.py
index c3b5633..b0a68cc 100755
--- a/mirrorselect/main.py
+++ b/mirrorselect/main.py
@@ -181,6 +181,9 @@ class MirrorSelect(object):
group.add_option(
"-H", "--http", action="store_true", default=False,
help="http only mode. Will not consider hosts of other
types")
+ group.add_option(
+ "-S", "--https", action="store_true", default=False,
+ help="https only mode. Will not consider hosts of other
types")
group.add_option(
"-r", "--rsync", action="store_true", default=False,
help="rsync mode. Allows you to interactively select
your"
@@ -255,8 +258,8 @@ class MirrorSelect(object):
# sanity checks
# hack: check if more than one of these is set
- if options.http + options.ftp + options.rsync > 1:
- self.output.print_err('Choose at most one of -H, -f and
-r')
+ if options.http + options.https + options.ftp + options.rsync >
1:
+ self.output.print_err('Choose at most one of -H, -S, -f
and -r')
if options.ipv4 and options.ipv6:
self.output.print_err('Choose at most one of --ipv4 and
--ipv6')
