diff options
| author | Marius Mauch <genone@gentoo.org> | 2007-07-05 06:49:48 +0000 |
|---|---|---|
| committer | Marius Mauch <genone@gentoo.org> | 2007-07-05 06:49:48 +0000 |
| commit | 087d08ae5cc7c246d13da1c6504c07d446bf4278 (patch) | |
| tree | 5d864bfd0965381dec0740d482089297b3d6889c /pym/emerge | |
| parent | ce666e41f9b924c758ef54a0ed73e7fc0f824958 (diff) | |
| download | portage-087d08ae5cc7c246d13da1c6504c07d446bf4278.tar.gz portage-087d08ae5cc7c246d13da1c6504c07d446bf4278.tar.bz2 portage-087d08ae5cc7c246d13da1c6504c07d446bf4278.zip | |
Remove fallback imports for set(), and note minimum requirement of python-2.4
svn path=/main/trunk/; revision=7157
Diffstat (limited to 'pym/emerge')
| -rw-r--r-- | pym/emerge/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
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"] |