diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2022-05-30 16:01:21 -0700 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2022-05-30 16:11:33 -0700 |
| commit | eb9a6203b721d7247f79cb8c991ef835f1b9e1f7 (patch) | |
| tree | 4ac7c8e386dfaae586929880b84ea3a5f51d7b5a | |
| parent | Remove obsolete __future__ import of print_function (diff) | |
| download | mirrorselect-eb9a6203b721d7247f79cb8c991ef835f1b9e1f7.tar.gz mirrorselect-eb9a6203b721d7247f79cb8c991ef835f1b9e1f7.tar.bz2 mirrorselect-eb9a6203b721d7247f79cb8c991ef835f1b9e1f7.zip | |
Apply bug 730994 https filtering patch
Author: Peter Levine
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
| -rw-r--r-- | mirrorselect.8 | 3 | ||||
| -rw-r--r-- | mirrorselect/extractor.py | 2 | ||||
| -rwxr-xr-x | 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 @@ -182,6 +182,9 @@ class MirrorSelect(object): "-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" " rsync mirror. Requires -i or -a to be used.") @@ -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') |