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 1QvD6i-0004et-3O for garchives@archives.gentoo.org; Sun, 21 Aug 2011 18:50:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40FB721C0FD; Sun, 21 Aug 2011 18:50:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8E1FC21C0FD for ; Sun, 21 Aug 2011 18:50:39 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 808F01B4016 for ; Sun, 21 Aug 2011 18:50:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A716F8004C for ; Sun, 21 Aug 2011 18:50:37 +0000 (UTC) From: "Александр Берсенев" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Александр Берсенев" Message-ID: <73ea870fc954527ca168160bb86c3d42216203b0.bay@gentoo> Subject: [gentoo-commits] proj/autodep:master commit in: portage_with_autodep/pym/_emerge/, src/autodep/ X-VCS-Repository: proj/autodep X-VCS-Files: portage_with_autodep/pym/_emerge/EventsAnalyser.py src/autodep/autodep X-VCS-Directories: portage_with_autodep/pym/_emerge/ src/autodep/ X-VCS-Committer: bay X-VCS-Committer-Name: Александр Берсенев X-VCS-Revision: 73ea870fc954527ca168160bb86c3d42216203b0 Date: Sun, 21 Aug 2011 18:50:37 +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: X-Archives-Hash: fd7fdfba73ffabc1859b0bf8c55ea7f0 commit: 73ea870fc954527ca168160bb86c3d42216203b0 Author: Alexander Bersenev hackerdom ru> AuthorDate: Mon Aug 22 00:49:14 2011 +0000 Commit: =D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80 =D0=91= =D0=B5=D1=80=D1=81=D0=B5=D0=BD=D0=B5=D0=B2 hackerdom ru> CommitDate: Mon Aug 22 00:49:14 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/autodep.git;a= =3Dcommit;h=3D73ea870f add self to blocking white list --- portage_with_autodep/pym/_emerge/EventsAnalyser.py | 12 ++++++++---- src/autodep/autodep | 7 +++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/portage_with_autodep/pym/_emerge/EventsAnalyser.py b/portage= _with_autodep/pym/_emerge/EventsAnalyser.py index a0562aa..f0aa7f8 100644 --- a/portage_with_autodep/pym/_emerge/EventsAnalyser.py +++ b/portage_with_autodep/pym/_emerge/EventsAnalyser.py @@ -263,7 +263,7 @@ class FilterProcGenerator: portageutils=3DPortageUtils(settings=3Dsettings) =20 deps_all=3Dportageutils.get_deps_for_package_building(pkgname) - deps_portage=3Dportageutils.get_dep('portage',["RDEPEND"]) + deps_portage=3Dportageutils.get_dep('sys-apps/portage',["RDEPEND"]) =09 system_packages=3Dportageutils.get_system_packages_list() =20 @@ -273,6 +273,7 @@ class FilterProcGenerator: =20 =20 allowedpkgs=3Dsystem_packages+list(deps_portage)+list(deps_all)=09 + allowedpkgs+=3D["app-portage/autodep"] =09 allowedfiles=3DGentoolkitUtils().getfilesbypackages(allowedpkgs) #for pkg in allowedpkgs: @@ -304,8 +305,8 @@ class EventsAnalyser: =20 self.deps_all=3Dself.portageutils.get_deps_for_package_building(pkgnam= e) self.deps_direct=3Dself.portageutils.get_dep(pkgname,["DEPEND"]) - self.deps_portage=3Dself.portageutils.get_dep('portage',["RDEPEND"]) - =09 + self.deps_portage=3Dself.portageutils.get_dep('sys-apps/portage',["RDE= PEND"]) + self.system_packages=3Dself.portageutils.get_system_packages_list() # All analyse work is here =09 @@ -381,12 +382,13 @@ class EventsAnalyser: =09 if package=3D=3D"unknown": continue - + =09 =20 is_pkg_in_dep=3Dpackage in self.deps_all is_pkg_in_portage_dep=3Dpackage in self.deps_portage is_pkg_in_system=3Dpackage in self.system_packages is_pkg_python=3D"dev-lang/python" in package + is_pkg_self=3D"app-portage/autodep" in package =20 stages=3D[] for stage in sorted(packagesinfo[package].keys(), key=3Dstagesorder.g= et): @@ -425,6 +427,8 @@ class EventsAnalyser: portage.util.writemsg("[SYSTEM]") elif is_pkg_in_portage_dep: portage.util.writemsg("[PORTAGE DEP]") + elif is_pkg_self: + portage.util.writemsg("[AUTODEP]") elif is_pkg_python: portage.util.writemsg("[INTERPRETER]") elif not self.is_package_useful(package,stages,filenames.keys()): diff --git a/src/autodep/autodep b/src/autodep/autodep index d607ed6..335cb2e 100755 --- a/src/autodep/autodep +++ b/src/autodep/autodep @@ -172,8 +172,8 @@ def get_filter_function(options,args,system_packages,= portage_api): portage_api.get_deps(file_to_package[program_path],["RDEPEND"])) allowedpkgs+=3Ddepslist =09 - #print allowedpkgs -=09 + # Do not forget to add self + allowedpkgs+=3D["app-portage/autodep"] # remember the allowedpkgs in deps_all. It is bad to do it here. runtime_vars["deps_all"]=3Dallowedpkgs =09 @@ -320,6 +320,7 @@ for package in sorted(packagesinfo): is_pkg_in_dep=3Dpackage in runtime_vars["deps_all"] is_pkg_in_system=3Dpackage in system_packages is_pkg_in_portage_dep=3Druntime_vars["is_emerge"] and package in runti= me_vars["deps_portage"] + is_pkg_self=3D"app-portage/autodep" in package is_pkg_python=3D"dev-lang/python" in package =20 stages=3D[] @@ -357,6 +358,8 @@ for package in sorted(packagesinfo): color_printer.printmsg("text","[SYSTEM]") =20 elif is_pkg_in_portage_dep: color_printer.printmsg("text","[PORTAGE DEP]") =20 + elif is_pkg_self: + color_printer.printmsg("text","[AUTODEP]") =20 elif is_pkg_python: color_printer.printmsg("text","[INTERPRETER]") =20 elif not events_analysis.is_package_useful(package,stages,filenames.key= s()):