1 |
commit: 9e11086e9ec14b138f291eb501a81965e87be781 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 6 00:11:00 2012 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 6 00:11:00 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9e11086e |
7 |
|
8 |
parse_layout_conf: fix cache-formats pms fallback |
9 |
|
10 |
This fixes an issue where egencache would not generate metadata/cache |
11 |
unless the directory already existed. |
12 |
|
13 |
--- |
14 |
pym/portage/repository/config.py | 6 +++--- |
15 |
1 files changed, 3 insertions(+), 3 deletions(-) |
16 |
|
17 |
diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py |
18 |
index 20f1919..9b43f38 100644 |
19 |
--- a/pym/portage/repository/config.py |
20 |
+++ b/pym/portage/repository/config.py |
21 |
@@ -712,10 +712,10 @@ def parse_layout_conf(repo_location, repo_name=None): |
22 |
|
23 |
# for compatibility w/ PMS, fallback to pms; but also check if the |
24 |
# cache exists or not. |
25 |
- cache_formats = layout_data.get('cache-formats', 'pms').lower().split() |
26 |
- if 'pms' in cache_formats and not os.path.isdir( |
27 |
+ cache_formats = layout_data.get('cache-formats', '').lower().split() |
28 |
+ if not cache_formats and os.path.isdir( |
29 |
os.path.join(repo_location, 'metadata', 'cache')): |
30 |
- cache_formats.remove('pms') |
31 |
+ cache_formats = ['pms'] |
32 |
data['cache-formats'] = tuple(cache_formats) |
33 |
|
34 |
manifest_hashes = layout_data.get('manifest-hashes') |