| 1 |
Author: zmedico |
| 2 |
Date: 2008-11-04 17:52:04 +0000 (Tue, 04 Nov 2008) |
| 3 |
New Revision: 11808 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
main/trunk/pym/portage/dbapi/vartree.py |
| 8 |
Log: |
| 9 |
Synchronize portage update/restart logic in dblink.merge() and |
| 10 |
depgraph.display() so it's consistent with Scheduler._is_restart_necessary(). |
| 11 |
Thanks to Jeremy Olexa <darkside@g.o> for reporting. |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 15 |
=================================================================== |
| 16 |
--- main/trunk/pym/_emerge/__init__.py 2008-11-04 07:55:01 UTC (rev 11807) |
| 17 |
+++ main/trunk/pym/_emerge/__init__.py 2008-11-04 17:52:04 UTC (rev 11808) |
| 18 |
@@ -7531,15 +7531,9 @@ |
| 19 |
not self._opts_no_restart.intersection(self.myopts) and \ |
| 20 |
pkg.root == self._running_root.root and \ |
| 21 |
portage.match_from_list( |
| 22 |
- portage.const.PORTAGE_PACKAGE_ATOM, [pkg]): |
| 23 |
- |
| 24 |
- pn, ver, rev = pkg.pv_split |
| 25 |
- if rev == "r0": |
| 26 |
- myversion = ver |
| 27 |
- else: |
| 28 |
- myversion = "%s-%s" % (ver, rev) |
| 29 |
- |
| 30 |
- if myversion != portage.VERSION and "--quiet" not in self.myopts: |
| 31 |
+ portage.const.PORTAGE_PACKAGE_ATOM, [pkg]) and \ |
| 32 |
+ not vardb.cpv_exists(pkg.cpv) and \ |
| 33 |
+ "--quiet" not in self.myopts: |
| 34 |
if mylist_index < len(mylist) - 1: |
| 35 |
p.append(colorize("WARN", "*** Portage will stop merging at this point and reload itself,")) |
| 36 |
p.append(colorize("WARN", " then resume the merge.")) |
| 37 |
|
| 38 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 39 |
=================================================================== |
| 40 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-11-04 07:55:01 UTC (rev 11807) |
| 41 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-11-04 17:52:04 UTC (rev 11808) |
| 42 |
@@ -3712,7 +3712,8 @@ |
| 43 |
if self.vartree.dbapi._categories is not None: |
| 44 |
self.vartree.dbapi._categories = None |
| 45 |
if self.myroot == "/" and \ |
| 46 |
- match_from_list(PORTAGE_PACKAGE_ATOM, [self.mycpv]): |
| 47 |
+ match_from_list(PORTAGE_PACKAGE_ATOM, [self.mycpv]) and \ |
| 48 |
+ not self.vartree.dbapi.cpv_exists(self.mycpv): |
| 49 |
settings = self.settings |
| 50 |
base_path_orig = os.path.dirname(settings["PORTAGE_BIN_PATH"]) |
| 51 |
from tempfile import mkdtemp |
Archives