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 1Pp0vC-00082n-Rm for garchives@archives.gentoo.org; Mon, 14 Feb 2011 16:05:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA72AE0B20; Mon, 14 Feb 2011 16:04:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 89A38E0B20 for ; Mon, 14 Feb 2011 16:04:59 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF3551B40CB for ; Mon, 14 Feb 2011 16:04:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 59F888005E for ; Mon, 14 Feb 2011 16:04:58 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <430a81b039533e8c00da007294a43d99172136a6.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:2.1.9 commit in: pym/_emerge/resolver/, pym/portage/dbapi/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/Scheduler.py pym/_emerge/depgraph.py pym/_emerge/resolver/output.py pym/portage/dbapi/vartree.py X-VCS-Directories: pym/_emerge/resolver/ pym/portage/dbapi/ pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 430a81b039533e8c00da007294a43d99172136a6 Date: Mon, 14 Feb 2011 16:04:58 +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: 83d55b5b22d5b5b93a7fb2475eeb0c49 commit: 430a81b039533e8c00da007294a43d99172136a6 Author: Zac Medico gentoo org> AuthorDate: Mon Feb 14 15:46:39 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Feb 14 16:04:02 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D430a81b0 Recognize git-2.eclass when reinstalling self. --- pym/_emerge/Scheduler.py | 3 ++- pym/_emerge/depgraph.py | 3 ++- pym/_emerge/resolver/output.py | 3 ++- pym/portage/dbapi/vartree.py | 14 ++++++++++---- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 4ff8893..34e5e6f 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -931,7 +931,8 @@ class Scheduler(PollScheduler): return True elif pkg.cpv !=3D self._running_portage.cpv or \ '9999' in pkg.cpv or \ - 'git' in pkg.inherited: + 'git' in pkg.inherited or \ + 'git-2' in pkg.inherited: return True return False =20 diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index f569b18..271d4bf 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -4271,7 +4271,8 @@ class depgraph(object): (running_portage is None or \ running_portage.cpv !=3D replacement_portage.cpv or \ '9999' in replacement_portage.cpv or \ - 'git' in replacement_portage.inherited): + 'git' in replacement_portage.inherited or \ + 'git-2' in replacement_portage.inherited): # update from running_portage to replacement_portage asap asap_nodes.append(replacement_portage) =20 diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output= .py index 457b786..a5b5e27 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -732,7 +732,8 @@ def display(depgraph, mylist, favorites=3D[], verbosi= ty=3DNone): not conf.quiet: if not vardb.cpv_exists(pkg.cpv) or \ '9999' in pkg.cpv or \ - 'git' in pkg.inherited: + 'git' in pkg.inherited or \ + 'git-2' in pkg.inherited: if mylist_index < len(mylist) - 1: p.append(colorize("WARN", "*** Portage will stop merging at this p= oint and reload itself,")) p.append(colorize("WARN", " then resume the merge.")) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index ccf239f..9be12fb 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -3825,11 +3825,17 @@ class dblink(object): myroot =3D None if self.vartree.dbapi._categories is not None: self.vartree.dbapi._categories =3D None + reinstall_self =3D False if self.myroot =3D=3D "/" and \ - match_from_list(PORTAGE_PACKAGE_ATOM, [self.mycpv]) and \ - (not self.vartree.dbapi.cpv_exists(self.mycpv) or \ - '9999' in self.mycpv or \ - 'git' in self.settings.get('INHERITED', '').split()): + match_from_list(PORTAGE_PACKAGE_ATOM, [self.mycpv]): + inherited =3D frozenset(self.settings.get('INHERITED', '').split()) + if not self.vartree.dbapi.cpv_exists(self.mycpv) or \ + '9999' in self.mycpv or \ + 'git' in inherited or \ + 'git-2' in inherited: + reinstall_self =3D True + + if reinstall_self: # Load lazily referenced portage submodules into memory, # so imports won't fail during portage upgrade/downgrade. portage.proxy.lazyimport._preload_portage_submodules()