From 18f20d592fe8baab33c6084fc2a8b7c85ca768af Mon Sep 17 00:00:00 2001 From: Chris Mayo Date: Tue, 7 Jul 2020 17:06:25 +0100 Subject: [PATCH] Check for KDE 5 proxy first and then KDE 4 Don't look for kde4-config in case a KDE 5 user still has it installed. --- linkcheck/configuration/__init__.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/linkcheck/configuration/__init__.py b/linkcheck/configuration/__init__.py index 98dff18a..fb28afdf 100644 --- a/linkcheck/configuration/__init__.py +++ b/linkcheck/configuration/__init__.py @@ -542,14 +542,12 @@ def get_kde_config_dir(): if not home: log.debug(LOG_CHECK, "KDEHOME and HOME not set") return - if shutil.which("kde4-config"): - kde_config_dir = os.path.join(home, ".kde4", "share", "config") - else: - # KDE 5 - kde_config_dir = os.path.join(home, ".config") + kde_config_dir = os.path.join(home, ".config") if not os.path.exists(kde_config_dir): - log.debug(LOG_CHECK, "%s does not exist" % kde_config_dir) - return + kde_config_dir = os.path.join(home, ".kde4", "share", "config") + if not os.path.exists(kde_config_dir): + log.debug(LOG_CHECK, "%s does not exist" % kde_config_dir) + return return kde_config_dir