From e256c8ab10104ab269dd2adff7ba9326bb5476ee Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 27 Oct 2011 14:39:47 +0200 Subject: [PATCH] [entropy.core] SystemSettings: really exclude "README" and ".keep" files from *.d/ dirs --- lib/entropy/core/settings/base.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/entropy/core/settings/base.py b/lib/entropy/core/settings/base.py index d375f792e..0c5b6c08a 100644 --- a/lib/entropy/core/settings/base.py +++ b/lib/entropy/core/settings/base.py @@ -359,7 +359,8 @@ class SystemSettings(Singleton, EntropyPluginStore): continue conf_files = [x for x in conf_files if \ os.path.isfile(x) and os.access(x, os.R_OK) \ - and (not x.startswith(".keep")) and x != "README"] + and not os.path.basename(x).startswith(".keep") \ + and os.path.basename(x) != "README"] # ignore files starting with _ skipped_conf_files = [x for x in conf_files if \ os.path.basename(x).startswith("_")]