| 1 |
commit: d032f01ae3333fa5383aec25878b0eadd95f208b |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 17 23:25:03 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 17 23:25:03 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d032f01a |
| 7 |
|
| 8 |
Tweak the last commit. |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/Scheduler.py | 13 ++----------- |
| 12 |
pym/portage/package/ebuild/doebuild.py | 7 +++++++ |
| 13 |
2 files changed, 9 insertions(+), 11 deletions(-) |
| 14 |
|
| 15 |
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py |
| 16 |
index 393eeb6..ad1a944 100644 |
| 17 |
--- a/pym/_emerge/Scheduler.py |
| 18 |
+++ b/pym/_emerge/Scheduler.py |
| 19 |
@@ -76,7 +76,7 @@ class Scheduler(PollScheduler): |
| 20 |
frozenset(["--pretend", |
| 21 |
"--fetchonly", "--fetch-all-uri"]) |
| 22 |
|
| 23 |
- _opts_no_self_reinstall = frozenset(["--buildpkgonly", |
| 24 |
+ _opts_no_self_update = frozenset(["--buildpkgonly", |
| 25 |
"--fetchonly", "--fetch-all-uri", "--pretend"]) |
| 26 |
|
| 27 |
class _iface_class(SlotObject): |
| 28 |
@@ -288,17 +288,8 @@ class Scheduler(PollScheduler): |
| 29 |
self._running_root, installed=True) |
| 30 |
|
| 31 |
def _handle_self_update(self): |
| 32 |
- """ |
| 33 |
- If portage is updating itself, create temporary |
| 34 |
- copies of PORTAGE_BIN_PATH and PORTAGE_PYM_PATH in order |
| 35 |
- to avoid relying on the new versions which may be |
| 36 |
- incompatible. Register an atexit hook to clean up the |
| 37 |
- temporary directories. Pre-load elog modules here since |
| 38 |
- we won't be able to later if they get unmerged (happens |
| 39 |
- when namespace changes). |
| 40 |
- """ |
| 41 |
|
| 42 |
- if self._opts_no_self_reinstall.intersection(self.myopts): |
| 43 |
+ if self._opts_no_self_update.intersection(self.myopts): |
| 44 |
return |
| 45 |
|
| 46 |
for x in self._mergelist: |
| 47 |
|
| 48 |
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py |
| 49 |
index 49d3e89..9e71cfc 100644 |
| 50 |
--- a/pym/portage/package/ebuild/doebuild.py |
| 51 |
+++ b/pym/portage/package/ebuild/doebuild.py |
| 52 |
@@ -2017,6 +2017,13 @@ def _merge_unicode_error(errors): |
| 53 |
return lines |
| 54 |
|
| 55 |
def _prepare_self_update(settings): |
| 56 |
+ """ |
| 57 |
+ Call this when portage is updating itself, in order to create |
| 58 |
+ temporary copies of PORTAGE_BIN_PATH and PORTAGE_PYM_PATH, since |
| 59 |
+ the new versions may be incompatible. An atexit hook will |
| 60 |
+ automatically clean up the temporary copies. |
| 61 |
+ """ |
| 62 |
+ |
| 63 |
# Load lazily referenced portage submodules into memory, |
| 64 |
# so imports won't fail during portage upgrade/downgrade. |
| 65 |
_preload_elog_modules(settings) |
Archives