[gentoo-commits] proj/portage:master commit in: pym/portage/repository/

["Zac Medico" <zmedico@gentoo.org>]

commit:     9e11086e9ec14b138f291eb501a81965e87be781
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  6 00:11:00 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Jun  6 00:11:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9e11086e

parse_layout_conf: fix cache-formats pms fallback

This fixes an issue where egencache would not generate metadata/cache
unless the directory already existed.

---
 pym/portage/repository/config.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
index 20f1919..9b43f38 100644
--- a/pym/portage/repository/config.py
+++ b/pym/portage/repository/config.py
@@ -712,10 +712,10 @@ def parse_layout_conf(repo_location, repo_name=None):
 
 	# for compatibility w/ PMS, fallback to pms; but also check if the
 	# cache exists or not.
-	cache_formats = layout_data.get('cache-formats', 'pms').lower().split()
-	if 'pms' in cache_formats and not os.path.isdir(
+	cache_formats = layout_data.get('cache-formats', '').lower().split()
+	if not cache_formats and os.path.isdir(
 		os.path.join(repo_location, 'metadata', 'cache')):
-		cache_formats.remove('pms')
+		cache_formats = ['pms']
 	data['cache-formats'] = tuple(cache_formats)
 
 	manifest_hashes = layout_data.get('manifest-hashes')