From 317f698a3c0f67cb124d2d535f81b806f549c050 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 28 Aug 2010 14:44:42 -0700 Subject: When evaluating USE conditional metadata for /var/db/pkg inside _post_src_install_uid_fix(), ensure non-empty entries are removed if the evaluation results in an empty value. --- pym/portage/package/ebuild/doebuild.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'pym') diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index 71b55be29..e26509a05 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -1472,6 +1472,17 @@ def _post_src_install_uid_fix(mysettings, out): v = use_reduce(v, uselist=use, token_class=token_class) v = paren_enclose(v) if not v: + filename = os.path.join(build_info_dir, k) + try: + st = os.stat(filename) + except OSError: + pass + else: + if st.st_size != 0: + try: + os.unlink(filename) + except OSError: + pass continue codecs.open(_unicode_encode(os.path.join(build_info_dir, k), encoding=_encodings['fs'], errors='strict'), -- cgit v1.2.3-1-g7c22