From 3f73235eaa4752d8df4001b322e5f867658185df Mon Sep 17 00:00:00 2001
From: fhdk <fh@uex.dk>
Date: Tue, 18 Apr 2017 17:08:51 +0200
Subject: [PATCH] removed `SSL = False` option it has been replaced by
`Protocols =` which does a better job
---
pacman_mirrors/configfn.py | 4 ----
pacman_mirrors/pacman_mirrors.py | 12 +++---------
2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/pacman_mirrors/configfn.py b/pacman_mirrors/configfn.py
index 29637f83..c180c9b5 100644
--- a/pacman_mirrors/configfn.py
+++ b/pacman_mirrors/configfn.py
@@ -78,7 +78,6 @@ def build_config():
"only_country": [],
"protocols": [],
"repo_arch": conf.REPO_ARCH,
- "ssl": False,
"ssl_verify": True,
"status_file": conf.STATUS_FILE,
"url_mirrors_json": conf.URL_MIRROR_JSON,
@@ -110,9 +109,6 @@ def build_config():
config["mirror_list"] = value
elif key == "NoUpdate":
config["no_update"] = value
- elif key == "SSL":
- if value == "True":
- config["ssl"] = True
elif key == "SSLVerify":
if value == "False":
config["ssl_verify"] = False
diff --git a/pacman_mirrors/pacman_mirrors.py b/pacman_mirrors/pacman_mirrors.py
index aec7cf1d..d2d1e944 100644
--- a/pacman_mirrors/pacman_mirrors.py
+++ b/pacman_mirrors/pacman_mirrors.py
@@ -249,9 +249,7 @@ class PacmanMirrors:
worklist = mirrorfn.filter_mirror_country(self.mirrors.mirrorlist,
self.selected_countries)
if self.config["protocols"]:
- worklist = mirrorfn.filter_mirror_protocols(worklist, protocols=self.config["protocols"])
- if self.config["ssl"]:
- worklist = mirrorfn.filter_mirror_protocols(worklist)
+ worklist = mirrorfn.filter_mirror_protocols(worklist, self.config["protocols"])
if self.config["method"] == "rank":
worklist = self.test_mirrors(worklist)
worklist = sorted(worklist, key=itemgetter("resp_time"))
@@ -273,9 +271,7 @@ class PacmanMirrors:
worklist = self.mirrors.mirrorlist
shuffle(worklist)
if self.config["protocols"]:
- worklist = mirrorfn.filter_mirror_protocols(worklist, protocols=self.config["protocols"])
- if self.config["ssl"]:
- worklist = mirrorfn.filter_mirror_protocols(worklist)
+ worklist = mirrorfn.filter_mirror_protocols(worklist, self.config["protocols"])
up2date = [item for item in worklist if item["branches"] == [1, 1, 1]]
worklist = []
print(".: {}: {} - {}".format(txt.INF_CLR,
@@ -319,9 +315,7 @@ class PacmanMirrors:
worklist = mirrorfn.filter_mirror_country(self.mirrors.mirrorlist,
self.selected_countries)
if self.config["protocols"]:
- worklist = mirrorfn.filter_mirror_protocols(worklist, protocols=self.config["protocols"])
- if self.config["ssl"]:
- worklist = mirrorfn.filter_mirror_protocols(worklist)
+ worklist = mirrorfn.filter_mirror_protocols(worklist, self.config["protocols"])
if not self.default:
if self.config["method"] == "rank":
worklist = self.test_mirrors(worklist)
--
GitLab