diff options
Diffstat (limited to 'scripts/lib/compatlayer')
-rw-r--r-- | scripts/lib/compatlayer/__init__.py | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/scripts/lib/compatlayer/__init__.py b/scripts/lib/compatlayer/__init__.py index 15dc95da1f..b8ce771319 100644 --- a/scripts/lib/compatlayer/__init__.py +++ b/scripts/lib/compatlayer/__init__.py | |||
@@ -108,20 +108,27 @@ def _detect_layer(layer_path): | |||
108 | 108 | ||
109 | return layer | 109 | return layer |
110 | 110 | ||
111 | def detect_layers(layer_directories): | 111 | def detect_layers(layer_directories, no_auto): |
112 | layers = [] | 112 | layers = [] |
113 | 113 | ||
114 | for directory in layer_directories: | 114 | for directory in layer_directories: |
115 | if directory[-1] == '/': | 115 | if directory[-1] == '/': |
116 | directory = directory[0:-1] | 116 | directory = directory[0:-1] |
117 | 117 | ||
118 | for root, dirs, files in os.walk(directory): | 118 | if no_auto: |
119 | dir_name = os.path.basename(root) | 119 | conf_dir = os.path.join(directory, 'conf') |
120 | conf_dir = os.path.join(root, 'conf') | ||
121 | if os.path.isdir(conf_dir): | 120 | if os.path.isdir(conf_dir): |
122 | layer = _detect_layer(root) | 121 | layer = _detect_layer(directory) |
123 | if layer: | 122 | if layer: |
124 | layers.append(layer) | 123 | layers.append(layer) |
124 | else: | ||
125 | for root, dirs, files in os.walk(directory): | ||
126 | dir_name = os.path.basename(root) | ||
127 | conf_dir = os.path.join(root, 'conf') | ||
128 | if os.path.isdir(conf_dir): | ||
129 | layer = _detect_layer(root) | ||
130 | if layer: | ||
131 | layers.append(layer) | ||
125 | 132 | ||
126 | return layers | 133 | return layers |
127 | 134 | ||