[entropy.core] also exclude files ending with ".example" from .d/* dirs

This commit is contained in:
Fabio Erculiani
2011-10-27 16:08:21 +02:00
parent c6b7f1cc76
commit 2ea7e6f088
7 changed files with 21 additions and 14 deletions

View File

@@ -3,6 +3,6 @@ extending /etc/entropy/packages/license.accept content.
User should rather edit /etc/entropy/packages/license.accept instead of
creating files inside this directory.
Files are processed in lexical order. Filenames: ".keep", "README" and
starting with "_" are skipped and never considered.
Files are processed in lexical order. Filenames: ".keep", "README" are
skipped and never considered.
Files ending with ".example" are never considered.

View File

@@ -3,5 +3,6 @@ extending /etc/entropy/packages/license.mask content.
User should rather edit /etc/entropy/packages/license.mask instead of
creating files inside this directory.
Files are processed in lexical order. Filenames: ".keep", "README" and
starting with "_" are skipped and never considered.
Files are processed in lexical order. Filenames: ".keep", "README" are
skipped and never considered.
Files ending with ".example" are never considered.

View File

@@ -3,5 +3,6 @@ extending /etc/entropy/packages/package.mask content.
User should rather edit /etc/entropy/packages/package.mask instead of
creating files inside this directory.
Files are processed in lexical order. Filenames: ".keep", "README" and
starting with "_" are skipped and never considered.
Files are processed in lexical order. Filenames: ".keep", "README" are
skipped and never considered.
Files ending with ".example" are never considered.

View File

@@ -3,5 +3,6 @@ extending /etc/entropy/packages/package.unmask content.
User should rather edit /etc/entropy/packages/package.unmask instead of
creating files inside this directory.
Files are processed in lexical order. Filenames: ".keep", "README" and
starting with "_" are skipped and never considered.
Files are processed in lexical order. Filenames: ".keep", "README" are
skipped and never considered.
Files ending with ".example" are never considered.

View File

@@ -3,5 +3,6 @@ extending /etc/entropy/packages/system.mask content.
User should rather edit /etc/entropy/packages/system.mask instead of
creating files inside this directory.
Files are processed in lexical order. Filenames: ".keep", "README" and
starting with "_" are skipped and never considered.
Files are processed in lexical order. Filenames: ".keep", "README" are
skipped and never considered.
Files ending with ".example" are never considered.

View File

@@ -2,8 +2,10 @@ This directory should contain distribution-provided configuration files
extending /etc/entropy/repositories.conf content (only for "repository ="
statements).
Files are processed in lexical order. Filenames: ".keep", "README" and
starting with "_" are skipped and never considered.
Files are processed in lexical order. Filenames: ".keep", "README" are
skipped and never considered.
Files starting with "_" are considered belonging to disabled repositories.
Files ending with ".example" are never considered.
Files created by Entropy Client are prefixed with
"entropy_". So, for example, for "sabayon-limbo" you will get:

View File

@@ -360,7 +360,8 @@ class SystemSettings(Singleton, EntropyPluginStore):
conf_files = [x for x in conf_files if \
os.path.isfile(x) and os.access(x, os.R_OK) \
and not os.path.basename(x).startswith(".keep") \
and os.path.basename(x) != "README"]
and os.path.basename(x) != "README" \
and not os.path.basename(x).endswith(".example")]
# ignore files starting with _
skipped_conf_files = [x for x in conf_files if \
os.path.basename(x).startswith("_")]