From 9a36e00a4c284b0b6d57c8996e187c90ca6a5bab Mon Sep 17 00:00:00 2001
From: fhdk <fh@uex.dk>
Date: Fri, 31 Mar 2017 11:48:01 +0200
Subject: [PATCH] Remove unuseful function (reverted from commit
2453a11b09ff436e4cf16a63ab0f6edb2ae8b0d6)
---
pacman_mirrors/filefn.py | 13 ++++++++++---
pacman_mirrors/httpfn.py | 4 ++--
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/pacman_mirrors/filefn.py b/pacman_mirrors/filefn.py
index 74148032..bf50b143 100644
--- a/pacman_mirrors/filefn.py
+++ b/pacman_mirrors/filefn.py
@@ -27,6 +27,13 @@ from . import miscfn
from . import txt
+def check_file(filename):
+ """Check if file exist
+ :param filename:
+ """
+ return os.path.isfile(filename)
+
+
def dir_must_exist(dir_name):
"""Check necessary directory
:param dir_name:
@@ -42,12 +49,12 @@ def return_mirror_filename(config):
filename = ""
status = False # status.json or mirrors.json
# decision on file availablity
- if os.path.isfile(config["status_file"]):
+ if check_file(config["status_file"]):
status = True
filename = config["status_file"]
- elif os.path.isfile(config["mirror_file"]):
+ elif check_file(config["mirror_file"]):
filename = config["mirror_file"]
- elif os.path.isfile(config["fallback_file"]):
+ elif check_file(config["fallback_file"]):
filename = config["fallback_file"]
if not filename:
print("\n{}.:! {}{}\n".format(txt.RS,
diff --git a/pacman_mirrors/httpfn.py b/pacman_mirrors/httpfn.py
index 9f6502e6..b78b41e9 100644
--- a/pacman_mirrors/httpfn.py
+++ b/pacman_mirrors/httpfn.py
@@ -164,7 +164,7 @@ def update_mirrors(config):
txt.REPO_SERVER))
result = download_mirrors(config)
else:
- if not os.path.isfile(config["mirror_file"]):
+ if not filefn.check_file(config["mirror_file"]):
print(".: {} {} {} {}".format(txt.WRN_CLR,
txt.MIRROR_FILE,
config["mirror_file"],
@@ -173,7 +173,7 @@ def update_mirrors(config):
txt.FALLING_BACK,
conf.FALLBACK))
result = (True, False)
- if not os.path.isfile(config["fallback_file"]):
+ if not filefn.check_file(config["fallback_file"]):
print(".: {} {}".format(txt.ERR_CLR, txt.HOUSTON))
result = (False, False)
return result
--
GitLab