From 087d08ae5cc7c246d13da1c6504c07d446bf4278 Mon Sep 17 00:00:00 2001 From: Marius Mauch Date: Thu, 5 Jul 2007 06:49:48 +0000 Subject: Remove fallback imports for set(), and note minimum requirement of python-2.4 svn path=/main/trunk/; revision=7157 --- pym/emerge/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pym/emerge') diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index b84edddbc..00ee4c15a 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -51,8 +51,6 @@ from portage.data import secpass from portage.util import normalize_path as normpath from portage.util import writemsg -if not hasattr(__builtins__, "set"): - from sets import Set as set from itertools import chain, izip from UserDict import DictMixin @@ -3353,6 +3351,7 @@ class MergeTask(object): def merge(self, mylist, favorites, mtimedb): from portage.elog import elog_process + from portage.elog.filtering import filter_mergephases failed_fetches = [] fetchonly = "--fetchonly" in self.myopts or \ "--fetch-all-uri" in self.myopts @@ -3585,7 +3584,7 @@ class MergeTask(object): del pkgsettings["PORTAGE_BINPKG_TMPFILE"] if retval != os.EX_OK or \ "--buildpkgonly" in self.myopts: - elog_process(pkg_key, pkgsettings) + elog_process(pkg_key, pkgsettings, phasefilter=filter_mergephases) if retval != os.EX_OK: return retval bintree = self.trees[myroot]["bintree"] -- cgit v1.2.3-1-g7c22