[gentoo-commits] portage r11808 - in main/trunk/pym: _emerge portage/dbapi

[gentoo-commits] portage r11808 - in main/trunk/pym: _emerge portage/dbapi

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-11-04 17:52:04 +0000 (Tue, 04 Nov 2008)
New Revision: 11808

Modified:
   main/trunk/pym/_emerge/__init__.py
   main/trunk/pym/portage/dbapi/vartree.py
Log:
Synchronize portage update/restart logic in dblink.merge() and
depgraph.display() so it's consistent with Scheduler._is_restart_necessary().
Thanks to Jeremy Olexa <darkside@g.o> for reporting.


Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-11-04 07:55:01 UTC (rev 11807)
+++ main/trunk/pym/_emerge/__init__.py	2008-11-04 17:52:04 UTC (rev 11808)
@@ -7531,15 +7531,9 @@
 					not self._opts_no_restart.intersection(self.myopts) and \
 					pkg.root == self._running_root.root and \
 					portage.match_from_list(
-					portage.const.PORTAGE_PACKAGE_ATOM, [pkg]):
-
-					pn, ver, rev = pkg.pv_split
-					if rev == "r0":
-						myversion = ver
-					else:
-						myversion = "%s-%s" % (ver, rev)
-
-					if myversion != portage.VERSION and "--quiet" not in self.myopts:
+					portage.const.PORTAGE_PACKAGE_ATOM, [pkg]) and \
+					not vardb.cpv_exists(pkg.cpv) and \
+					"--quiet" not in self.myopts:
 						if mylist_index < len(mylist) - 1:
 							p.append(colorize("WARN", "*** Portage will stop merging at this point and reload itself,"))
 							p.append(colorize("WARN", "    then resume the merge."))

Modified: main/trunk/pym/portage/dbapi/vartree.py
===================================================================
--- main/trunk/pym/portage/dbapi/vartree.py	2008-11-04 07:55:01 UTC (rev 11807)
+++ main/trunk/pym/portage/dbapi/vartree.py	2008-11-04 17:52:04 UTC (rev 11808)
@@ -3712,7 +3712,8 @@
 		if self.vartree.dbapi._categories is not None:
 			self.vartree.dbapi._categories = None
 		if self.myroot == "/" and \
-			match_from_list(PORTAGE_PACKAGE_ATOM, [self.mycpv]):
+			match_from_list(PORTAGE_PACKAGE_ATOM, [self.mycpv]) and \
+			not self.vartree.dbapi.cpv_exists(self.mycpv):
 			settings = self.settings
 			base_path_orig = os.path.dirname(settings["PORTAGE_BIN_PATH"])
 			from tempfile import mkdtemp