diff options
| -rwxr-xr-x | bin/emerge | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/bin/emerge b/bin/emerge index 88dea39c5..034feafb9 100755 --- a/bin/emerge +++ b/bin/emerge @@ -47,6 +47,7 @@ from portage_data import secpass if not hasattr(__builtins__, "set"): from sets import Set as set +from itertools import izip class stdout_spinner(object): scroll_msgs = [ @@ -722,7 +723,7 @@ class FakeVartree(portage.vartree): "DEPEND", "RDEPEND", "PDEPEND"] real_dbapi = real_vartree.dbapi for cpv in real_dbapi.cpv_all(): - metadata = dict(zip(mykeys, real_dbapi.aux_get(cpv, mykeys))) + metadata = dict(izip(mykeys, real_dbapi.aux_get(cpv, mykeys))) self.dbapi.cpv_inject(cpv, metadata=metadata) finally: if vdb_lock: @@ -1361,7 +1362,7 @@ class depgraph: upd_commands = self.global_updates[myroot] aux_keys = ["DEPEND", "RDEPEND", "PDEPEND"] aux_vals = vardb.aux_get(myeb_inst, aux_keys) - aux_dict = dict(zip(aux_keys, aux_vals)) + aux_dict = dict(izip(aux_keys, aux_vals)) updates = update_dbentries(upd_commands, aux_dict) if updates: vardb.aux_update(myeb_inst, updates) @@ -3940,7 +3941,8 @@ def action_depclean(settings, trees, ldpath_mtimes, aux_vals = portdb.aux_get(cpv, fakedb_auxkeys) except KeyError: aux_vals = vardb.aux_get(cpv, fakedb_auxkeys) - fake_vardb.cpv_inject(cpv, metadata=dict(zip(fakedb_auxkeys, aux_vals))) + fake_vardb.cpv_inject( + cpv, metadata=dict(izip(fakedb_auxkeys, aux_vals))) # HACK: Ensure that installed packages are preferenced by dep_check(). trees[settings["ROOT"]]["porttree"].dbapi = fake_vardb @@ -3958,7 +3960,7 @@ def action_depclean(settings, trees, ldpath_mtimes, continue spinner.update() fakedb.cpv_inject(pkg) - myaux = dict(zip(aux_keys, fake_vardb.aux_get(pkg, aux_keys))) + myaux = dict(izip(aux_keys, fake_vardb.aux_get(pkg, aux_keys))) mydeps = [] if myopts.get("--with-bdeps", "y") == "y": mydeps.append((myaux["DEPEND"], soft)) |