From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rc6A2-0005MV-Px for garchives@archives.gentoo.org; Sun, 18 Dec 2011 02:07:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E57421C03C; Sun, 18 Dec 2011 02:07:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0BA6A21C03C for ; Sun, 18 Dec 2011 02:07:23 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 50A6B1B4001 for ; Sun, 18 Dec 2011 02:07:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A27F78004A for ; Sun, 18 Dec 2011 02:07:22 +0000 (UTC) From: "Arfrever Frehtes Taifersar Arahesis" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/AsynchronousLock.py pym/_emerge/BinpkgExtractorAsync.py pym/_emerge/BlockerCache.py pym/_emerge/EbuildExecuter.py pym/_emerge/FakeVartree.py pym/_emerge/PipeReader.py pym/_emerge/actions.py pym/_emerge/depgraph.py pym/_emerge/main.py pym/_emerge/resolver/backtracking.py X-VCS-Directories: pym/_emerge/resolver/ pym/_emerge/ X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: d1672181743ed2a4a62b542f197fc1321a699d17 Date: Sun, 18 Dec 2011 02:07:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 355cceb1-4079-4c5f-bdc9-9432f364557c X-Archives-Hash: 5b0137a09dfc499c2848b5da4f9cce4b commit: d1672181743ed2a4a62b542f197fc1321a699d17 Author: Arfrever Frehtes Taifersar Arahesis Gentoo Org> AuthorDate: Sun Dec 18 02:06:38 2011 +0000 Commit: Arfrever Frehtes Taifersar Arahesis gentoo org> CommitDate: Sun Dec 18 02:06:38 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dd1672181 Fix some warnings found by pylint. --- pym/_emerge/AsynchronousLock.py | 4 +- pym/_emerge/BinpkgExtractorAsync.py | 3 +- pym/_emerge/BlockerCache.py | 2 +- pym/_emerge/EbuildExecuter.py | 2 - pym/_emerge/FakeVartree.py | 2 - pym/_emerge/PipeReader.py | 2 +- pym/_emerge/actions.py | 19 ++++++-------- pym/_emerge/depgraph.py | 45 +++++++---------------------= ----- pym/_emerge/main.py | 7 +---- pym/_emerge/resolver/backtracking.py | 2 +- 10 files changed, 25 insertions(+), 63 deletions(-) diff --git a/pym/_emerge/AsynchronousLock.py b/pym/_emerge/AsynchronousLo= ck.py index 9d0545b..ae3bde4 100644 --- a/pym/_emerge/AsynchronousLock.py +++ b/pym/_emerge/AsynchronousLock.py @@ -10,7 +10,7 @@ import sys try: import threading except ImportError: - import dummy_threading as threading + threading =3D dummy_threading =20 import portage from portage import os @@ -117,7 +117,7 @@ class _LockThread(AbstractPollTask): self._files =3D {} self._files['pipe_read'] =3D pr self._files['pipe_write'] =3D pw - for k, f in self._files.items(): + for f in self._files.values(): fcntl.fcntl(f, fcntl.F_SETFL, fcntl.fcntl(f, fcntl.F_GETFL) | os.O_NONBLOCK) self._reg_id =3D self.scheduler.register(self._files['pipe_read'], diff --git a/pym/_emerge/BinpkgExtractorAsync.py b/pym/_emerge/BinpkgExtr= actorAsync.py index d1630f2..f25cbf9 100644 --- a/pym/_emerge/BinpkgExtractorAsync.py +++ b/pym/_emerge/BinpkgExtractorAsync.py @@ -1,9 +1,8 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 from _emerge.SpawnProcess import SpawnProcess import portage -import os import signal =20 class BinpkgExtractorAsync(SpawnProcess): diff --git a/pym/_emerge/BlockerCache.py b/pym/_emerge/BlockerCache.py index 0076828..57e9d2c 100644 --- a/pym/_emerge/BlockerCache.py +++ b/pym/_emerge/BlockerCache.py @@ -145,7 +145,7 @@ class BlockerCache(portage.cache.mappings.MutableMapp= ing): f.close() portage.util.apply_secpass_permissions( self._cache_filename, gid=3Dportage.portage_gid, mode=3D0o644) - except (IOError, OSError) as e: + except (IOError, OSError): pass self._modified.clear() =20 diff --git a/pym/_emerge/EbuildExecuter.py b/pym/_emerge/EbuildExecuter.p= y index f8febd4..2b8f120 100644 --- a/pym/_emerge/EbuildExecuter.py +++ b/pym/_emerge/EbuildExecuter.py @@ -34,8 +34,6 @@ class EbuildExecuter(CompositeTask): cleanup =3D 0 portage.prepare_build_dirs(pkg.root, settings, cleanup) =20 - portdb =3D pkg.root_config.trees['porttree'].dbapi - ebuild_path =3D settings['EBUILD'] alist =3D settings.configdict["pkg"].get("A", "").split() _prepare_fake_distdir(settings, alist) =20 diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py index 626d471..e1e5757 100644 --- a/pym/_emerge/FakeVartree.py +++ b/pym/_emerge/FakeVartree.py @@ -167,8 +167,6 @@ class FakeVartree(vartree): real_vardb =3D self._root_config.trees["vartree"].dbapi current_cpv_set =3D frozenset(real_vardb.cpv_all()) pkg_vardb =3D self.dbapi - pkg_cache =3D self._pkg_cache - aux_get_history =3D self._aux_get_history =20 # Remove any packages that have been uninstalled. for pkg in list(pkg_vardb): diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py index b162fe5..0f784cf 100644 --- a/pym/_emerge/PipeReader.py +++ b/pym/_emerge/PipeReader.py @@ -26,7 +26,7 @@ class PipeReader(AbstractPollTask): else: output_handler =3D self._output_handler =20 - for k, f in self.input_files.items(): + for f in self.input_files.values(): fcntl.fcntl(f.fileno(), fcntl.F_SETFL, fcntl.fcntl(f.fileno(), fcntl.F_GETFL) | os.O_NONBLOCK) self._reg_ids.add(self.scheduler.register(f.fileno(), diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index b3d0b12..1725053 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -187,8 +187,7 @@ def action_build(settings, trees, mtimedb, " entire repository or category at once." prefix =3D bad(" * ") writemsg(prefix + "\n") - from textwrap import wrap - for line in wrap(msg, 72): + for line in textwrap.wrap(msg, 72): writemsg("%s%s\n" % (prefix, line)) writemsg(prefix + "\n") =20 @@ -216,7 +215,6 @@ def action_build(settings, trees, mtimedb, if isinstance(e, depgraph.UnsatisfiedResumeDep): mydepgraph =3D e.depgraph =20 - from textwrap import wrap from portage.output import EOutput out =3D EOutput() =20 @@ -255,7 +253,7 @@ def action_build(settings, trees, mtimedb, "to skip the first package in the list and " + \ "any other packages that may be " + \ "masked or have missing dependencies." - for line in wrap(msg, 72): + for line in textwrap.wrap(msg, 72): out.eerror(line) elif isinstance(e, portage.exception.PackageNotFound): out.eerror("An expected package is " + \ @@ -265,7 +263,7 @@ def action_build(settings, trees, mtimedb, "packages that are no longer " + \ "available. Please restart/continue " + \ "the operation manually." - for line in wrap(msg, 72): + for line in textwrap.wrap(msg, 72): out.eerror(line) =20 if success: @@ -1066,9 +1064,8 @@ def calc_depclean(settings, trees, ldpath_mtimes, "the packages that pulled them in." =20 prefix =3D bad(" * ") - from textwrap import wrap writemsg_level("".join(prefix + "%s\n" % line for \ - line in wrap(msg, 70)), level=3Dlogging.WARNING, noiselevel=3D-1) + line in textwrap.wrap(msg, 70)), level=3Dlogging.WARNING, noiselevel= =3D-1) =20 msg =3D [] for pkg in sorted(consumer_map, key=3Dcmp_sort_key(cmp_pkg_cpv)): @@ -2755,8 +2752,8 @@ def adjust_config(myopts, settings): if settings.get("NOCOLOR") not in ("yes","true"): portage.output.havecolor =3D 1 =20 - """The explicit --color < y | n > option overrides the NOCOLOR environm= ent - variable and stdout auto-detection.""" + # The explicit --color < y | n > option overrides the NOCOLOR environme= nt + # variable and stdout auto-detection. if "--color" in myopts: if "y" =3D=3D myopts["--color"]: portage.output.havecolor =3D 1 @@ -2828,7 +2825,7 @@ def getportageversion(portdir, _unused, profile, ch= ost, vardb): for cpv in sorted(libclist): libc_split =3D portage.catpkgsplit(cpv)[1:] if libc_split[-1] =3D=3D "r0": - libc_split[:-1] + libc_split =3D libc_split[:-1] libcver.append("-".join(libc_split)) else: libcver =3D ["unavailable"] @@ -2987,7 +2984,7 @@ def load_emerge_config(trees=3DNone): kwargs[k] =3D v trees =3D portage.create_trees(trees=3Dtrees, **kwargs) =20 - for root, root_trees in trees.items(): + for root_trees in trees.values(): settings =3D root_trees["vartree"].settings settings._init_dirs() setconfig =3D load_default_config(settings, root_trees) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 63365cd..93819c6 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -928,7 +928,6 @@ class depgraph(object): buildpkgonly =3D "--buildpkgonly" in self._frozen_config.myopts nodeps =3D "--nodeps" in self._frozen_config.myopts deep =3D self._dynamic_config.myparams.get("deep", 0) - recurse =3D deep is True or dep.depth <=3D deep if dep.blocker: if not buildpkgonly and \ not nodeps and \ @@ -973,7 +972,7 @@ class depgraph(object): # infinite backtracking loop. if self._dynamic_config._allow_backtracking: if dep.parent in self._dynamic_config._runtime_pkg_mask: - if "--debug" in self._frozen_config.myopts: + if debug: writemsg( "!!! backtracking loop detected: %s %s\n" % \ (dep.parent, @@ -988,7 +987,7 @@ class depgraph(object): if dep_pkg is None: self._dynamic_config._backtrack_infos["missing dependency"] =3D de= p self._dynamic_config._need_restart =3D True - if "--debug" in self._frozen_config.myopts: + if debug: msg =3D [] msg.append("") msg.append("") @@ -1069,8 +1068,6 @@ class depgraph(object): # are never processed more than once. previously_added =3D pkg in self._dynamic_config.digraph =20 - # select the correct /var database that we'll be checking against - vardbapi =3D self._frozen_config.trees[pkg.root]["vartree"].dbapi pkgsettings =3D self._frozen_config.pkgsettings[pkg.root] =20 arg_atoms =3D None @@ -1311,12 +1308,11 @@ class depgraph(object): self._dynamic_config.digraph.add(pkg, parent, priority=3Dpriority) self._add_parent_atom(pkg, parent_atom) =20 - """ This section determines whether we go deeper into dependencies or = not. - We want to go deeper on a few occasions: - Installing package A, we need to make sure package A's deps are met. - emerge --deep ; we need to recursively check dependencies of= pkgspec - If we are in --nodeps (no recursion) mode, we obviously only check 1 = level of dependencies. - """ + # This section determines whether we go deeper into dependencies or no= t. + # We want to go deeper on a few occasions: + # Installing package A, we need to make sure package A's deps are met. + # emerge --deep ; we need to recursively check dependencies o= f pkgspec + # If we are in --nodeps (no recursion) mode, we obviously only check 1= level of dependencies. if arg_atoms: depth =3D 0 pkg.depth =3D depth @@ -1366,11 +1362,7 @@ class depgraph(object): =20 mytype =3D pkg.type_name myroot =3D pkg.root - mykey =3D pkg.cpv metadata =3D pkg.metadata - myuse =3D self._pkg_use_enabled(pkg) - jbigkey =3D pkg - depth =3D pkg.depth + 1 removal_action =3D "remove" in self._dynamic_config.myparams =20 edepend=3D{} @@ -1434,7 +1426,6 @@ class depgraph(object): ) =20 debug =3D "--debug" in self._frozen_config.myopts - strict =3D mytype !=3D "installed" =20 for dep_root, dep_string, dep_priority in deps: if not dep_string: @@ -1527,7 +1518,7 @@ class depgraph(object): selected_atoms =3D self._select_atoms(dep_root, dep_string, myuse=3Dself._pkg_use_enabled(pkg), parent=3Dpkg, strict=3Dstrict, priority=3Ddep_priority) - except portage.exception.InvalidDependString as e: + except portage.exception.InvalidDependString: if pkg.installed: self._dynamic_config._masked_installed.add(pkg) return 1 @@ -1777,7 +1768,7 @@ class depgraph(object): pkg_atom_map.setdefault(pkg, set()).add(atom) cp_pkg_map.setdefault(pkg.cp, set()).add(pkg) =20 - for cp, pkgs in cp_pkg_map.items(): + for pkgs in cp_pkg_map.values(): if len(pkgs) < 2: for pkg in pkgs: for atom in pkg_atom_map[pkg]: @@ -1932,7 +1923,6 @@ class depgraph(object): def _iter_atoms_for_pkg(self, pkg): depgraph_sets =3D self._dynamic_config.sets[pkg.root] atom_arg_map =3D depgraph_sets.atom_arg_map - root_config =3D self._frozen_config.roots[pkg.root] for atom in depgraph_sets.atoms.iterAtomsForPackage(pkg): if atom.cp !=3D pkg.cp and \ self._have_new_virt(pkg.root, atom.cp): @@ -1971,7 +1961,6 @@ class depgraph(object): myfavorites=3D[] eroot =3D root_config.root root =3D root_config.settings['ROOT'] - dbs =3D self._dynamic_config._filtered_trees[eroot]["dbs"] vardb =3D self._frozen_config.trees[eroot]["vartree"].dbapi real_vardb =3D self._frozen_config._trees_orig[eroot]["vartree"].dbapi portdb =3D self._frozen_config.trees[eroot]["porttree"].dbapi @@ -2948,7 +2937,6 @@ class depgraph(object): missing_use_adjustable =3D set() required_use_unsatisfied =3D [] masked_pkg_instances =3D set() - missing_licenses =3D [] have_eapi_mask =3D False pkgsettings =3D self._frozen_config.pkgsettings[root] root_config =3D self._frozen_config.roots[root] @@ -2959,7 +2947,6 @@ class depgraph(object): for db, pkg_type, built, installed, db_keys in dbs: if installed: continue - match =3D db.match if hasattr(db, "xmatch"): cpv_list =3D db.xmatch("match-all-cpv-only", atom.without_use) else: @@ -3478,7 +3465,6 @@ class depgraph(object): self._dynamic_config._highest_pkg_cache[cache_key] =3D ret pkg, existing =3D ret if pkg is not None: - settings =3D pkg.root_config.settings if self._pkg_visibility_check(pkg) and \ not (pkg.installed and pkg.masks): self._dynamic_config._visible_pkgs[pkg.root].cpv_inject(pkg) @@ -3740,7 +3726,6 @@ class depgraph(object): pkgsettings =3D self._frozen_config.pkgsettings[root] dbs =3D self._dynamic_config._filtered_trees[root]["dbs"] vardb =3D self._frozen_config.roots[root].trees["vartree"].dbapi - portdb =3D self._frozen_config.roots[root].trees["porttree"].dbapi # List of acceptable packages, ordered by type preference. matched_packages =3D [] matched_pkgs_ignore_use =3D [] @@ -4433,9 +4418,6 @@ class depgraph(object): "--nodeps" in self._frozen_config.myopts: return True =20 - complete =3D "complete" in self._dynamic_config.myparams - deep =3D "deep" in self._dynamic_config.myparams - if True: # Pull in blockers from all installed packages that haven't already # been pulled into the depgraph, in order to ensure that they are @@ -4450,10 +4432,8 @@ class depgraph(object): dep_keys =3D ["RDEPEND", "PDEPEND"] for myroot in self._frozen_config.trees: vardb =3D self._frozen_config.trees[myroot]["vartree"].dbapi - portdb =3D self._frozen_config.trees[myroot]["porttree"].dbapi pkgsettings =3D self._frozen_config.pkgsettings[myroot] root_config =3D self._frozen_config.roots[myroot] - dbs =3D self._dynamic_config._filtered_trees[myroot]["dbs"] final_db =3D self._dynamic_config.mydbapi[myroot] =20 blocker_cache =3D BlockerCache(myroot, vardb) @@ -6355,7 +6335,6 @@ class depgraph(object): =20 args_set =3D self._dynamic_config.sets[ self._frozen_config.target_root].sets['__non_set_args__'] - portdb =3D self._frozen_config.trees[self._frozen_config.target_root][= "porttree"].dbapi added_favorites =3D set() for x in self._dynamic_config._set_nodes: if x.operation !=3D "nomerge": @@ -6419,15 +6398,12 @@ class depgraph(object): mergelist =3D [] =20 favorites =3D resume_data.get("favorites") - args_set =3D self._dynamic_config.sets[ - self._frozen_config.target_root].sets['__non_set_args__'] if isinstance(favorites, list): args =3D self._load_favorites(favorites) else: args =3D [] =20 fakedb =3D self._dynamic_config.mydbapi - trees =3D self._frozen_config.trees serialized_tasks =3D [] masked_tasks =3D [] for x in mergelist: @@ -7085,7 +7061,6 @@ def _resume_depgraph(settings, trees, mtimedb, myop= ts, myparams, spinner): =20 def get_mask_info(root_config, cpv, pkgsettings, db, pkg_type, built, installed, db_keys, myrepo =3D None, _pkg_use_enab= led=3DNone): - eapi_masked =3D False try: metadata =3D dict(zip(db_keys, db.aux_get(cpv, db_keys, myrepo=3Dmyrepo))) @@ -7195,7 +7170,7 @@ def _get_masking_status(pkg, pkgsettings, root_conf= ig, myrepo=3DNone, use=3DNone): pkg.metadata["CHOST"])) =20 if pkg.invalid: - for msg_type, msgs in pkg.invalid.items(): + for msgs in pkg.invalid.values(): for msg in msgs: mreasons.append( _MaskReason("invalid", "invalid: %s" % (msg,))) diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index ce73c17..0a9bd1d 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -10,7 +10,6 @@ import sys import textwrap import platform import portage -import portage portage.proxy.lazyimport.lazyimport(globals(), 'portage.news:count_unread_news,display_news_notifications', ) @@ -253,7 +252,6 @@ def display_preserved_libs(vardbapi, myopts): linkmap =3D vardbapi._linkmap consumer_map =3D {} owners =3D {} - linkmap_broken =3D False =20 try: linkmap.rebuild() @@ -261,7 +259,6 @@ def display_preserved_libs(vardbapi, myopts): writemsg_level("!!! Command Not Found: %s\n" % (e,), level=3Dlogging.ERROR, noiselevel=3D-1) del e - linkmap_broken =3D True else: search_for_owners =3D set() for cpv in plibdata: @@ -603,8 +600,6 @@ def parse_opts(tmpcmdline, silent=3DFalse): myopts =3D {} myfiles=3D[] =20 - global options, shortmapping - actions =3D frozenset([ "clean", "check-news", "config", "depclean", "help", "info", "list-sets", "metadata", "moo", @@ -1562,7 +1557,7 @@ def config_protect_check(trees): def profile_check(trees, myaction): if myaction in ("help", "info", "search", "sync", "version"): return os.EX_OK - for root, root_trees in trees.items(): + for root_trees in trees.values(): if root_trees["root_config"].settings.profiles: continue # generate some profile related warning messages diff --git a/pym/_emerge/resolver/backtracking.py b/pym/_emerge/resolver/= backtracking.py index e072275..f2857b0 100644 --- a/pym/_emerge/resolver/backtracking.py +++ b/pym/_emerge/resolver/backtracking.py @@ -47,7 +47,7 @@ class BacktrackParameter(object): self.reinstall_list =3D=3D other.reinstall_list =20 =20 -class _BacktrackNode: +class _BacktrackNode(object): =20 __slots__ =3D ( "parameter", "depth", "mask_steps", "terminal",